Changeset 6d6508e in sasmodels for sasmodels/kernelcl.py

Timestamp:

Apr 7, 2016 6:57:33 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:

d2fc9a4

Parents:

3707eee

Message:

refactor model_info from dictionary to class

File:

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

sasmodels/kernelcl.py

@@ -342 +342 @@
         if self.program is None:
             compiler = environment().compile_program
-            self.program = compiler(self.info['name'], self.source,
+            self.program = compiler(self.info.name, self.source,
                                     self.dtype, self.fast)
         is_2d = len(q_vectors) == 2
@@ -354 +354 @@
         """
         if self.program is not None:
-            environment().release_program(self.info['name'])
+            environment().release_program(self.info.name)
             self.program = None
 
@@ -441 +441 @@
     """
     def __init__(self, kernel, model_info, q_vectors, dtype):
-        max_pd = model_info['max_pd']
-        npars = len(model_info['parameters'])-2
+        max_pd = model_info.max_pd
+        npars = len(model_info.parameters)-2
         q_input = GpuInput(q_vectors, dtype)
         self.dtype = dtype
@@ -465 +465 @@
         self._need_release = [ self.result_b, self.q_input ]
 
-    def __call__(self, details, weights, values, cutoff):
+    def __call__(self, call_details, weights, values, cutoff):
         real = (np.float32 if self.q_input.dtype == generate.F32
                 else np.float64 if self.q_input.dtype == generate.F64
                 else np.float16 if self.q_input.dtype == generate.F16
                 else np.float32)  # will never get here, so use np.float32
-        assert details.dtype == np.int32
+        assert call_details.dtype == np.int32
         assert weights.dtype == real and values.dtype == real
 
         context = self.queue.context
         details_b = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR,
-                              hostbuf=details)
+                              hostbuf=call_details)
         weights_b = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR,
                               hostbuf=weights)