Merge branch 'update/njit_parallel_option' into 'devel'

Rename njit option spirv to offload

See merge request mlp-python/NUMBA-DPPY!78

Author: reazulhoque

numba/core/cpu_dispatcher.py

@@ -7,7 +7,7 @@ class CPUDispatcher(dispatcher.Dispatcher):
 
     def __init__(self, py_func, locals={}, targetoptions={}, impl_kind='direct', pipeline_class=compiler.Compiler):
         if ('parallel' in targetoptions and isinstance(targetoptions['parallel'], dict) and
-                'spirv' in targetoptions['parallel'] and  targetoptions['parallel']['spirv'] == True):
+                'offload' in targetoptions['parallel'] and  targetoptions['parallel']['offload'] == True):
             import numba.dppy_config as dppy_config
             if dppy_config.dppy_present:
                 from numba.dppy.compiler import DPPyCompiler

numba/core/cpu_options.py

@@ -64,7 +64,7 @@ def __init__(self, value):
             self.stencil = value.pop('stencil', True)
             self.fusion = value.pop('fusion', True)
             self.prange = value.pop('prange', True)
-            self.gen_spirv = value.pop('spirv', False)
+            self.gen_spirv = value.pop('offload', False)
             if value:
                 msg = "Unrecognized parallel options: %s" % value.keys()
                 raise NameError(msg)

numba/dppy/compiler.py

@@ -54,7 +54,7 @@ def define_pipelines(self):
         # this maintains the objmode fallback behaviour
         pms = []
         if not self.state.flags.force_pyobject:
-            print("Numba-DPPY [INFO]: Using Numba-DPPY pipeline")
+            #print("Numba-DPPY [INFO]: Using Numba-DPPY pipeline")
             pms.append(DPPyPassBuilder.define_nopython_pipeline(self.state))
         if self.state.status.can_fallback or self.state.flags.force_pyobject:
             pms.append(

numba/dppy/examples/blacksholes_njit.py

@@ -14,7 +14,7 @@ def cndf2(inp):
     out = 0.5 + 0.5 * math.erf((math.sqrt(2.0)/2.0) * inp)
     return out
 
-@numba.njit(parallel={'spirv':True}, fastmath=True)
+@numba.njit(parallel={'offload':True}, fastmath=True)
 def blackscholes(sptprice, strike, rate, volatility, timev):
     logterm = np.log(sptprice / strike)
     powterm = 0.5 * volatility * volatility

numba/dppy/examples/pa_examples/test1-2d.py

@@ -1,7 +1,7 @@
 from numba import njit, gdb
 import numpy as np
 
-@njit(parallel={'spirv':True})
+@njit(parallel={'offload':True})
 def f1(a, b):
     c = a + b
     return c

numba/dppy/examples/pa_examples/test1-3d.py

@@ -1,7 +1,7 @@
 from numba import njit, gdb
 import numpy as np
 
-@njit(parallel={'spirv':True})
+@njit(parallel={'offload':True})
 def f1(a, b):
     c = a + b
     return c

numba/dppy/examples/pa_examples/test1-4d.py

@@ -1,7 +1,7 @@
 from numba import njit, gdb
 import numpy as np
 
-@njit(parallel={'spirv':True})
+@njit(parallel={'offload':True})
 def f1(a, b):
     c = a + b
     return c

numba/dppy/examples/pa_examples/test1-5d.py

@@ -1,7 +1,7 @@
 from numba import njit, gdb
 import numpy as np
 
-@njit(parallel={'spirv':True})
+@njit(parallel={'offload':True})
 def f1(a, b):
     c = a + b
     return c

numba/dppy/examples/pa_examples/test1.py

@@ -2,7 +2,7 @@
 import numpy as np
 
 #@njit(target='dppy')
-@njit(parallel={'spirv':True})
+@njit(parallel={'offload':True})
 def f1(a, b):
     c = a + b
     return c

numba/dppy/tests/dppy/test_numpy_bit_twiddling_functions.py

@@ -13,7 +13,7 @@
 
 class TestNumpy_bit_twiddling_functions(DPPYTestCase):
     def test_bitwise_and(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a, b):
             c = np.bitwise_and(a, b)
             return c
@@ -27,7 +27,7 @@ def f(a, b):
 
 
     def test_bitwise_or(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a, b):
             c = np.bitwise_or(a, b)
             return c
@@ -41,7 +41,7 @@ def f(a, b):
 
 
     def test_bitwise_xor(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a, b):
             c = np.bitwise_xor(a, b)
             return c
@@ -55,7 +55,7 @@ def f(a, b):
 
 
     def test_bitwise_not(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a):
             c = np.bitwise_not(a)
             return c
@@ -68,7 +68,7 @@ def f(a):
 
 
     def test_invert(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a):
             c = np.invert(a)
             return c
@@ -81,7 +81,7 @@ def f(a):
 
 
     def test_left_shift(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a, b):
             c = np.left_shift(a, b)
             return c
@@ -95,7 +95,7 @@ def f(a, b):
 
 
     def test_right_shift(self):
-        @njit(parallel={'spirv':True})
+        @njit(parallel={'offload':True})
         def f(a, b):
             c = np.right_shift(a, b)
             return c