From dfb4152c52288edfb8fc3f698ea571aebc7f966c Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner <inform@tiker.net> Date: Tue, 22 Jan 2013 03:56:51 -0500 Subject: [PATCH] A few more Py2.5 fixes. --- pyopencl/algorithm.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py index 40c358df..350f9d2e 100644 --- a/pyopencl/algorithm.py +++ b/pyopencl/algorithm.py @@ -159,7 +159,10 @@ def partition(ary, predicate, extra_args=[], queue=None, preamble=""): out_true = cl.array.empty_like(ary) out_false = cl.array.empty_like(ary) count = ary._new_with_changes(data=None, shape=(), strides=(), dtype=scan_dtype) - knl(ary, out_true, out_false, count, *extra_args_values, queue=queue) + + # **dict is a Py2.5 workaround + knl(ary, out_true, out_false, count, *extra_args_values, **dict(queue=queue)) + return out_true, out_false, count # }}} @@ -217,7 +220,10 @@ def unique(ary, is_equal_expr="a == b", extra_args=[], queue=None, preamble=""): out = cl.array.empty_like(ary) count = ary._new_with_changes(data=None, shape=(), strides=(), dtype=scan_dtype) - knl(ary, out, count, *extra_args_values, queue=queue) + + # **dict is a Py2.5 workaround + knl(ary, out, count, *extra_args_values, **dict(queue=queue)) + return out, count # }}} -- GitLab