Changeset b4272a2 in sasmodels

Timestamp:

Feb 1, 2018 10:01:35 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

f6fd413

Parents:

3221de0

Message:

restructure handling of opencl flags so it works with sasview

File:

• sasmodels/kernelcl.py (modified) (1 diff)

sasmodels/kernelcl.py

@@ -148 +148 @@
     This provides an OpenCL context and one queue per device.
     """
-    if not HAVE_OPENCL:
-        warnings.warn("OpenCL startup failed with ***"
-                      + OPENCL_ERROR + "***; using C compiler instead")
-    elif ENV is None:
+    if ENV is None:
+        if not HAVE_OPENCL:
+            raise RuntimeError("OpenCL startup failed with ***"
+                            + OPENCL_ERROR + "***; using C compiler instead")
         reset_environment()
+        if ENV is None:
+            raise RuntimeError("SAS_OPENCL=None in environment")
     return ENV