From da863259e40c4945014dc8c718660a49e17d0295 Mon Sep 17 00:00:00 2001
From: "Robert C. Kirby" <Robert_Kirby@baylor.edu>
Date: Fri, 5 Jun 2015 13:24:19 -0500
Subject: [PATCH] generalized sorting to work on arbitrary kind of scan kernel
---
pyopencl/algorithm.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pyopencl/algorithm.py b/pyopencl/algorithm.py
index 387e31a4..63190628 100644
--- a/pyopencl/algorithm.py
+++ b/pyopencl/algorithm.py
@@ -392,6 +392,9 @@ RADIX_SORT_OUTPUT_STMT_TPL = Template(r"""//CL//
# {{{ driver
+# import hoisted here to be used as a default argument in the constructor
+from pyopencl.scan import GenericScanKernel
+
class RadixSort(object):
"""Provides a general `radix sort <https://en.wikipedia.org/wiki/Radix_sort>`_
@@ -401,7 +404,7 @@ class RadixSort(object):
"""
def __init__(self, context, arguments, key_expr, sort_arg_names,
bits_at_a_time=2, index_dtype=np.int32, key_dtype=np.uint32,
- options=[]):
+ scan_kernel=GenericScanKernel, options=[]):
"""
:arg arguments: A string of comma-separated C argument declarations.
If *arguments* is specified, then *input_expr* must also be
@@ -469,8 +472,7 @@ class RadixSort(object):
scan_preamble = preamble \
+ RADIX_SORT_SCAN_PREAMBLE_TPL.render(**codegen_args)
- from pyopencl.scan import GenericScanKernel
- self.scan_kernel = GenericScanKernel(
+ self.scan_kernel = scan_kernel(
context, scan_dtype,
arguments=scan_arguments,
input_expr="scan_t_from_value(%s, base_bit, i)" % key_expr,
--
GitLab