Changeset f734e7d in sasmodels for sasmodels/kernelpy.py

Timestamp:

Feb 21, 2015 11:44:54 PM (9 years ago)

Author:

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:

6137124

Parents:

711d8e2

Message:

restructure c code generation for maintainability; extend test harness to allow opencl and ctypes tests

File:

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

sasmodels/kernelpy.py

@@ -3 +3 @@
 
 from .generate import F32, F64
+
+class PyModel(object):
+    def __init__(self, info):
+        self.info = info
+    def __call__(self, input):
+        kernel = self.info['Iqxy'] if input.is_2D else self.info['Iq']
+        return PyKernel(kernel, self.info, input)
+    def make_input(self, q_vectors):
+        return PyInput(q_vectors, dtype=F64)
+    def release(self):
+        pass
 
 class PyInput(object):
@@ -134 +145 @@
     """
 
-    ##########################################################
-    #                                                        #
-    #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
-    #   !!                                              !!   #
-    #   !!  KEEP THIS CODE CONSISTENT WITH GENERATE.PY  !!   #
-    #   !!                                              !!   #
-    #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
-    #                                                        #
-    ##########################################################
+    ################################################################
+    #                                                              #
+    #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
+    #   !!                                                    !!   #
+    #   !!  KEEP THIS CODE CONSISTENT WITH KERNEL_TEMPLATE.C  !!   #
+    #   !!                                                    !!   #
+    #   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!   #
+    #                                                              #
+    ################################################################
 
     weight = np.empty(len(pd), 'd')
@@ -164 +175 @@
         stride = np.array([1])
         vol_weight_index = slice(None, None)
+        # keep lint happy
+        fast_value = [None]
+        fast_weight = [None]
 
     ret = np.zeros_like(args[0])
@@ -193 +207 @@
             # Correction factor for spherical integration p(theta) I(q) sin(theta) dtheta
             #spherical_correction = abs(sin(pi*args[theta_index])) if theta_index>=0 else 1.0
-            #spherical_correction = abs(cos(pi*args[theta_index]))*pi/2 if theta_index>=0 else 1.0
-            spherical_correction = 1.0
+            spherical_correction = abs(cos(pi*args[theta_index]))*pi/2 if theta_index>=0 else 1.0
+            #spherical_correction = 1.0
             ret += w*I*spherical_correction*positive
             norm += w*positive