Changeset 880a2ed in sasmodels for sasmodels/core.py

Timestamp:

Sep 5, 2016 7:15:21 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:

27fc92f

Parents:

fe77343

Message:

Handling for SAS_OPENCL enviromental variable added

File:

• sasmodels/core.py (modified) (3 diffs)

sasmodels/core.py

@@ -21 +21 @@
 from . import kernelpy
 from . import kerneldll
-try:
-    from . import kernelcl
-    HAVE_OPENCL = True
-except Exception:
+
+if "SAS_OPENCL" not in os.environ:
     HAVE_OPENCL = False
+else:
+    try:
+        from . import kernelcl
+        HAVE_OPENCL = True
+    except Exception:
+        HAVE_OPENCL = False
 
 try:
@@ -219 +223 @@
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
     # If opencl=False OpenCL is switched off
-    # Finally one can force OpenCL calculation even if HAVE_OPENCL=False
-
-    if "SAS_OPENCL" in os.environ:
-        sasopencl = os.environ["SAS_OPENCL"]
 
     if platform is None:
@@ -228 +228 @@
     if platform == "ocl" and not HAVE_OPENCL or not model_info.opencl:
         platform = "dll"
-    #if  model_info.opencl and not HAVE_OPENCL:
-    #    platform = "ocl"
 
     # Check if type indicates dll regardless of which platform is given