Changeset f49675c in sasmodels for sasmodels/core.py

Timestamp:

Sep 2, 2016 7:29:34 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:

b6f3bbe

Parents:

d6e2f8d

Message:

No GPU forcing through opencl=True

File:

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

sasmodels/core.py

@@ -219 +219 @@
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
     # If opencl=False OpenCL is switched off
-    if platform is None or model_info.opencl:
+    # Finally one can force OpenCL calculation even if HAVE_OPENCL=False
+    if platform is None:
         platform = "ocl"
     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