Changeset 880a2ed in sasmodels

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

Location:

sasmodels

Files:

• core.py (modified) (3 diffs)
• kernelcl.py (modified) (4 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

sasmodels/kernelcl.py

@@ -37 +37 @@
 Once you have done that, it will show the available drivers which you
 can select.  It will then tell you that you can use these drivers
-automatically by setting the PYOPENCL_CTX environment variable.
+automatically by setting the SAS_OPENCL environment variable, which is
+PYOPENCL_CTX equivalent but not conflicting with other pyopnecl programs.
 
 Some graphics cards have multiple devices on the same card.  You cannot
@@ -227 +228 @@
 
         self.context = None
-        if 'PYOPENCL_CTX' in os.environ:
+        if 'SAS_OPENCL' in os.environ:
+            #Setting PYOPENCL_CTX as a SAS_OPENCL to create cl context
+            os.environ["PYOPENCL_CTX"] = os.environ["SAS_OPENCL"]
             self._create_some_context()
 
@@ -271 +274 @@
         """
         Protected call to cl.create_some_context without interactivity.  Use
-        this if PYOPENCL_CTX is set in the environment.  Sets the *context*
+        this if SAS_OPENCL is set in the environment.  Sets the *context*
         attribute.
         """
@@ -279 +282 @@
             warnings.warn(str(exc))
             warnings.warn("pyopencl.create_some_context() failed")
-            warnings.warn("the environment variable 'PYOPENCL_CTX' might not be set correctly")
+            warnings.warn("the environment variable 'SAS_OPENCL' might not be set correctly")
 
     def compile_program(self, name, source, dtype, fast, timestamp):