Changeset a4280bd in sasmodels for sasmodels/kernelcl.py

Timestamp:

Jul 25, 2016 11:54:30 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:

2f5c6d4

Parents:

2c74c11

Message:

restructure magnetic models to use less code

File:

• sasmodels/kernelcl.py (modified) (3 diffs)

sasmodels/kernelcl.py

@@ -284 +284 @@
             logging.info("building %s for OpenCL %s"
                          % (key, context.devices[0].name.strip()))
-            program = compile_model(context, source, np.dtype(dtype), fast)
-            #print("OpenCL compile",name)
-            dtype = np.dtype(dtype)
             program = compile_model(self.get_context(dtype),
                                     str(source), dtype, fast)
@@ -369 +366 @@
     """
     def __init__(self, source, model_info, dtype=generate.F32, fast=False):
-        # type: (str, ModelInfo, np.dtype, bool) -> None
+        # type: (Dict[str,str], ModelInfo, np.dtype, bool) -> None
         self.info = model_info
         self.source = source
@@ -388 +385 @@
         # type: (List[np.ndarray]) -> "GpuKernel"
         if self.program is None:
-            compiler = environment().compile_program
-            self.program = compiler(self.info.name, self.source,
-                                    self.dtype, self.fast)
-            names = [generate.kernel_name(self.info, variant)
-                     for variant in ("Iq", "Iqxy", "Imagnetic")]
-            self._kernels = [getattr(self.program, name) for name in names]
+            compile_program = environment().compile_program
+            self.program = compile_program(
+                self.info.name,
+                self.source['opencl'],
+                self.dtype,
+                self.fast)
+            variants = ['Iq', 'Iqxy', 'Imagnetic']
+            names = [generate.kernel_name(self.info, k) for k in variants]
+            kernels = [getattr(self.program, k) for k in names]
+            self._kernels = dict((k,v) for k,v in zip(variants, kernels))
         is_2d = len(q_vectors) == 2
-        kernel = self._kernels[1:3] if is_2d else [self._kernels[0]]*2
+        if is_2d:
+            kernel = [self._kernels['Iqxy'], self._kernels['Imagnetic']]
+        else:
+            kernel = [self._kernels['Iq']]*2
         return GpuKernel(kernel, self.dtype, self.info, q_vectors)