Revert target_extension vendoring

Author: VijayKandiah

numba_cuda/numba/cuda/compiler.py

@@ -742,7 +742,7 @@ def compile_cuda(
     flags.lto = lto
 
     # Run compilation pipeline
-    from numba.cuda.core.target_extension import target_override
+    from numba.core.target_extension import target_override
 
     with target_override("cuda"):
         cres = compile_extra(

numba_cuda/numba/cuda/core/base.py

@@ -212,7 +212,7 @@ def enable_boundscheck(self, value):
     def __init__(self, typing_context, target):
         self.address_size = utils.MACHINE_BITS
         self.typing_context = typing_context
-        from numba.cuda.core.target_extension import target_registry
+        from numba.core.target_extension import target_registry
 
         self.target_name = target
         self.target = target_registry[target]

numba_cuda/numba/cuda/core/target_extension.py

@@ -731,7 +731,7 @@ def load_overload(self, sig, target_context):
         # Loading an overload refreshes the context to ensure it is
         # initialized. To initialize the correct (i.e. CUDA) target, we need to
         # enforce that the current target is the CUDA target.
-        from numba.cuda.core.target_extension import target_override
+        from numba.core.target_extension import target_override
 
         with target_override("cuda"):
             return super().load_overload(sig, target_context)

numba_cuda/numba/cuda/dispatcher.py

@@ -8,7 +8,7 @@ def initialize_all():
 
     from numba.cuda.decorators import jit
     from numba.cuda.dispatcher import CUDADispatcher
-    from numba.cuda.core.target_extension import (
+    from numba.core.target_extension import (
         target_registry,
         dispatcher_registry,
         jit_registry,

numba_cuda/numba/cuda/initialize.py

@@ -1239,7 +1239,7 @@ def _lower_call_normal(self, fnty, expr, signature):
             )
         tname = expr.target
         if tname is not None:
-            from numba.cuda.core.target_extension import (
+            from numba.core.target_extension import (
                 resolve_dispatcher_from_str,
             )
 

numba_cuda/numba/cuda/lowering.py

@@ -13,7 +13,7 @@
 import numba
 from numba.core.errors import TypingError
 from numba.cuda.tests.support import TestCase
-from numba.cuda.core.target_extension import resolve_dispatcher_from_str
+from numba.core.target_extension import resolve_dispatcher_from_str
 from numba.cuda.cloudpickle import dumps, loads
 
 

numba_cuda/numba/cuda/tests/core/test_serialize.py

@@ -315,7 +315,7 @@ def get_call_type(self, context, args, kws):
         )
 
         # get the order in which to try templates
-        from numba.cuda.core.target_extension import (
+        from numba.core.target_extension import (
             get_local_target,
         )  # circular
 

numba_cuda/numba/cuda/types/functions.py

@@ -291,7 +291,7 @@ def find_matching_getattr_template(self, typ, attr):
         templates = list(self._get_attribute_templates(typ))
 
         # get the order in which to try templates
-        from numba.cuda.core.target_extension import get_local_target
+        from numba.core.target_extension import get_local_target
 
         target_hw = get_local_target(self)
         order = order_by_target_specificity(target_hw, templates, fnkey=attr)
@@ -446,7 +446,7 @@ def install_registry(self, registry, external_defs_only=False):
             loader = templates.RegistryLoader(registry)
             self._registries[registry] = loader
 
-        from numba.cuda.core.target_extension import (
+        from numba.core.target_extension import (
             get_local_target,
             resolve_target_str,
         )

numba_cuda/numba/cuda/typing/context.py

@@ -767,7 +767,7 @@ def _get_impl(self, args, kws):
     def _get_jit_decorator(self):
         """Gets a jit decorator suitable for the current target"""
 
-        from numba.cuda.core.target_extension import (
+        from numba.core.target_extension import (
             target_registry,
             get_local_target,
             jit_registry,
@@ -976,7 +976,7 @@ def _get_target_registry(self, reason):
         -------
         reg : a registry suitable for the current target.
         """
-        from numba.cuda.core.target_extension import (
+        from numba.core.target_extension import (
             _get_local_target_checked,
             dispatcher_registry,
         )