Merge pull request #453 from abergeron/multi_kernel

Remove old unused stuff + flake8

Author: nouiz

pygpu/_array.py

@@ -143,11 +143,11 @@ def __divmod__(self, other):
         mod = self._empty_like_me(dtype=odtype)
 
         if odtype.kind == 'f':
-            tmpl = "div = floor((%(out_t)s)a / (%(out_t)s)b)," \
-                "mod = fmod((%(out_t)s)a, (%(out_t)s)b)"
+            tmpl = ("div = floor((%(out_t)s)a / (%(out_t)s)b),"
+                    "mod = fmod((%(out_t)s)a, (%(out_t)s)b)")
         else:
-            tmpl = "div = (%(out_t)s)a / (%(out_t)s)b," \
-                "mod = a %% b"
+            tmpl = ("div = (%(out_t)s)a / (%(out_t)s)b,"
+                    "mod = a %% b")
 
         ksrc = tmpl % {'out_t': dtype_to_ctype(odtype)}
 
@@ -168,11 +168,11 @@ def __rdivmod__(self, other):
         mod = self._empty_like_me(dtype=odtype)
 
         if odtype.kind == 'f':
-            tmpl = "div = floor((%(out_t)s)a / (%(out_t)s)b)," \
-                "mod = fmod((%(out_t)s)a, (%(out_t)s)b)"
+            tmpl = ("div = floor((%(out_t)s)a / (%(out_t)s)b),"
+                    "mod = fmod((%(out_t)s)a, (%(out_t)s)b)")
         else:
-            tmpl = "div = (%(out_t)s)a / (%(out_t)s)b," \
-                "mod = a %% b"
+            tmpl = ("div = (%(out_t)s)a / (%(out_t)s)b,"
+                    "mod = a %% b")
 
         ksrc = tmpl % {'out_t': dtype_to_ctype(odtype)}
 

pygpu/dtypes.py

@@ -71,18 +71,20 @@ def register_dtype(dtype, c_names):
 
 
 def _fill_dtype_registry():
-    from sys import platform
-
     register_dtype(np.bool, ["ga_bool", "bool"])
     register_dtype(np.int8, ["ga_byte", "char", "signed char"])
     register_dtype(np.uint8, ["ga_ubyte", "unsigned char"])
-    register_dtype(np.int16, ["ga_short", "short", "signed short", "signed short int", "short signed int"])
-    register_dtype(np.uint16, ["ga_ushort", "unsigned short", "unsigned short int", "short unsigned int"])
+    register_dtype(np.int16, ["ga_short", "short", "signed short",
+                              "signed short int", "short signed int"])
+    register_dtype(np.uint16, ["ga_ushort", "unsigned short",
+                               "unsigned short int", "short unsigned int"])
     register_dtype(np.int32, ["ga_int", "int", "signed int"])
     register_dtype(np.uint32, ["ga_uint", "unsigned", "unsigned int"])
 
-    register_dtype(np.int64, ["ga_long", "long int", "signed long int", "long signed int"])
-    register_dtype(np.uint64, ["ga_ulong", "unsigned long", "unsigned long int", "long unsigned int"])
+    register_dtype(np.int64, ["ga_long", "long int", "signed long int",
+                              "long signed int"])
+    register_dtype(np.uint64, ["ga_ulong", "unsigned long",
+                               "unsigned long int", "long unsigned int"])
 
     register_dtype(np.intp, ["ga_ssize", "ssize_t"])
     register_dtype(np.uintp, ["ga_size", "size_t"])

pygpu/gpuarray.pyx

@@ -1374,8 +1374,8 @@ cdef GpuArray pygpu_empty_like(GpuArray a, ga_order ord, int typecode):
     cdef GpuArray res
 
     if ord == GA_ANY_ORDER:
-        if py_CHKFLAGS(a, GA_F_CONTIGUOUS) and \
-                not py_CHKFLAGS(a, GA_C_CONTIGUOUS):
+        if (py_CHKFLAGS(a, GA_F_CONTIGUOUS) and
+                not py_CHKFLAGS(a, GA_C_CONTIGUOUS)):
             ord = GA_F_ORDER
         else:
             ord = GA_C_ORDER
@@ -1691,8 +1691,10 @@ cdef class GpuArray:
         """
         if not np.PyArray_ISBEHAVED(dst):
             raise ValueError, "Destination Numpy array is not well behaved: aligned and writeable"
-        if not ((self.flags.c_contiguous and self.flags.aligned and dst.flags['C_CONTIGUOUS']) or \
-                (self.flags.f_contiguous and self.flags.aligned and dst.flags['F_CONTIGUOUS'])):
+        if (not ((self.flags.c_contiguous and self.flags.aligned and
+                  dst.flags['C_CONTIGUOUS']) or
+                (self.flags.f_contiguous and self.flags.aligned and
+                 dst.flags['F_CONTIGUOUS']))):
             raise ValueError, "GpuArray and Numpy array do not match in contiguity or GpuArray is not aligned"
         if self.dtype != dst.dtype:
             raise ValueError, "GpuArray and Numpy array do not have matching data types"
@@ -2036,13 +2038,13 @@ cdef class GpuArray:
                     # is also required for numpy compat.
                     el = key.index(Ellipsis)
                     if isinstance(key, tuple):
-                        key = key[:el] + \
-                              (Ellipsis,)*(self.ga.nd - (len(key) - 1)) + \
-                              key[el+1:]
+                        key = (key[:el] +
+                               (Ellipsis,)*(self.ga.nd - (len(key) - 1)) +
+                               key[el+1:])
                     else:
-                        key = key[:el] + \
-                              [Ellipsis,]*(self.ga.nd - (len(key) - 1)) + \
-                              key[el+1:]
+                        key = (key[:el] +
+                               [Ellipsis,]*(self.ga.nd - (len(key) - 1)) +
+                               key[el+1:])
                 if len(key) > self.ga.nd:
                     raise IndexError, "too many indices"
                 for i in range(0, len(key)):

pygpu/operations.py

@@ -2,7 +2,7 @@
 
 from .gpuarray import _split, _concatenate, dtype_to_typecode
 from .dtypes import upcast
-from . import array, asarray
+from . import asarray
 
 
 def atleast_1d(*arys):
@@ -82,7 +82,8 @@ def array_split(ary, indices_or_sections, axis=0):
         # this madness is to support the numpy interface
         # it is supported by tests, but little else
         divs = (list(range(neach + 1, (neach + 1) * extra + 1, neach + 1)) +
-                list(range((neach + 1) * extra + neach, ary.shape[axis], neach)))
+                list(range((neach + 1) * extra + neach,
+                           ary.shape[axis], neach)))
         res = _split(ary, divs, axis)
     return res
 

pygpu/reduction.py

@@ -29,6 +29,7 @@ def _ceil_log2(x):
     else:
         return 0
 
+
 basic_kernel = Template("""
 ${preamble}
 
@@ -141,14 +142,16 @@ def __init__(self, context, dtype_out, neutral, reduce_expr, redux,
         if isinstance(arguments, str):
             self.arguments = parse_c_args(arguments)
         elif arguments is None:
-            self.arguments = [ArrayArg(numpy.dtype(self.dtype_out), '_reduce_input')]
+            self.arguments = [ArrayArg(numpy.dtype(self.dtype_out),
+                                       '_reduce_input')]
         else:
             self.arguments = arguments
 
         if (self.dtype_out == numpy.dtype('float16') or
                 any(ar.dtype == numpy.dtype('float16')
                     for ar in self.arguments)):
-            raise NotImplementedError('float16 not supported for the reduction interface')
+            raise NotImplementedError('float16 not supported for the '
+                                      'reduction interface')
 
         self.reduce_expr = reduce_expr
         if map_expr is None:

pygpu/tests/main.py

@@ -1,5 +1,4 @@
 import os
-import nose.plugins.builtin
 
 from nose.config import Config
 from nose.plugins.manager import PluginManager
@@ -29,25 +28,23 @@ def _test_argv(self, verbose, extra_argv):
             List with any extra arguments to pass to nosetests.
 
         """
-        #self.package_path = os.path.abspath(self.package_path)
+        # self.package_path = os.path.abspath(self.package_path)
         argv = [__file__, self.package_path]
         argv += ['--verbosity', str(verbose)]
         if extra_argv:
             argv += extra_argv
         return argv
 
     def _show_system_info(self):
-        nose = import_nose()
-
         import pygpu
-        #print ("pygpu version %s" % pygpu.__version__)
+        # print ("pygpu version %s" % pygpu.__version__)
         pygpu_dir = os.path.dirname(pygpu.__file__)
-        print ("pygpu is installed in %s" % pygpu_dir)
+        print("pygpu is installed in %s" % pygpu_dir)
 
         super(NoseTester, self)._show_system_info()
 
     def prepare_test_args(self, verbose=1, extra_argv=None, coverage=False,
-            capture=True, knownfailure=True):
+                          capture=True, knownfailure=True):
         """
         Prepare arguments for the `test` method.
 
@@ -61,8 +58,9 @@ def prepare_test_args(self, verbose=1, extra_argv=None, coverage=False,
 
         # numpy way of doing coverage
         if coverage:
-            argv += ['--cover-package=%s' % self.package_name, '--with-coverage',
-                    '--cover-tests', '--cover-inclusive', '--cover-erase']
+            argv += ['--cover-package=%s' % self.package_name,
+                     '--with-coverage', '--cover-tests', '--cover-inclusive',
+                     '--cover-erase']
 
         # Capture output only if needed
         if not capture:
@@ -77,7 +75,7 @@ def prepare_test_args(self, verbose=1, extra_argv=None, coverage=False,
         return argv, plugins
 
     def test(self, verbose=1, extra_argv=None, coverage=False, capture=True,
-            knownfailure=True):
+             knownfailure=True):
         """
         Run tests for module using nose.
 
@@ -122,28 +120,11 @@ def test(self, verbose=1, extra_argv=None, coverage=False, capture=True,
                 "launch pygpu.test()."))
 
         argv, plugins = self.prepare_test_args(verbose, extra_argv, coverage,
-                capture, knownfailure)
+                                               capture, knownfailure)
 
         # The "plugins" keyword of NumpyTestProgram gets ignored if config is
         # specified. Moreover, using "addplugins" instead can lead to strange
         # errors. So, we specify the plugins in the Config as well.
         cfg = Config(includeExe=True, plugins=PluginManager(plugins=plugins))
         t = NumpyTestProgram(argv=argv, exit=False, config=cfg)
         return t.result
-
-
-def main(modulename):
-    debug = False
-
-    if 0:
-        unittest.main()
-    elif len(sys.argv)==2 and sys.argv[1]=="--debug":
-        module = __import__(modulename)
-        tests = unittest.TestLoader().loadTestsFromModule(module)
-        tests.debug()
-    elif len(sys.argv)==1:
-        module = __import__(modulename)
-        tests = unittest.TestLoader().loadTestsFromModule(module)
-        unittest.TextTestRunner(verbosity=2).run(tests)
-    else:
-        print ("options: [--debug]")

pygpu/tests/support.py

@@ -1,6 +1,8 @@
 from __future__ import print_function
 
-import os, sys
+import os
+import sys
+
 import numpy
 from nose.plugins.skip import SkipTest
 
@@ -22,11 +24,14 @@
 dtypes_no_complex_big = ["float32", "float64", "int16", "uint16",
                          "int32", "int64", "uint32", "uint64"]
 
+
 def get_env_dev():
     for name in ['GPUARRAY_TEST_DEVICE', 'DEVICE']:
         if name in os.environ:
             return os.environ[name]
-    raise RuntimeError("No test device specified.  Specify one using the DEVICE or GPUARRAY_TEST_DEVICE environment variables.")
+    raise RuntimeError(
+        "No test device specified.  Specify one using the DEVICE "
+        "or GPUARRAY_TEST_DEVICE environment variables.")
 
 
 context = gpuarray.init(get_env_dev())