Changeset a738209 in sasmodels for sasmodels/kerneldll.py

Timestamp:

Jul 15, 2016 9:33:33 AM (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:

def2c1b

Parents:

98ba1fc

Message:

simplify kernels by remove coordination parameter logic

File:

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

sasmodels/kerneldll.py

@@ -165 +165 @@
     exist yet if it hasn't been compiled.
     """
-    return os.path.join(DLL_PATH, dll_name(model_info, dtype)+".so")
+    return os.path.join(DLL_PATH, dll_name(model_info, dtype))
 
 
@@ -206 +206 @@
         need_recompile = dll_time < newest_source
     if need_recompile:
-        basename = dll_name(model_info, dtype) + "_"
-        fid, filename = tempfile.mkstemp(suffix=".c", prefix=basename)
+        basename = os.path.splitext(os.path.basename(dll))[0] + "_"
+        fd, filename = tempfile.mkstemp(suffix=".c", prefix=basename)
         source = generate.convert_type(source, dtype)
-        fd, filename = tempfile.mkstemp(suffix=".c", prefix=tempfile_prefix)
         with os.fdopen(fd, "w") as file:
             file.write(source)
@@ -269 +268 @@
               else c_longdouble)
 
-        # int, int, int, int*, double*, double*, double*, double*, double*, double
-        argtypes = [c_int32]*3 + [c_void_p]*5 + [fp]
+        # int, int, int, int*, double*, double*, double*, double*, double
+        argtypes = [c_int32]*3 + [c_void_p]*4 + [fp]
         self._Iq = self._dll[generate.kernel_name(self.info, is_2d=False)]
         self._Iqxy = self._dll[generate.kernel_name(self.info, is_2d=True)]
@@ -342 +341 @@
                      else np.float128)
 
-    def __call__(self, call_details, weights, values, cutoff):
+    def __call__(self, call_details, values, cutoff):
         # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
 
         #print("in kerneldll")
-        #print("weights", weights)
         #print("values", values)
-        start, stop = 0, call_details.total_pd
+        start, stop = 0, call_details.pd_prod
         args = [
             self.q_input.nq, # nq
@@ -354 +352 @@
             stop, # pd_stop pd_stride[MAX_PD]
             call_details.buffer.ctypes.data, # problem
-            weights.ctypes.data,  # weights
             values.ctypes.data,  #pars
             self.q_input.q.ctypes.data, #q