Changeset bde38b5 in sasmodels for sasmodels/kernelcl.py

Timestamp:

Aug 14, 2016 9:12:40 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:

ac98886

Parents:

b1c40bee

git-author:

Paul Kienzle <pkienzle@…> (08/14/16 21:08:59)

git-committer:

Paul Kienzle <pkienzle@…> (08/14/16 21:12:40)

Message:

simplify kernel calling

File:

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

sasmodels/kernelcl.py

@@ -552 +552 @@
         ]
         #print("Calling OpenCL")
-        #print("values",values)
+        #call_details.show(values)
         # Call kernel and retrieve results
         last_call = None
         step = 100
-        for start in range(0, call_details.pd_prod, step):
-            stop = min(start+step, call_details.pd_prod)
+        for start in range(0, call_details.num_eval, step):
+            stop = min(start + step, call_details.num_eval)
             #print("queuing",start,stop)
             args[1:3] = [np.int32(start), np.int32(stop)]
@@ -563 +563 @@
                                 None, *args, wait_for=last_call)]
         cl.enqueue_copy(self.queue, self.result, self.result_b)
+        #print("result", self.result)
 
         # Free buffers
@@ -570 +571 @@
         scale = values[0]/self.result[self.q_input.nq]
         background = values[1]
-        #print("scale",scale,background)
+        #print("scale",scale,values[0],self.result[self.q_input.nq])
         return scale*self.result[:self.q_input.nq] + background
         # return self.result[:self.q_input.nq]