merge/resolve

Author: brandon-b-miller

ci/test_wheel.sh

@@ -13,7 +13,7 @@ echo "Package path: ${package}"
 DEPENDENCIES=(
     "${package}"
     "cuda-python==${CUDA_VER_MAJOR_MINOR%.*}.*"
-    "cuda-core==0.3.*"
+    "cuda-core>=0.3.0,<1.0.0"
     "--group"
     "test"
 )

conda/recipes/numba-cuda/meta.yaml

@@ -30,7 +30,7 @@ requirements:
     - python
     - numba >=0.59.1
     - cuda-bindings >=12.9.1
-    - cuda-core ==0.3.*
+    - cuda-core >=0.3.0,<1.0.0
 
 about:
   home: {{ project_urls["Homepage"] }}

numba_cuda/numba/cuda/_internal/cuda_fp16.py

@@ -21,7 +21,7 @@
 from numba.cuda import types
 from numba.cuda.cudadrv.driver import _have_nvjitlink
 from numba.cuda.datamodel import PrimitiveModel, StructModel
-from numba.core.errors import NumbaPerformanceWarning
+from numba.cuda.core.errors import NumbaPerformanceWarning
 from numba.cuda.extending import (
     lower_cast,
     make_attribute_wrapper,

numba_cuda/numba/cuda/compiler.py

@@ -6,12 +6,12 @@
 from warnings import warn, catch_warnings, simplefilter
 import copy
 
-from numba.core import ir as numba_ir
-from numba.core import bytecode
+from numba.cuda.core import ir as numba_ir
+from numba.cuda.core import bytecode
 from numba.cuda import types
 from numba.cuda.core.options import ParallelOptions
 from numba.core.compiler_lock import global_compiler_lock
-from numba.core.errors import NumbaWarning, NumbaInvalidConfigWarning
+from numba.cuda.core.errors import NumbaWarning, NumbaInvalidConfigWarning
 from numba.cuda.core.interpreter import Interpreter
 
 from numba.cuda import cgutils, typing, lowering, nvvmutils, utils
@@ -741,10 +741,7 @@ def compile_cuda(
     flags.max_registers = max_registers
     flags.lto = lto
 
-    # Run compilation pipeline
-    from numba.core.target_extension import target_override
-
-    with target_override("cuda"):
+    with utils.numba_target_override():
         cres = compile_extra(
             typingctx=typingctx,
             targetctx=targetctx,

numba_cuda/numba/cuda/core/analysis.py

@@ -3,7 +3,8 @@
 
 from collections import namedtuple, defaultdict
 from numba.cuda import types
-from numba.core import ir, errors
+from numba.cuda.core import ir
+from numba.core import errors
 from numba.cuda.core import consts
 import operator
 from functools import reduce
@@ -382,7 +383,7 @@ def find_literally_calls(func_ir, argtypes):
     argtypes : Sequence[numba.types.Type]
         The argument types.
     """
-    from numba.core import ir_utils
+    from numba.cuda.core import ir_utils
 
     marked_args = set()
     first_loc = {}

numba_cuda/numba/cuda/core/annotations/type_annotations.py

@@ -11,7 +11,7 @@
 import textwrap
 from io import StringIO
 
-from numba.core import ir
+from numba.cuda.core import ir
 
 
 class SourceLines(Mapping):

numba_cuda/numba/cuda/core/base.py

@@ -3,6 +3,7 @@
 
 from collections import defaultdict
 import copy
+import importlib
 import sys
 from itertools import permutations, takewhile
 from contextlib import contextmanager
@@ -212,10 +213,15 @@ def enable_boundscheck(self, value):
     def __init__(self, typing_context, target):
         self.address_size = utils.MACHINE_BITS
         self.typing_context = typing_context
-        from numba.core.target_extension import target_registry
-
         self.target_name = target
-        self.target = target_registry[target]
+
+        if importlib.util.find_spec("numba"):
+            from numba.core.target_extension import CUDA
+
+            # Used only in Numba's target_extension implementation.
+            # Numba-CUDA has the target_extension implementation removed, and
+            # references to it hardcoded to values specific to the CUDA target.
+            self.target = CUDA
 
         # A mapping of installed registries to their loaders
         self._registries = {}

numba_cuda/numba/cuda/core/boxing.py

@@ -9,7 +9,7 @@
 
 from numba.cuda import types, cgutils
 from numba.cuda.core.pythonapi import box, unbox, reflect, NativeValue
-from numba.core.errors import NumbaNotImplementedError, TypingError
+from numba.cuda.core.errors import NumbaNotImplementedError, TypingError
 from numba.cuda.typing.typeof import typeof, Purpose
 
 from numba.cuda.cpython import setobj, listobj

numba_cuda/numba/cuda/core/bytecode.py

@@ -8,7 +8,8 @@
 
 from types import CodeType, ModuleType
 
-from numba.core import errors, serialize
+from numba.core import errors
+from numba.core import serialize
 from numba.cuda import utils
 from numba.cuda.utils import PYVERSION
 

numba_cuda/numba/cuda/core/compiler.py

@@ -4,7 +4,7 @@
 from numba.cuda.core.tracing import event
 
 from numba.core import errors
-from numba.core.errors import CompilerError
+from numba.cuda.core.errors import CompilerError
 
 from numba.cuda.core import callconv, config, bytecode
 from numba.cuda.core.untyped_passes import ExtractByteCode, FixupArgs