Remove changes to CPUDispatcher

numba/core/inline_closurecall.py

@@ -256,7 +256,7 @@ def check_reduce_func(func_ir, func_var):
                             analysis")
     if isinstance(reduce_func, (ir.FreeVar, ir.Global)):
         if not isinstance(reduce_func.value,
-                          numba.core.cpu_dispatcher.CPUDispatcher):
+                          numba.core.registry.CPUDispatcher):
             raise ValueError("Invalid reduction function")
         # pull out the python function for inlining
         reduce_func = reduce_func.value.py_func

numba/core/ir_utils.py

@@ -679,7 +679,7 @@ def has_no_side_effect(rhs, lives, call_table):
               (call_list[0]._name == 'empty_inferred' or
                call_list[0]._name == 'unsafe_empty_inferred')):
             return True
-        from numba.core.cpu_dispatcher import CPUDispatcher
+        from numba.core.registry import CPUDispatcher
         from numba.np.linalg import dot_3_mv_check_args
         if isinstance(call_list[0], CPUDispatcher):
             py_func = call_list[0].py_func

numba/core/registry.py

@@ -75,6 +75,10 @@ def nested_context(self, typing_context, target_context):
 cpu_target = CPUTarget()
 
 
+class CPUDispatcher(dispatcher.Dispatcher):
+    targetdescr = cpu_target
+
+
 class TargetRegistry(utils.UniqueDict):
     """
     A registry of API implementations for various backends.
@@ -99,3 +103,4 @@ def __getitem__(self, item):
 
 
 dispatcher_registry = TargetRegistry()
+dispatcher_registry['cpu'] = CPUDispatcher

numba/tests/test_inlining.py

@@ -7,7 +7,7 @@
 from numba.core import types, ir, postproc, compiler
 from numba.core.ir_utils import (guard, find_callname, find_const,
                                  get_definition, simplify_CFG)
-from numba.core.cpu_dispatcher import CPUDispatcher
+from numba.core.registry import CPUDispatcher
 from numba.core.inline_closurecall import inline_closure_call
 
 from numba.core.untyped_passes import (ExtractByteCode, TranslateByteCode, FixupArgs,

numba/tests/test_wrapper.py

@@ -1,7 +1,7 @@
 import numpy as np
 
 import unittest
-from numba.core import types, utils, compiler, registry, cpu_dispatcher
+from numba.core import types, utils, compiler, registry
 
 
 def overhead(x):
@@ -24,7 +24,7 @@ def test_overhead(self):
         """
         cr = compiler.compile_isolated(overhead, [types.int32])
         cfunc = cr.entry_point
-        disp = cpu_dispatcher.CPUDispatcher(overhead)
+        disp = registry.CPUDispatcher(overhead)
         disp.add_overload(cr)
 
         x = 321
@@ -50,7 +50,7 @@ def test_array_overhead(self):
         """
         cr = compiler.compile_isolated(array_overhead, [types.int32[::1]])
         cfunc = cr.entry_point
-        disp = cpu_dispatcher.CPUDispatcher(array_overhead)
+        disp = registry.CPUDispatcher(array_overhead)
         disp.add_overload(cr)
 
         self.assertEqual(cr.signature.args[0].layout, 'C')
@@ -79,7 +79,7 @@ def test_add(self):
         """
         cr = compiler.compile_isolated(add, [types.int32])
         cfunc = cr.entry_point
-        disp = cpu_dispatcher.CPUDispatcher(add)
+        disp = registry.CPUDispatcher(add)
         disp.add_overload(cr)
 
         x = 321