[python-dtcwt] 421/497: opencl: remove trailing whitespace
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Jul 21 18:06:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository python-dtcwt.
commit 2c39c1a72c4475053eab176f6271a63a5737b592
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date: Thu Mar 20 15:38:09 2014 +0000
opencl: remove trailing whitespace
---
dtcwt/opencl/lowlevel.py | 32 ++++++++++++++++----------------
dtcwt/opencl/transform2d.py | 4 ++--
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dtcwt/opencl/lowlevel.py b/dtcwt/opencl/lowlevel.py
index bfd584f..d3308d2 100644
--- a/dtcwt/opencl/lowlevel.py
+++ b/dtcwt/opencl/lowlevel.py
@@ -39,7 +39,7 @@ def colfilter(X, h):
.. codeauthor:: Nick Kingsbury, Cambridge University, August 2000
"""
-
+
# Interpret all inputs as arrays
X = asfarray(X)
h = as_column_vector(h)
@@ -57,10 +57,10 @@ def coldfilt(X, ha, hb, queue=None):
ext top edge bottom edge ext
Level 1: ! | ! | !
- odd filt on . b b b b a a a a a a a a b b b b
+ odd filt on . b b b b a a a a a a a a b b b b
odd filt on . a a a a b b b b b b b b a a a a
Level 2: ! | ! | !
- +q filt on x b b a a a a b b
+ +q filt on x b b a a a a b b
-q filt on o a a b b b b a a
The output is decimated by two from the input sample rate and the results
@@ -104,22 +104,22 @@ def colifilt(X, ha, hb, queue=None):
samples. Both filters should be even length, and h should be approx linear
phase with a quarter sample advance from its mid pt (i.e `:math:`|h(m/2)| >
|h(m/2 + 1)|`).
-
+
.. code-block:: text
ext left edge right edge ext
Level 2: ! | ! | !
- +q filt on x b b a a a a b b
+ +q filt on x b b a a a a b b
-q filt on o a a b b b b a a
Level 1: ! | ! | !
- odd filt on . b b b b a a a a a a a a b b b b
+ odd filt on . b b b b a a a a a a a a b b b b
odd filt on . a a a a b b b b b b b b a a a a
-
+
The output is interpolated by two from the input sample rate and the
results from the two filters, Ya and Yb, are interleaved to give Y.
Symmetric extension with repeated end samples is used on the composite X
columns before each filter is applied.
-
+
.. codeauthor:: Rich Wareham <rjw57 at cantab.net>, August 2013
.. codeauthor:: Cian Shaffrey, Cambridge University, August 2000
.. codeauthor:: Nick Kingsbury, Cambridge University, August 2000
@@ -238,7 +238,7 @@ def axis_convolve(X, h, axis=0, queue=None, output=None):
If *queue* is non-``None``, it should be a :py:class:`pyopencl.CommandQueue`
instance which is used to perform the computation. If ``None``, a default
global queue is used.
-
+
If *output* is non-``None``, it should be a :py:class:`pyopencl.array.Array`
instance which the result is written into. If ``None``, an output array is
created.
@@ -344,7 +344,7 @@ def q2c(X1, X2, X3, queue=None, output=None):
def _convolve_kernel_for_queue(context):
"""Return a kernel for convolution suitable for use with *context*. The
return values are memoized.
-
+
"""
kern_prog = cl.Program(context, CL_ARRAY_HEADER + CONVOLVE_KERNEL)
kern_prog.build()
@@ -354,7 +354,7 @@ def _convolve_kernel_for_queue(context):
def _dfilter_kernel_for_queue(context):
"""Return a kernel for convolution suitable for use with *context*. The
return values are memoized.
-
+
"""
kern_prog = cl.Program(context, CL_ARRAY_HEADER + DFILTER_KERNEL)
kern_prog.build()
@@ -364,7 +364,7 @@ def _dfilter_kernel_for_queue(context):
def _ifilter_kernel_for_queue(context):
"""Return a kernel for convolution suitable for use with *context*. The
return values are memoized.
-
+
"""
kern_prog = cl.Program(context, CL_ARRAY_HEADER + IFILTER_KERNEL)
kern_prog.build()
@@ -374,7 +374,7 @@ def _ifilter_kernel_for_queue(context):
def _q2c_kernel_for_queue(context):
"""Return a kernel for convolution suitable for use with *context*. The
return values are memoized.
-
+
"""
kern_prog = cl.Program(context, CL_ARRAY_HEADER + Q2C_KERNEL)
kern_prog.build()
@@ -396,7 +396,7 @@ inline int coord_to_offset(int4 coord, struct array_spec spec)
}
// magic function to reflect the sampling co-ordinate about the
-// *outer edges* of pixel co-ordinates x_min, x_max. The output will
+// *outer edges* of pixel co-ordinates x_min, x_max. The output will
// always be in the range (x_min, x_max].
int4 reflect(int4 x, int4 x_min, int4 x_max)
{
@@ -418,7 +418,7 @@ void __kernel convolve_kernel(
int4 output_coord = { get_global_id(0), get_global_id(1), get_global_id(2), 0 };
struct array_spec X_spec = { .strides = X_strides, .shape = X_shape, .offset = X_offset };
struct array_spec Y_spec = { .strides = Y_strides, .shape = Y_shape, .offset = Y_offset };
-
+
if(any(output_coord >= Y_spec.shape))
return;
@@ -507,7 +507,7 @@ void __kernel convolve_kernel(
if(flip_output) {
output = output.s10;
}
-
+
Y[coord_to_offset(output_coord, Y_spec)] = output.s0;
Y[coord_to_offset(output_coord + one_px_advance, Y_spec)] = output.s1;
}
diff --git a/dtcwt/opencl/transform2d.py b/dtcwt/opencl/transform2d.py
index 09d7e04..cc13c92 100644
--- a/dtcwt/opencl/transform2d.py
+++ b/dtcwt/opencl/transform2d.py
@@ -38,7 +38,7 @@ class Pyramid(object):
via the ``cl_...`` attributes.
.. note::
-
+
The copy from device to host is performed *once* and then memoized.
This makes repeated access to the host-side attributes efficient but
will mean that any changes to the device-side arrays will not be
@@ -100,7 +100,7 @@ class Transform2d(Transform2dNumPy):
the *qshift* case, this should be (h0a, h0b, g0a, g0b, h1a, h1b, g1a, g1b).
.. note::
-
+
At the moment *only* the **forward** transform is accelerated. The
inverse transform uses the NumPy backend.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git
More information about the debian-science-commits
mailing list