From c4b3071a15bb726a8e41b511e10d29a1b4b60c67 Mon Sep 17 00:00:00 2001
From: "[6~" <inform@tiker.net>
Date: Thu, 14 Nov 2019 15:41:25 -0600
Subject: [PATCH] Remove Py2.5 **dict(x=y) kwarg workaround
---
pyopencl/algorithm.py | 15 ++++++---------
pyopencl/array.py | 4 ++--
pyopencl/reduction.py | 2 +-
pyopencl/scan.py | 9 ++++-----
4 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
index dfa5d4bb..620e72d0 100644
--- a/pyopencl/algorithm.py
+++ b/pyopencl/algorithm.py
@@ -104,9 +104,8 @@ def copy_if(ary, predicate, extra_args=[], preamble="", queue=None, wait_for=Non
count = ary._new_with_changes(data=None, offset=0,
shape=(), strides=(), dtype=scan_dtype)
- # **dict is a Py2.5 workaround
evt = knl(ary, out, count, *extra_args_values,
- **dict(queue=queue, wait_for=wait_for))
+ queue=queue, wait_for=wait_for)
return out, count, evt
@@ -189,9 +188,8 @@ def partition(ary, predicate, extra_args=[], preamble="", queue=None, wait_for=N
count = ary._new_with_changes(data=None, offset=0,
shape=(), strides=(), dtype=scan_dtype)
- # **dict is a Py2.5 workaround
evt = knl(ary, out_true, out_false, count, *extra_args_values,
- **dict(queue=queue, wait_for=wait_for))
+ queue=queue, wait_for=wait_for)
return out_true, out_false, count, evt
@@ -256,9 +254,8 @@ def unique(ary, is_equal_expr="a == b", extra_args=[], preamble="",
count = ary._new_with_changes(data=None, offset=0,
shape=(), strides=(), dtype=scan_dtype)
- # **dict is a Py2.5 workaround
evt = knl(ary, out, count, *extra_args_values,
- **dict(queue=queue, wait_for=wait_for))
+ queue=queue, wait_for=wait_for)
return out, count, evt
@@ -541,7 +538,7 @@ class RadixSort(object):
scan_args = args + sorted_args + [base_bit]
last_evt = self.scan_kernel(*scan_args,
- **dict(queue=queue, wait_for=wait_for))
+ queue=queue, wait_for=wait_for)
wait_for = [last_evt]
# substitute sorted
@@ -1177,7 +1174,7 @@ class ListOfListsBuilder:
count_event = count_kernel(queue, gsize, lsize,
*(tuple(count_list_args) + data_args + (n_objects,)),
- **dict(wait_for=wait_for))
+ wait_for=wait_for)
compress_events = {}
for name, dtype in self.list_names_and_dtypes:
@@ -1283,7 +1280,7 @@ class ListOfListsBuilder:
evt = write_kernel(queue, gsize, lsize,
*(tuple(write_list_args) + data_args + (n_objects,)),
- **dict(wait_for=scan_events))
+ wait_for=scan_events)
return result, evt
diff --git a/pyopencl/array.py b/pyopencl/array.py
index ad0e469e..bcc0770f 100644
--- a/pyopencl/array.py
+++ b/pyopencl/array.py
@@ -158,7 +158,7 @@ def elwise_kernel_runner(kernel_getter):
actual_args.append(arg)
actual_args.append(repr_ary.size)
- return knl(queue, gs, ls, *actual_args, **dict(wait_for=wait_for))
+ return knl(queue, gs, ls, *actual_args, wait_for=wait_for)
try:
from functools import update_wrapper
@@ -2383,7 +2383,7 @@ def multi_put(arrays, dest_indices, dest_shape=None, out=None, queue=None,
+ [use_fill_cla.base_data, use_fill_cla.offset]
+ [array_lengths_cla.base_data, array_lengths_cla.offset]
+ [dest_indices.size]),
- **dict(wait_for=wait_for_this))
+ wait_for=wait_for_this)
for o in out[chunk_slice]:
o.add_event(evt)
diff --git a/pyopencl/reduction.py b/pyopencl/reduction.py
index 7c017419..0b39dd70 100644
--- a/pyopencl/reduction.py
+++ b/pyopencl/reduction.py
@@ -410,7 +410,7 @@ class ReductionKernel:
(stage_inf.group_size,),
*([result.base_data, result.offset]
+ invocation_args + size_args),
- **dict(wait_for=wait_for))
+ wait_for=wait_for)
wait_for = [last_evt]
if group_count == 1:
diff --git a/pyopencl/scan.py b/pyopencl/scan.py
index 71460f25..8ec5043d 100644
--- a/pyopencl/scan.py
+++ b/pyopencl/scan.py
@@ -21,7 +21,6 @@ See the License for the specific language governing permissions and
limitations under the License.
Derived from code within the Thrust project, https://github.com/thrust/thrust/
-
"""
import six
@@ -1541,7 +1540,7 @@ class GenericScanKernel(_GenericScanKernelBase):
l1_evt = l1_info.kernel(
queue, (num_intervals,), (l1_info.wg_size,),
- *scan1_args, **dict(g_times_l=True, wait_for=wait_for))
+ *scan1_args, g_times_l=True, wait_for=wait_for)
# }}}
@@ -1561,7 +1560,7 @@ class GenericScanKernel(_GenericScanKernelBase):
l2_evt = l2_info.kernel(
queue, (1,), (l1_info.wg_size,),
- *scan2_args, **dict(g_times_l=True, wait_for=[l1_evt]))
+ *scan2_args, g_times_l=True, wait_for=[l1_evt])
# }}}
@@ -1577,7 +1576,7 @@ class GenericScanKernel(_GenericScanKernelBase):
return self.final_update_info.kernel(
queue, (num_intervals,),
(self.final_update_info.update_wg_size,),
- *upd_args, **dict(g_times_l=True, wait_for=[l2_evt]))
+ *upd_args, g_times_l=True, wait_for=[l2_evt])
# }}}
@@ -1707,7 +1706,7 @@ class GenericDebugScanKernel(_GenericScanKernelBase):
# }}}
return self.kernel(queue, (1,), (1,),
- *(data_args + [n]), **dict(wait_for=wait_for))
+ *(data_args + [n]), wait_for=wait_for)
# }}}
--
GitLab