Changeset a738209 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Jul 15, 2016 7: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/kernelcl.py (modified) (4 diffs)

sasmodels/kernelcl.py

@@ -521 +521 @@
                      else np.float32)  # will never get here, so use np.float32
 
-    def __call__(self, call_details, weights, values, cutoff):
+    def __call__(self, call_details, values, cutoff):
         # type: (CallDetails, np.ndarray, np.ndarray, float) -> np.ndarray
         context = self.queue.context
@@ -527 +527 @@
         details_b = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR,
                               hostbuf=call_details.buffer)
-        weights_b = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR,
-                              hostbuf=weights) if len(weights) else None
         values_b = cl.Buffer(context, mf.READ_ONLY | mf.COPY_HOST_PTR,
                              hostbuf=values)
@@ -534 +532 @@
         # Call kernel and retrieve results
         step = 100
-        for start in range(0, call_details.total_pd, step):
-            stop = min(start+step, call_details.total_pd)
+        for start in range(0, call_details.pd_prod, step):
+            stop = min(start+step, call_details.pd_prod)
             args = [
                 np.uint32(self.q_input.nq), np.int32(start), np.int32(stop),
-                details_b, weights_b, values_b, self.q_input.q_b, self.result_b,
+                details_b, values_b, self.q_input.q_b, self.result_b,
                 self.real(cutoff),
             ]
@@ -545 +543 @@
 
         # Free buffers
-        for v in (details_b, weights_b, values_b):
+        for v in (details_b, values_b):
             if v is not None: v.release()