Use plan_one_thread_per_row_gemv in Simulator

Signed-off-by: Shaun Ren <[email protected]>
nengo · Aug 1, 2016 · 41e9e9d · 41e9e9d
1 parent 98e2fa8
commit 41e9e9d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nengo_ocl/clra_gemv.py b/nengo_ocl/clra_gemv.py
@@ -1355,7 +1355,7 @@ def choose_plans(self):
 
 class plan_one_thread_per_row_gemv(gemv_prog):
     def choose_plans(self):
-        return [one_thread_per_row_impl(self, len(self.Y))]
+        return [one_thread_per_row_impl(self, range(len(self.Y)))]
 
 class plan_pretuned_gemv(gemv_prog):
     PLANS = (one_thread_per_row_impl, reduce_impl, many_dots_impl, block_impl)

diff --git a/nengo_ocl/simulator.py b/nengo_ocl/simulator.py
@@ -24,7 +24,7 @@
 
 from nengo_ocl.raggedarray import RaggedArray
 from nengo_ocl.clraggedarray import CLRaggedArray, to_device
-from nengo_ocl.clra_gemv import plan_block_gemv
+from nengo_ocl.clra_gemv import plan_pretuned_gemv, plan_one_thread_per_row_gemv
 from nengo_ocl.clra_nonlinearities import (
     plan_timeupdate, plan_reset, plan_copy, plan_slicedcopy,
     plan_direct, plan_lif, plan_lif_rate,
@@ -471,7 +471,7 @@ def _sig_gemv(self, ops, A_js_fn, X_js_fn, Y_fn, Y_in_fn=None,
         if callable(beta):
             beta = RaggedArray([sidx[beta(o)] for o in ops], dtype=np.float32)
 
-        rval = plan_block_gemv(
+        rval = plan_one_thread_per_row_gemv(
             self.queue, alpha, all_data, A_js, all_data, X_js, beta, Y,
             Y_in=Y_in, gamma=gamma, tag=tag)
         return rval.plans