Changeset a557a99 in sasmodels

Timestamp:

Sep 8, 2016 4:27:32 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:

551398c

Parents:

c52f9da

Message:

A few fixes to make code cleaner and add PYOPENCL_CTX control

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• core.py (modified) (2 diffs)
• kernelcl.py (modified) (1 diff)
• models/cylinder.py (modified) (1 diff)

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

@@ -22 +22 @@
 from . import kerneldll
 
-if "SAS_OPENCL" in os.environ and os.environ["SAS_OPENCL"]=="None":
+if os.environ.get("SAS_OPENCL", "").lower() == "none":
     HAVE_OPENCL = False
 else:
@@ -229 +229 @@
         platform = "dll"
 
+    # if platform is None:
+    #     platform = "ocl" if model_info.opencl else "dll"
+    # if platform == "ocl" and not HAVE_OPENCL:
+    #     platform = "dll"
+
     # Check if type indicates dll regardless of which platform is given
     if dtype is not None and dtype.endswith('!'):

sasmodels/kernelcl.py

@@ -231 +231 @@
             #Setting PYOPENCL_CTX as a SAS_OPENCL to create cl context
             os.environ["PYOPENCL_CTX"] = os.environ["SAS_OPENCL"]
+        if 'PYOPENCL_CTX' in os.environ:
             self._create_some_context()
 

sasmodels/models/cylinder.py

@@ -104 +104 @@
             f(q,alpha)^(2)*sin(alpha)*dalpha + background
 """
+#opencl=False
 category = "shape:cylinder"