From 173f3e07e1cae2ea8d04b2a979270d9b29200463 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 22 May 2016 23:43:06 +0200
Subject: [PATCH] Reduction fixes
---
pyopencl/reduction.py | 3 ++-
test/test_algorithm.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pyopencl/reduction.py b/pyopencl/reduction.py
index 3284d75c..7c017419 100644
--- a/pyopencl/reduction.py
+++ b/pyopencl/reduction.py
@@ -231,7 +231,8 @@ def get_reduction_kernel(stage,
inf.kernel.set_scalar_arg_dtypes(
[None, np.int64]
+ get_arg_list_scalar_arg_dtypes(inf.arg_types)
- + [np.int64]*5)
+ + [np.int64]*3 + [np.uint32, np.int64]
+ )
return inf
diff --git a/test/test_algorithm.py b/test/test_algorithm.py
index ffd85676..f41fd824 100644
--- a/test/test_algorithm.py
+++ b/test/test_algorithm.py
@@ -271,7 +271,7 @@ def test_sum_without_data(ctx_factory):
reduce_expr="a+b", map_expr="i",
arguments=[])
- result_dev = red(range=range(n), queue=queue).get()
+ result_dev = red(range=slice(n), queue=queue).get()
result_ref = n*(n-1)//2
assert result_dev == result_ref
--
GitLab