Changeset 48fbd50 in sasmodels for sasmodels/kerneldll.py

Timestamp:

Mar 21, 2016 6:02:51 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:

25b30fd, 3a45c2c

Parents:

88aa3ee

Message:

twiddle with kernel interface

File:

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

sasmodels/kerneldll.py

@@ -218 +218 @@
         self.dll = None
 
-    def __call__(self, q_vectors):
+    def make_kernel(self, q_vectors):
         q_input = PyInput(q_vectors, self.dtype)
         if self.dll is None: self._load_dll()
@@ -251 +251 @@
     """
     def __init__(self, kernel, model_info, q_input):
+        self.kernel = kernel
         self.info = model_info
         self.q_input = q_input
         self.dtype = q_input.dtype
-        self.kernel = kernel
-        self.res = np.empty(q_input.nq+3, q_input.dtype)
         self.dim = '2d' if q_input.is_2d else '1d'
-
-        # In dll kernel, but not in opencl kernel
-        self.p_res = self.res.ctypes.data
+        self.result = np.empty(q_input.nq+3, q_input.dtype)
 
     def __call__(self, details, weights, values, cutoff):
@@ -265 +262 @@
                 else np.float64 if self.q_input.dtype == generate.F64
                 else np.float128)
-        if details.dtype != np.int32 or weights.dtype != real or values.dtype != real:
-            raise TypeError("numeric type does not match the kernel type")
-        #details = np.asarray(details, dtype='int32')
-        #weights = np.asarray(weights, dtype=real)
-        #values = np.asarray(values, dtype=real)
-        #TODO: How can I access max_pd and is this the way to do it?
-        #max_pd = model_info['max_pd']
-        max_pd = 1
+        assert details.dtype == np.int32
+        assert weights.dtype == real and values.dtype == real
+
+        max_pd = self.info['max_pd']
+        start, stop = 0, details[4*max_pd-1]
         args = [
             self.q_input.nq, # nq
-            #TODO: pd_start will need to be changed
-            0, # pd_start
-            details[3*max_pd:4*max_pd], # pd_stop pd_stride[MAX_PD]
+            start, # pd_start
+            stop, # pd_stop pd_stride[MAX_PD]
             details.ctypes.data, # problem
             weights.ctypes.data,  # weights
             values.ctypes.data,  #pars
-            self.q_input.q_pointers[0], #q
-            self.p_res,   # results
+            self.q_input.q.ctypes.data, #q
+            self.result.ctypes.data,   # results
             real(cutoff), # cutoff
             ]
         self.kernel(*args)
-        return self.res[:-3]
+        return self.result[:-3]
 
     def release(self):