[python-dtcwt] 190/497: move opencl backend to be where numpy backend is

[Ghislain Vaillant]

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 e9e16a47afc7464e075eb94c49f2bade280c947d
Author: Rich Wareham <rjw57 at cam.ac.uk>
Date:   Mon Nov 11 17:19:39 2013 +0000

    move opencl backend to be where numpy backend is
---
 dtcwt/{opencl => backend/backend_opencl}/__init__.py    |  0
 dtcwt/{opencl => backend/backend_opencl}/lowlevel.py    |  0
 dtcwt/{opencl => backend/backend_opencl}/transform2d.py |  6 +++---
 scripts/benchmark_opencl.py                             | 12 ++++++------
 tests/testopenclcoldfilt.py                             |  2 +-
 tests/testopenclcolfilter.py                            |  2 +-
 tests/testopenclcolifilt.py                             |  2 +-
 tests/testopenclxfm2.py                                 |  2 +-
 tests/util.py                                           |  2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/dtcwt/opencl/__init__.py b/dtcwt/backend/backend_opencl/__init__.py
similarity index 100%
rename from dtcwt/opencl/__init__.py
rename to dtcwt/backend/backend_opencl/__init__.py
diff --git a/dtcwt/opencl/lowlevel.py b/dtcwt/backend/backend_opencl/lowlevel.py
similarity index 100%
rename from dtcwt/opencl/lowlevel.py
rename to dtcwt/backend/backend_opencl/lowlevel.py
diff --git a/dtcwt/opencl/transform2d.py b/dtcwt/backend/backend_opencl/transform2d.py
similarity index 96%
rename from dtcwt/opencl/transform2d.py
rename to dtcwt/backend/backend_opencl/transform2d.py
index fcc0596..abdb6f2 100644
--- a/dtcwt/opencl/transform2d.py
+++ b/dtcwt/backend/backend_opencl/transform2d.py
@@ -7,9 +7,9 @@ from six.moves import xrange
 from dtcwt import biort as _biort, qshift as _qshift
 from dtcwt.defaults import DEFAULT_BIORT, DEFAULT_QSHIFT
 from dtcwt.utils import appropriate_complex_type_for, asfarray
-from dtcwt.opencl.lowlevel import colfilter, coldfilt, colifilt
-from dtcwt.opencl.lowlevel import axis_convolve, axis_convolve_dfilter, q2c
-from dtcwt.opencl.lowlevel import to_device, to_queue, to_array, empty
+from dtcwt.backend.backend_opencl.lowlevel import colfilter, coldfilt, colifilt
+from dtcwt.backend.backend_opencl.lowlevel import axis_convolve, axis_convolve_dfilter, q2c
+from dtcwt.backend.backend_opencl.lowlevel import to_device, to_queue, to_array, empty
 
 from dtcwt.backend import TransformDomainSignal, ReconstructedSignal
 from dtcwt.backend.backend_numpy.transform2d import Transform2dNumPy
diff --git a/scripts/benchmark_opencl.py b/scripts/benchmark_opencl.py
index 9fea9c0..4973b99 100644
--- a/scripts/benchmark_opencl.py
+++ b/scripts/benchmark_opencl.py
@@ -12,7 +12,7 @@ import timeit
 import numpy as np
 
 from dtcwt.coeffs import biort, qshift
-from dtcwt.opencl.lowlevel import NoCLPresentError
+from dtcwt.backend.backend_opencl.lowlevel import NoCLPresentError
 
 lena = np.load(os.path.join(os.path.dirname(__file__), '..', 'tests', 'lena.npz'))['lena']
 h0o, g0o, h1o, g1o = biort('near_sym_b')
@@ -53,7 +53,7 @@ def main():
             'from dtcwt.lowlevel import colfilter; from __main__ import lena, h1o')
     print('Running OpenCL colfilter...')
     b = benchmark('colfilter(lena, h1o)',
-            'from dtcwt.opencl.lowlevel import colfilter; from __main__ import lena, h1o')
+            'from dtcwt.backend.backend_opencl.lowlevel import colfilter; from __main__ import lena, h1o')
     print('Speed up: x{0:.2f}'.format(a/b))
     print('=====')
 
@@ -62,7 +62,7 @@ def main():
             'from dtcwt.lowlevel import coldfilt; from __main__ import lena, h0b, h0a')
     print('Running OpenCL coldfilt...')
     b = benchmark('coldfilt(lena, h0b, h0a)',
-            'from dtcwt.opencl.lowlevel import coldfilt; from __main__ import lena, h0b, h0a')
+            'from dtcwt.backend.backend_opencl.lowlevel import coldfilt; from __main__ import lena, h0b, h0a')
     print('Speed up: x{0:.2f}'.format(a/b))
     print('=====')
 
@@ -71,7 +71,7 @@ def main():
             'from dtcwt.lowlevel import colifilt; from __main__ import lena, h0b, h0a')
     print('Running OpenCL colifilt...')
     b = benchmark('colifilt(lena, h0b, h0a)',
-            'from dtcwt.opencl.lowlevel import colifilt; from __main__ import lena, h0b, h0a')
+            'from dtcwt.backend.backend_opencl.lowlevel import colifilt; from __main__ import lena, h0b, h0a')
     print('Speed up: x{0:.2f}'.format(a/b))
     print('=====')
 
@@ -80,7 +80,7 @@ def main():
             'from dtcwt import dtwavexfm2; from __main__ import lena')
     print('Running OpenCL dtwavexfm2...')
     b = benchmark('dtwavexfm2(lena)',
-            'from dtcwt.opencl.transform2d import dtwavexfm2; from __main__ import lena')
+            'from dtcwt.backend.backend_opencl.transform2d import dtwavexfm2; from __main__ import lena')
     print('Speed up: x{0:.2f}'.format(a/b))
     print('=====')
 
@@ -89,7 +89,7 @@ def main():
             'from dtcwt import dtwavexfm2; from __main__ import lena')
     print('Running OpenCL dtwavexfm2 (non-POT)...')
     b = benchmark('dtwavexfm2(lena[:510,:480])',
-            'from dtcwt.opencl.transform2d import dtwavexfm2; from __main__ import lena')
+            'from dtcwt.backend.backend_opencl.transform2d import dtwavexfm2; from __main__ import lena')
     print('Speed up: x{0:.2f}'.format(a/b))
     print('=====')
 
diff --git a/tests/testopenclcoldfilt.py b/tests/testopenclcoldfilt.py
index d536ef7..ede5828 100644
--- a/tests/testopenclcoldfilt.py
+++ b/tests/testopenclcoldfilt.py
@@ -2,7 +2,7 @@ import os
 
 import numpy as np
 from dtcwt.lowlevel import coldfilt as coldfilt_gold
-from dtcwt.opencl.lowlevel import coldfilt, NoCLPresentError
+from dtcwt.backend.backend_opencl.lowlevel import coldfilt, NoCLPresentError
 from dtcwt.coeffs import biort, qshift
 
 from nose.tools import raises
diff --git a/tests/testopenclcolfilter.py b/tests/testopenclcolfilter.py
index 5818dca..289e3c0 100644
--- a/tests/testopenclcolfilter.py
+++ b/tests/testopenclcolfilter.py
@@ -2,7 +2,7 @@ import os
 
 import numpy as np
 from dtcwt import biort, qshift
-from dtcwt.opencl.lowlevel import colfilter
+from dtcwt.backend.backend_opencl.lowlevel import colfilter
 from dtcwt.lowlevel import colfilter as colfilter_gold
 
 from .util import assert_almost_equal, skip_if_no_cl
diff --git a/tests/testopenclcolifilt.py b/tests/testopenclcolifilt.py
index c6bdcf4..90a79f2 100644
--- a/tests/testopenclcolifilt.py
+++ b/tests/testopenclcolifilt.py
@@ -1,7 +1,7 @@
 import os
 
 import numpy as np
-from dtcwt.opencl.lowlevel import colifilt
+from dtcwt.backend.backend_opencl.lowlevel import colifilt
 from dtcwt.lowlevel import colifilt as colifilt_gold
 from dtcwt.coeffs import biort, qshift
 
diff --git a/tests/testopenclxfm2.py b/tests/testopenclxfm2.py
index 7d71563..545fbe6 100644
--- a/tests/testopenclxfm2.py
+++ b/tests/testopenclxfm2.py
@@ -5,7 +5,7 @@ from nose.plugins.attrib import attr
 import numpy as np
 from dtcwt import biort, qshift
 from dtcwt import dtwavexfm2 as dtwavexfm2_np, dtwaveifm2
-from dtcwt.opencl.transform2d import dtwavexfm2 as dtwavexfm2_cl
+from dtcwt.backend.backend_opencl.transform2d import dtwavexfm2 as dtwavexfm2_cl
 
 from .util import assert_almost_equal, skip_if_no_cl
 
diff --git a/tests/util.py b/tests/util.py
index 962c65c..1999603 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -2,7 +2,7 @@ import functools
 import numpy as np
 
 from nose import SkipTest
-from dtcwt.opencl.lowlevel import NoCLPresentError
+from dtcwt.backend.backend_opencl.lowlevel import NoCLPresentError
 
 TOLERANCE = 1e-6
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/python-dtcwt.git