Changeset def2c1b in sasmodels for sasmodels

Timestamp:

Jul 15, 2016 5:26:27 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

b9c12fe5

Parents:

a738209

Message:

honour platform request when selecting kernel

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• core.py (modified) (2 diffs)
• kernel.py (modified) (1 diff)
• kernelcl.py (modified) (2 diffs)
• kerneldll.py (modified) (1 diff)

sasmodels/compare.py

@@ -850 +850 @@
         engines.extend(['single', 'double'])
     elif len(engines) == 1:
-        if engines[0][0] != 'double':
+        if engines[0][0] == 'double':
+            engines.append('single')
+        else:
             engines.append('double')
-        else:
-            engines.append('single')
     elif len(engines) > 2:
         del engines[2:]

sasmodels/core.py

@@ -139 +139 @@
         return kernelpy.PyModel(model_info)
 
-    numpy_dtype, fast, platform = parse_dtype(model_info, dtype)
+    numpy_dtype, fast, platform = parse_dtype(model_info, dtype, platform)
 
     source = generate.make_source(model_info)
@@ -171 +171 @@
             try:
                 kerneldll.DLL_PATH = path
-                dll = kerneldll.make_dll(source, model_info, dtype=dtype)
+                dll = kerneldll.make_dll(source, model_info, dtype=numpy_dtype)
             finally:
                 kerneldll.DLL_PATH = old_path

sasmodels/kernel.py

@@ -41 +41 @@
     results = None # type: List[np.ndarray]
 
-    def __call__(self, call_details, weights, values, cutoff):
+    def __call__(self, call_details, values, cutoff):
         # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
         raise NotImplementedError("need to implement __call__")

sasmodels/kernelcl.py

@@ -509 +509 @@
         self.queue = env.get_queue(dtype)
 
-        # details is int32 data, padded to an 8 integer boundary
-        size = ((max_pd*5 + npars*3 + 2 + 7)//8)*8
         self.result_b = cl.Buffer(self.queue.context, mf.READ_WRITE,
                                q_input.global_size[0] * dtype.itemsize)
@@ -532 +530 @@
         # Call kernel and retrieve results
         step = 100
+        #print("calling OpenCL")
         for start in range(0, call_details.pd_prod, step):
             stop = min(start+step, call_details.pd_prod)

sasmodels/kerneldll.py

@@ -357 +357 @@
             self.real(cutoff), # cutoff
             ]
+        #print("calling DLL")
         self.kernel(*args) # type: ignore
         return self.result[:-1]