Changeset d6e2f8d in sasmodels

Timestamp:

Aug 26, 2016 8:36:18 AM (8 years ago)

Author:

wojciech

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:

f49675c

Parents:

8407d8c (diff), 1392831 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged with master

Location:

sasmodels

Files:

• sasview_model.py (modified) (1 diff)
• compare.py (modified) (1 diff)
• core.py (modified) (4 diffs)
• modelinfo.py (modified) (1 diff)

sasmodels/sasview_model.py

@@ -454 +454 @@
         """
         # TODO: fix test so that parameter order doesn't matter
-        ret = ['%s.%s' % (p.name, ext)
-               for p in self._model_info.parameters.user_parameters()
-               for ext in ('npts', 'nsigmas', 'width')
-               if p.polydisperse]
+        ret = ['%s.%s' % (p_name, ext)
+               for p_name in self.dispersion.keys()
+               for ext in ('npts', 'nsigmas', 'width')]
         #print(ret)
         return ret

sasmodels/compare.py

@@ -563 +563 @@
     elif dtype.endswith('!'):
         return eval_ctypes(model_info, data, dtype=dtype[:-1], cutoff=cutoff)
+    elif not model_info.opencl:
+        return eval_ctypes(model_info, data, dtype=dtype, cutoff=cutoff)
     else:
         return eval_opencl(model_info, data, dtype=dtype, cutoff=cutoff)

sasmodels/core.py

@@ -46 +46 @@
 #    build_model
 
-KINDS = ("all", "py", "c", "double", "single", "1d", "2d",
+KINDS = ("all", "py", "c", "double", "single", "opencl", "1d", "2d",
          "nonmagnetic", "magnetic")
 def list_models(kind=None):
@@ -60 +60 @@
         * single: models which support single precision
         * double: models which require double precision
+        * opencl: controls if OpenCL is supperessed
         * 1d: models which are 1D only, or 2D using abs(q)
         * 2d: models which can be 2D
@@ -85 +86 @@
         return True
     elif kind == "single" and info.single:
+        return True
+    elif kind == "opencl" and info.opencl:
         return True
     elif kind == "2d" and any(p.type == 'orientation' for p in pars):
@@ -215 +218 @@
     """
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
-    if platform is None:
+    # If opencl=False OpenCL is switched off
+    if platform is None or model_info.opencl:
         platform = "ocl"
-    if platform == "ocl" and not HAVE_OPENCL:
+    if platform == "ocl" and not HAVE_OPENCL or not model_info.opencl:
         platform = "dll"
 

sasmodels/modelinfo.py

@@ -731 +731 @@
     info.category = getattr(kernel_module, 'category', None)
     info.single = getattr(kernel_module, 'single', True)
+    info.opencl = getattr(kernel_module, 'opencl', True)
     info.structure_factor = getattr(kernel_module, 'structure_factor', False)
     info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y'])