Changeset f786ff3 in sasmodels

Timestamp:

Feb 16, 2015 2:19:05 AM (9 years ago)

Author:

pkienzle

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

250fa25

Parents:

b3f6bc3

Message:

rename modules for clarity

Files:

• compare.py (modified) (3 diffs)
• compare_many.py (modified) (1 diff)
• sasmodels/bumps_model.py (modified) (1 diff)
• sasmodels/kernelcl.py (moved) (moved from sasmodels/gpu.py) (1 diff)
• sasmodels/kerneldll.py (moved) (moved from sasmodels/dll.py) (1 diff)
• sasmodels/kernelpy.py (moved) (moved from sasmodels/pykernel.py)
• sasmodels/sasview_model.py (modified) (1 diff)

compare.py

@@ -8 +8 @@
 
 from sasmodels.bumps_model import BumpsModel, plot_data, tic
-from sasmodels import gpu, dll
+from sasmodels import kernelcl, kerneldll
 from sasmodels.convert import revert_model
 
@@ -42 +42 @@
     sasmodels = __import__('sasmodels.models.'+modelname)
     module = getattr(sasmodels.models, modelname, None)
-    kernel = gpu.load_model(module, dtype=dtype)
+    kernel = kernelcl.load_model(module, dtype=dtype)
     return kernel
 
@@ -48 +48 @@
     sasmodels = __import__('sasmodels.models.'+modelname)
     module = getattr(sasmodels.models, modelname, None)
-    kernel = dll.load_model(module, dtype=dtype)
+    kernel = kerneldll.load_model(module, dtype=dtype)
     return kernel
 

compare_many.py

@@ -5 +5 @@
 import numpy as np
 
-from sasmodels.gpu import environment
+from sasmodels.kernelcl import environment
 from compare import (MODELS, randomize_model, suppress_pd, eval_sasview,
                      eval_opencl, eval_ctypes, make_data)

sasmodels/bumps_model.py

@@ -14 +14 @@
 
 try:
-    from .gpu import load_model as _loader
+    from .kernelcl import load_model as _loader
 except ImportError,exc:
     import warnings
     warnings.warn(str(exc))
     warnings.warn("OpenCL not available --- using ctypes instead")
-    from .dll import load_model as _loader
+    from .kerneldll import load_model as _loader
 
 def load_model(modelname, dtype='single'):

sasmodels/kernelcl.py

@@ -29 +29 @@
 
 from . import generate
-from .pykernel import PyInput, PyKernel
+from .kernelpy import PyInput, PyKernel
 
 F64_DEFS = """\

sasmodels/kerneldll.py

@@ -11 +11 @@
 
 from . import generate
-from .pykernel import PyInput, PyKernel
+from .kernelpy import PyInput, PyKernel
 
 from .generate import F32, F64

sasmodels/sasview_model.py

@@ -25 +25 @@
 
 try:
-    from .gpu import load_model
+    from .kernelcl import load_model
 except ImportError,exc:
     warnings.warn(str(exc))
     warnings.warn("OpenCL not available --- using ctypes instead")
-    from .dll import load_model
+    from .kerneldll import load_model