Added check to not error out if OpenCL is absent

Author: reazulhoque

numba/core/cpu_dispatcher.py

@@ -1,6 +1,5 @@
 from numba.core import dispatcher, compiler
 from numba.core.registry import cpu_target, dispatcher_registry
-from numba.dppy.compiler import DPPyCompiler
 
 
 class CPUDispatcher(dispatcher.Dispatcher):
@@ -9,8 +8,17 @@ 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):
-            dispatcher.Dispatcher.__init__(self, py_func, locals=locals,
-                    targetoptions=targetoptions, impl_kind=impl_kind, pipeline_class=DPPyCompiler)
+            import numba.dppy_config as dppy_config
+            if dppy_config.dppy_present:
+                from numba.dppy.compiler import DPPyCompiler
+                dispatcher.Dispatcher.__init__(self, py_func, locals=locals,
+                        targetoptions=targetoptions, impl_kind=impl_kind, pipeline_class=DPPyCompiler)
+            else:
+                print("-------------------------------------------------------------------------------------")
+                print("WARNING : offload = True was set but since dppy is not present, we are not offloading")
+                print("-------------------------------------------------------------------------------------")
+                dispatcher.Dispatcher.__init__(self, py_func, locals=locals,
+                    targetoptions=targetoptions, impl_kind=impl_kind, pipeline_class=pipeline_class)
         else:
             dispatcher.Dispatcher.__init__(self, py_func, locals=locals,
                 targetoptions=targetoptions, impl_kind=impl_kind, pipeline_class=pipeline_class)

numba/core/typing/context.py

@@ -14,8 +14,6 @@
 
 from numba.core import utils
 
-import dppy.ocldrv as driver
-
 
 class Rating(object):
     __slots__ = 'promote', 'safe_convert', "unsafe_convert"
@@ -357,13 +355,17 @@ def resolve_argument_type(self, val):
         try:
             return typeof(val, Purpose.argument)
         except ValueError:
-            if(type(val) == driver.DeviceArray):
-                return typeof(val._ndarray, Purpose.argument)
-            # DRD : Hmmm... is the assumption that this error is encountered
-            # when someone is using cuda, and already has done an import
-            # cuda? 
-            #elif numba.cuda.is_cuda_array(val):
-            #    return typeof(numba.cuda.as_cuda_array(val), Purpose.argument)
+            from numba.dppy_config import dppy_present, DeviceArray
+            if dppy_present:
+                if(type(val) == DeviceArray):
+                    return typeof(val._ndarray, Purpose.argument)
+                # DRD : Hmmm... is the assumption that this error is encountered
+                # when someone is using cuda, and already has done an import
+                # cuda? 
+                #elif numba.cuda.is_cuda_array(val):
+                #    return typeof(numba.cuda.as_cuda_array(val), Purpose.argument)
+                else:
+                    raise
             else:
                 raise
 

numba/dppy/__init__.py

@@ -5,11 +5,15 @@
 
 from numba import config
 import numba.testing
-from dppy.ocldrv import *
-from .device_init import *
+
+from numba.dppy_config import *
+if dppy_present:
+    from .device_init import *
+else:
+    raise ImportError("Importing dppy failed")
 
 def test(*args, **kwargs):
-    if not is_available():
+    if dppy_present and not is_available():
         dppy_error()
 
     return numba.testing.test("numba.dppy.tests", *args, **kwargs)

numba/dppy/tests/__init__.py

@@ -1,14 +1,16 @@
 from numba.testing import SerialSuite
 from numba.testing import load_testsuite
 from os.path import dirname, join
-import dppy.ocldrv as ocldrv
+
+
+import numba.dppy_config as dppy_config
 
 def load_tests(loader, tests, pattern):
 
     suite = SerialSuite()
     this_dir = dirname(__file__)
 
-    if ocldrv.is_available():
+    if dppy_config.dppy_present and dppy_config.is_available():
         suite.addTests(load_testsuite(loader, join(this_dir, 'dppy')))
     else:
         print("skipped DPPY tests")

numba/dppy_config.py

@@ -0,0 +1,8 @@
+dppy_present = False
+
+try:
+    from dppy.ocldrv import *
+except:
+    pass
+else:
+    dppy_present = True