Changeset 8407d8c in sasmodels

Timestamp:

Aug 25, 2016 9:17:58 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:

d6e2f8d

Parents:

407bf48

Message:

Changed gpu flag to opencl as it seems more appropritae to what code is doing

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• core.py (modified) (4 diffs)
• modelinfo.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.gpu:
+    elif not model_info.opencl:
         return eval_ctypes(model_info, data, dtype=dtype, cutoff=cutoff)
     else:

sasmodels/core.py

@@ -46 +46 @@
 #    build_model
 
-KINDS = ("all", "py", "c", "double", "single", "gpu", "1d", "2d",
+KINDS = ("all", "py", "c", "double", "single", "opencl", "1d", "2d",
          "nonmagnetic", "magnetic")
 def list_models(kind=None):
@@ -60 +60 @@
         * single: models which support single precision
         * double: models which require double precision
-        * gpu: models which compiles on GPU
+        * opencl: controls if OpenCL is supperessed
         * 1d: models which are 1D only, or 2D using abs(q)
         * 2d: models which can be 2D
@@ -87 +87 @@
     elif kind == "single" and info.single:
         return True
-    elif kind == "gpu" and info.gpu:
+    elif kind == "opencl" and info.opencl:
         return True
     elif kind == "2d" and any(p.type == 'orientation' for p in pars):
@@ -218 +218 @@
     """
     # Assign default platform, overriding ocl with dll if OpenCL is unavailable
-    # If gpu=False OpenCL is switched off
-    if platform is None:
+    # If opencl=False OpenCL is switched off
+    if platform is None or model_info.opencl:
         platform = "ocl"
-    if platform == "ocl" and not HAVE_OPENCL or not model_info.gpu:
+    if platform == "ocl" and not HAVE_OPENCL or not model_info.opencl:
         platform = "dll"
 

sasmodels/modelinfo.py

@@ -731 +731 @@
     info.category = getattr(kernel_module, 'category', None)
     info.single = getattr(kernel_module, 'single', True)
-    info.gpu = getattr(kernel_module, 'gpu', True)
+    info.opencl = getattr(kernel_module, 'opencl', True)
     info.structure_factor = getattr(kernel_module, 'structure_factor', False)
     info.profile_axes = getattr(kernel_module, 'profile_axes', ['x', 'y'])