remove dppy dispatcher and create a new file cpu_dispatcher to avoid circular imports

Author: reazulhoque

numba/decorators.py

@@ -12,6 +12,7 @@
 from . import config, sigutils
 from .errors import DeprecationError, NumbaDeprecationWarning
 from .targets import registry
+from .targets import cpu_dispatcher
 from .stencil import stencil
 
 

numba/dppy/dispatcher.py

@@ -2,9 +2,9 @@
 
 import numpy as np
 
-from numba.targets.descriptors import TargetDescriptor
-from numba.targets.options import TargetOptions
-from numba import dppy
+#from numba.targets.descriptors import TargetDescriptor
+#from numba.targets.options import TargetOptions
+#from numba import dppy
 from numba.dppy import kernel, autojit
 from .descriptor import dppy_target
 #from numba.npyufunc.deviceufunc import (UFuncMechanism, GenerializedUFunc,
@@ -13,14 +13,9 @@
 from .. import dispatcher, utils, typing
 from .compiler import DPPyCompiler
 
-''' OLD IMPL '''
-'''
 class DPPyDispatcher(dispatcher.Dispatcher):
-    targetdescr = cpu_target
+    targetdescr = dppy_target
 
-    def __init__(self, py_func, locals={}, targetoptions={}):
-        dispatcher.Dispatcher.__init__(self, py_func, locals=locals,
-                targetoptions=targetoptions, pipeline_class=DPPyCompiler)
 
     def __init__(self, py_func, locals={}, targetoptions={}):
         assert not locals
@@ -34,7 +29,7 @@ def compile(self, sig, locals={}, **targetoptions):
         assert not locals
         options = self.targetoptions.copy()
         options.update(targetoptions)
-        kernel = jit(sig, **options)(self.py_func)
+        kernel = kernel(sig, **options)(self.py_func)
         self._compiled = kernel
         if hasattr(kernel, "_npm_context_"):
             self._npm_context_ = kernel._npm_context_
@@ -230,4 +225,3 @@ def broadcast_device(self, ary, shape):
                                          strides=strides,
                                          dtype=ary.dtype,
                                          gpu_data=ary.gpu_data)
-'''

numba/dppy/initialize.py

@@ -9,8 +9,9 @@ def init_jit():
     return DPPyDispatcher
 
 def initialize_all():
-    #from numba.targets.registry import dispatcher_registry
-    #dispatcher_registry.ondemand['dppy'] = init_jit
+    from numba.targets.registry import dispatcher_registry
+    dispatcher_registry.ondemand['dppy'] = init_jit
+
     dir_path = os.path.dirname(os.path.realpath(__file__)) + "/dppy_driver"
     dpgluelib = 'libdpglue_so.so'
     if os.path.isfile(dir_path + "/libdpglue_so.so"):
@@ -38,4 +39,3 @@ def init_guvectorize():
         return OclGUFuncVectorize
 
     GUVectorize.target_registry.ondemand['dppy'] = init_guvectorize
-

numba/dppy/tests/dppy/test_numpy_bit_twiddling_functions.py

@@ -11,7 +11,7 @@
 
 class TestNumpy_bit_twiddling_functions(DPPYTestCase):
     def test_bitwise_and(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.bitwise_and(a, b)
             return c
@@ -25,7 +25,7 @@ def f(a, b):
 
 
     def test_bitwise_or(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.bitwise_or(a, b)
             return c
@@ -39,7 +39,7 @@ def f(a, b):
 
 
     def test_bitwise_xor(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.bitwise_xor(a, b)
             return c
@@ -53,7 +53,7 @@ def f(a, b):
 
 
     def test_bitwise_not(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.bitwise_not(a)
             return c
@@ -66,7 +66,7 @@ def f(a):
 
 
     def test_invert(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.invert(a)
             return c
@@ -79,7 +79,7 @@ def f(a):
 
 
     def test_left_shift(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.left_shift(a, b)
             return c
@@ -93,7 +93,7 @@ def f(a, b):
 
 
     def test_right_shift(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.right_shift(a, b)
             return c

numba/dppy/tests/dppy/test_numpy_comparison_functions.py

@@ -13,7 +13,7 @@ class TestNumpy_comparison_functions(DPPYTestCase):
     a = np.array([4,5,6])
     b = np.array([2,6,6])
     def test_greater(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.greater(a, b)
             return c
@@ -24,7 +24,7 @@ def f(a, b):
 
 
     def test_greater_equal(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.greater_equal(a, b)
             return c
@@ -35,7 +35,7 @@ def f(a, b):
 
 
     def test_less(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.less(a, b)
             return c
@@ -46,7 +46,7 @@ def f(a, b):
 
 
     def test_less_equal(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.less_equal(a, b)
             return c
@@ -57,7 +57,7 @@ def f(a, b):
 
 
     def test_not_equal(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.not_equal(a, b)
             return c
@@ -68,7 +68,7 @@ def f(a, b):
 
 
     def test_equal(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.equal(a, b)
             return c
@@ -79,7 +79,7 @@ def f(a, b):
 
 
     def test_logical_and(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.logical_and(a, b)
             return c
@@ -93,7 +93,7 @@ def f(a, b):
 
 
     def test_logical_or(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.logical_or(a, b)
             return c
@@ -107,7 +107,7 @@ def f(a, b):
 
 
     def test_logical_xor(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.logical_xor(a, b)
             return c
@@ -121,7 +121,7 @@ def f(a, b):
 
 
     def test_logical_not(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.logical_not(a)
             return c
@@ -134,7 +134,7 @@ def f(a):
 
 
     def test_maximum(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.maximum(a, b)
             return c
@@ -148,7 +148,7 @@ def f(a, b):
 
 
     def test_minimum(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.minimum(a, b)
             return c
@@ -162,7 +162,7 @@ def f(a, b):
 
 
     def test_fmax(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.fmax(a, b)
             return c
@@ -176,7 +176,7 @@ def f(a, b):
 
 
     def test_fmin(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a, b):
             c = np.fmin(a, b)
             return c

numba/dppy/tests/dppy/test_numpy_floating_functions.py

@@ -10,7 +10,7 @@
 
 class TestNumpy_floating_functions(DPPYTestCase):
     def test_isfinite(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.isfinite(a)
             return c
@@ -24,7 +24,7 @@ def f(a):
 
 
     def test_isinf(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.isinf(a)
             return c
@@ -37,7 +37,7 @@ def f(a):
         self.assertTrue(np.all(c == d))
 
     def test_isnan(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.isnan(a)
             return c
@@ -51,7 +51,7 @@ def f(a):
 
 
     def test_floor(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.floor(a)
             return c
@@ -64,7 +64,7 @@ def f(a):
 
 
     def test_ceil(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.ceil(a)
             return c
@@ -77,7 +77,7 @@ def f(a):
 
 
     def test_trunc(self):
-        @njit(target='dppy')
+        @njit(parallel={'spirv':True})
         def f(a):
             c = np.trunc(a)
             return c