vendor in errors

atmnp · atmnp · commit b5819be51b83 · 2025-10-27T09:12:28.000-07:00
diff --git a/numba_cuda/numba/cuda/_internal/cuda_fp16.py b/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,
diff --git a/numba_cuda/numba/cuda/compiler.py b/numba_cuda/numba/cuda/compiler.py
@@ -11,7 +11,7 @@
 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
diff --git a/numba_cuda/numba/cuda/core/boxing.py b/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
diff --git a/numba_cuda/numba/cuda/core/compiler.py b/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
diff --git a/numba_cuda/numba/cuda/core/consts.py b/numba_cuda/numba/cuda/core/consts.py
@@ -4,7 +4,7 @@
 
 import weakref
 
-from numba.core.errors import ConstantInferenceError, NumbaError
+from numba.cuda.core.errors import ConstantInferenceError, NumbaError
 from numba.cuda.core import ir
 
 
diff --git a/numba_cuda/numba/cuda/core/controlflow.py b/numba_cuda/numba/cuda/core/controlflow.py
@@ -6,7 +6,7 @@
 import sys
 
 from numba.core.ir import Loc
-from numba.core.errors import UnsupportedError
+from numba.cuda.core.errors import UnsupportedError
 from numba.cuda.utils import PYVERSION
 
 # List of bytecodes creating a new block in the control flow graph
diff --git a/numba_cuda/numba/cuda/core/errors.py b/numba_cuda/numba/cuda/core/errors.py
@@ -558,7 +558,7 @@ def __exit__(self, exc_type, exc_value, traceback):
         self.flush()
 
 
-class NumbaError(Exception):
+class NumbaError(numba.core.errors.NumbaError):
     def __init__(self, msg, loc=None, highlighting=True):
         self.msg = msg
         self.loc = loc
diff --git a/numba_cuda/numba/cuda/core/interpreter.py b/numba_cuda/numba/cuda/core/interpreter.py
@@ -11,7 +11,7 @@
 from numba.core import errors
 from numba.cuda.core import config, ir
 from numba.cuda.errors import UnsupportedBytecodeError
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     NotDefinedError,
     error_extras,
 )
diff --git a/numba_cuda/numba/cuda/core/ir.py b/numba_cuda/numba/cuda/core/ir.py
@@ -18,7 +18,7 @@
 from numba.core import errors
 from numba.cuda.core import config
 from numba.cuda.utils import UNARY_BUILTINS_TO_OPERATORS, OPERATORS_TO_BUILTINS
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     NotDefinedError,
     RedefinedError,
     VerificationError,
diff --git a/numba_cuda/numba/cuda/core/ir_utils.py b/numba_cuda/numba/cuda/core/ir_utils.py
@@ -20,7 +20,7 @@
     compute_use_defs,
     compute_cfg_from_blocks,
 )
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     TypingError,
     UnsupportedError,
     NumbaPendingDeprecationWarning,
diff --git a/numba_cuda/numba/cuda/core/rewrites/ir_print.py b/numba_cuda/numba/cuda/core/rewrites/ir_print.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
-from numba.core import errors
+from numba.cuda.core import errors
 from numba.cuda.core import ir
 from numba.cuda.core.rewrites import register_rewrite, Rewrite
 
diff --git a/numba_cuda/numba/cuda/core/rewrites/static_binop.py b/numba_cuda/numba/cuda/core/rewrites/static_binop.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
-from numba.core import errors
+from numba.cuda.core import errors
 from numba.cuda.core import ir
 from numba.cuda.core.rewrites import register_rewrite, Rewrite
 
diff --git a/numba_cuda/numba/cuda/core/rewrites/static_getitem.py b/numba_cuda/numba/cuda/core/rewrites/static_getitem.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
-from numba.core import errors
+from numba.cuda.core import errors
 from numba.cuda.core import ir
 from numba.cuda import types
 from numba.cuda.core.rewrites import register_rewrite, Rewrite
diff --git a/numba_cuda/numba/cuda/core/typeinfer.py b/numba_cuda/numba/cuda/core/typeinfer.py
@@ -39,7 +39,7 @@
 from numba.cuda.core import ir
 from numba.cuda import typing
 from numba.cuda.typing.templates import Signature
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     TypingError,
     UntypedAttributeError,
     new_error_context,
diff --git a/numba_cuda/numba/cuda/cpython/builtins.py b/numba_cuda/numba/cuda/cpython/builtins.py
@@ -21,7 +21,7 @@
 from numba.cuda import typing, types
 from numba.cuda import cgutils
 from numba.cuda.extending import overload, intrinsic, register_jitable
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     TypingError,
     LoweringError,
     NumbaTypeError,
diff --git a/numba_cuda/numba/cuda/cpython/unicode.py b/numba_cuda/numba/cuda/cpython/unicode.py
@@ -35,7 +35,7 @@
 )
 from numba.cuda.cext._helperlib import c_helpers
 from numba.cuda.core.unsafe.bytes import memcpy_region
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.cpython.unicode_support import (
     _Py_TOUPPER,
     _Py_TOLOWER,
diff --git a/numba_cuda/numba/cuda/cpython/unicode_support.py b/numba_cuda/numba/cuda/cpython/unicode_support.py
@@ -20,7 +20,7 @@
 
 from numba.cuda.extending import overload, register_jitable
 from numba.cuda.extending import intrinsic
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 
 # This is equivalent to the struct `_PyUnicode_TypeRecord defined in CPython's
 # Objects/unicodectype.c
diff --git a/numba_cuda/numba/cuda/cudadecl.py b/numba_cuda/numba/cuda/cudadecl.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
-from numba.core import errors
+from numba.cuda.core import errors
 from numba.cuda import types
 from numba.cuda.typing.npydecl import (
     parse_dtype,
diff --git a/numba_cuda/numba/cuda/cudadrv/devicearray.py b/numba_cuda/numba/cuda/cudadrv/devicearray.py
@@ -24,7 +24,7 @@
 from numba.cuda.np.numpy_support import numpy_version
 from numba.cuda.np import numpy_support
 from numba.cuda.api_util import prepare_shape_strides_dtype
-from numba.core.errors import NumbaPerformanceWarning
+from numba.cuda.core.errors import NumbaPerformanceWarning
 from warnings import warn
 
 try:
diff --git a/numba_cuda/numba/cuda/decorators.py b/numba_cuda/numba/cuda/decorators.py
@@ -3,7 +3,7 @@
 
 from warnings import warn
 from numba.cuda import types
-from numba.core.errors import DeprecationError, NumbaInvalidConfigWarning
+from numba.cuda.core.errors import DeprecationError, NumbaInvalidConfigWarning
 from numba.cuda.compiler import declare_device_function
 from numba.cuda.core import sigutils, config
 from numba.cuda.dispatcher import CUDADispatcher
diff --git a/numba_cuda/numba/cuda/dispatcher.py b/numba_cuda/numba/cuda/dispatcher.py
@@ -15,7 +15,7 @@
 import re
 from warnings import warn
 
-from numba.core import errors
+from numba.cuda.core import errors
 from numba.cuda import serialize, utils
 from numba import cuda
 
diff --git a/numba_cuda/numba/cuda/errors.py b/numba_cuda/numba/cuda/errors.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import numbers
-from numba.core.errors import LoweringError
+from numba.cuda.core.errors import LoweringError
 
 
 class KernelRuntimeError(RuntimeError):
diff --git a/numba_cuda/numba/cuda/intrinsics.py b/numba_cuda/numba/cuda/intrinsics.py
@@ -6,7 +6,7 @@
 from numba import cuda
 from numba.cuda import types
 from numba.cuda import cgutils
-from numba.core.errors import RequireLiteralValue, TypingError
+from numba.cuda.core.errors import RequireLiteralValue, TypingError
 from numba.cuda.typing import signature
 from numba.cuda.extending import overload_attribute, overload_method
 from numba.cuda import nvvmutils
diff --git a/numba_cuda/numba/cuda/lowering.py b/numba_cuda/numba/cuda/lowering.py
@@ -1,6 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: BSD-2-Clause
 
+import numba
 from collections import namedtuple, defaultdict
 import operator
 import warnings
@@ -19,7 +20,7 @@
     removerefctpass,
 )
 
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     LoweringError,
     new_error_context,
     TypingError,
@@ -1884,5 +1885,5 @@ def _lit_or_omitted(value):
     """
     try:
         return types.literal(value)
-    except LiteralTypingError:
+    except (LiteralTypingError, numba.core.errors.LiteralTypingError):
         return types.Omitted(value)
diff --git a/numba_cuda/numba/cuda/misc/literal.py b/numba_cuda/numba/cuda/misc/literal.py
@@ -4,7 +4,7 @@
 from numba.cuda.extending import overload
 from numba.cuda import types
 from numba.cuda.misc.special import literally, literal_unroll
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 
 
 @overload(literally, target="cuda")
diff --git a/numba_cuda/numba/cuda/np/arraymath.py b/numba_cuda/numba/cuda/np/arraymath.py
@@ -40,7 +40,7 @@
 from numba.cuda.np.linalg import ensure_blas
 
 from numba.cuda.extending import intrinsic
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     RequireLiteralValue,
     TypingError,
     NumbaValueError,
diff --git a/numba_cuda/numba/cuda/np/linalg.py b/numba_cuda/numba/cuda/np/linalg.py
@@ -17,7 +17,7 @@
 from numba.cuda.extending import intrinsic, overload, register_jitable
 from numba.cuda import types
 from numba.cuda import cgutils
-from numba.core.errors import (
+from numba.cuda.core.errors import (
     TypingError,
     NumbaTypeError,
     NumbaPerformanceWarning,
diff --git a/numba_cuda/numba/cuda/np/npdatetime.py b/numba_cuda/numba/cuda/np/npdatetime.py
@@ -22,7 +22,7 @@
 from numba.cuda.np import npdatetime_helpers, numpy_support, npyfuncs
 from numba.cuda.extending import overload_method
 from numba.cuda.core.config import IS_32BITS
-from numba.core.errors import LoweringError
+from numba.cuda.core.errors import LoweringError
 
 # datetime64 and timedelta64 use the same internal representation
 DATETIME64 = TIMEDELTA64 = llvmlite.ir.IntType(64)
diff --git a/numba_cuda/numba/cuda/np/numpy_support.py b/numba_cuda/numba/cuda/np/numpy_support.py
@@ -10,7 +10,7 @@
 from numba.core import errors
 from numba.cuda.typing.templates import signature
 from numba.cuda.np import npdatetime_helpers
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 
 # re-export
 from numba.cuda.cgutils import is_nonelike  # noqa: F401
diff --git a/numba_cuda/numba/cuda/np/polynomial/polynomial_core.py b/numba_cuda/numba/cuda/np/polynomial/polynomial_core.py
@@ -13,7 +13,10 @@
 from numba.cuda import types
 from numba.cuda import cgutils
 import warnings
-from numba.core.errors import NumbaExperimentalFeatureWarning, NumbaValueError
+from numba.cuda.core.errors import (
+    NumbaExperimentalFeatureWarning,
+    NumbaValueError,
+)
 from numpy.polynomial.polynomial import Polynomial
 from contextlib import ExitStack
 import numpy as np
diff --git a/numba_cuda/numba/cuda/np/unsafe/ndarray.py b/numba_cuda/numba/cuda/np/unsafe/ndarray.py
@@ -11,7 +11,7 @@
 from numba.cuda.extending import intrinsic
 from numba.cuda import typing
 from numba.cuda.core.imputils import impl_ret_new_ref
-from numba.core.errors import RequireLiteralValue, TypingError
+from numba.cuda.core.errors import RequireLiteralValue, TypingError
 
 from numba.cuda.cpython.unsafe.tuple import tuple_setitem
 
diff --git a/numba_cuda/numba/cuda/printimpl.py b/numba_cuda/numba/cuda/printimpl.py
@@ -5,7 +5,7 @@
 from llvmlite import ir
 from numba.cuda import types
 from numba.cuda import cgutils
-from numba.core.errors import NumbaWarning
+from numba.cuda.core.errors import NumbaWarning
 from numba.cuda.core.imputils import Registry
 from numba.cuda import nvvmutils
 from numba.cuda.ext_types import Dim3, Bfloat16
diff --git a/numba_cuda/numba/cuda/target.py b/numba_cuda/numba/cuda/target.py
@@ -11,7 +11,7 @@
 from numba.cuda import types
 
 from numba.core.compiler_lock import global_compiler_lock
-from numba.core.errors import NumbaWarning
+from numba.cuda.core.errors import NumbaWarning
 from numba.cuda.core.base import BaseContext
 from numba.cuda.typing import cmathdecl
 from numba.cuda import datamodel
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_caching.py b/numba_cuda/numba/cuda/tests/cudapy/test_caching.py
@@ -11,7 +11,7 @@
 import subprocess
 
 from numba import cuda
-from numba.core.errors import NumbaWarning
+from numba.cuda.core.errors import NumbaWarning
 from numba.cuda.testing import (
     CUDATestCase,
     skip_on_cudasim,
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_debuginfo.py b/numba_cuda/numba/cuda/tests/cudapy/test_debuginfo.py
@@ -13,7 +13,7 @@
 import re
 import unittest
 import warnings
-from numba.core.errors import NumbaDebugInfoWarning
+from numba.cuda.core.errors import NumbaDebugInfoWarning
 from numba.cuda.tests.support import ignore_internal_warnings
 import numpy as np
 import inspect
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_device_func.py b/numba_cuda/numba/cuda/tests/cudapy/test_device_func.py
@@ -15,7 +15,7 @@
 )
 from numba import cuda, jit
 from numba.cuda import float32, int32, types
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.tests.support import skip_unless_cffi
 from types import ModuleType
 
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_dispatcher.py b/numba_cuda/numba/cuda/tests/cudapy/test_dispatcher.py
@@ -16,7 +16,7 @@
 )
 from numba import cuda
 from numba.cuda import config, types
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.testing import (
     cc_X_or_above,
     skip_on_cudasim,
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_errors.py b/numba_cuda/numba/cuda/tests/cudapy/test_errors.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 from numba import cuda
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.testing import unittest, CUDATestCase, skip_on_cudasim
 from numba.cuda.cudadrv import driver
 
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_gufunc.py b/numba_cuda/numba/cuda/tests/cudapy/test_gufunc.py
@@ -10,7 +10,7 @@
 from numba.cuda.testing import skip_on_cudasim, CUDATestCase
 import unittest
 import warnings
-from numba.core.errors import NumbaPerformanceWarning, TypingError
+from numba.cuda.core.errors import NumbaPerformanceWarning, TypingError
 from numba.cuda.tests.support import override_config
 
 
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_lineinfo.py b/numba_cuda/numba/cuda/tests/cudapy/test_lineinfo.py
@@ -3,7 +3,7 @@
 
 from numba import cuda
 from numba.cuda import float32, int32
-from numba.core.errors import NumbaInvalidConfigWarning
+from numba.cuda.core.errors import NumbaInvalidConfigWarning
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
 from numba.cuda.tests.support import ignore_internal_warnings
 import re
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_recursion.py b/numba_cuda/numba/cuda/tests/cudapy/test_recursion.py
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 from numba import cuda
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.testing import CUDATestCase, skip_on_cudasim
 import numpy as np
 import unittest
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_sm.py b/numba_cuda/numba/cuda/tests/cudapy/test_sm.py
diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_warning.py b/numba_cuda/numba/cuda/tests/cudapy/test_warning.py
diff --git a/numba_cuda/numba/cuda/tests/nocuda/test_library_lookup.py b/numba_cuda/numba/cuda/tests/nocuda/test_library_lookup.py
diff --git a/numba_cuda/numba/cuda/tests/test_analysis.py b/numba_cuda/numba/cuda/tests/test_analysis.py
diff --git a/numba_cuda/numba/cuda/tests/test_extending.py b/numba_cuda/numba/cuda/tests/test_extending.py
diff --git a/numba_cuda/numba/cuda/types/cuda_common.py b/numba_cuda/numba/cuda/types/cuda_common.py
diff --git a/numba_cuda/numba/cuda/types/cuda_containers.py b/numba_cuda/numba/cuda/types/cuda_containers.py
diff --git a/numba_cuda/numba/cuda/types/cuda_iterators.py b/numba_cuda/numba/cuda/types/cuda_iterators.py
diff --git a/numba_cuda/numba/cuda/types/cuda_misc.py b/numba_cuda/numba/cuda/types/cuda_misc.py
diff --git a/numba_cuda/numba/cuda/types/cuda_npytypes.py b/numba_cuda/numba/cuda/types/cuda_npytypes.py
diff --git a/numba_cuda/numba/cuda/typing/arraydecl.py b/numba_cuda/numba/cuda/typing/arraydecl.py
diff --git a/numba_cuda/numba/cuda/typing/bufproto.py b/numba_cuda/numba/cuda/typing/bufproto.py
diff --git a/numba_cuda/numba/cuda/typing/cffi_utils.py b/numba_cuda/numba/cuda/typing/cffi_utils.py
diff --git a/numba_cuda/numba/cuda/typing/context.py b/numba_cuda/numba/cuda/typing/context.py
diff --git a/numba_cuda/numba/cuda/typing/npydecl.py b/numba_cuda/numba/cuda/typing/npydecl.py
diff --git a/numba_cuda/numba/cuda/typing/templates.py b/numba_cuda/numba/cuda/typing/templates.py
diff --git a/numba_cuda/numba/cuda/utils.py b/numba_cuda/numba/cuda/utils.py

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`from numba.core import errors`
`12`	`12`	`from numba.cuda.core import config, ir`
`13`	`13`	`from numba.cuda.errors import UnsupportedBytecodeError`
`14`		`-from numba.core.errors import (`
	`14`	`+from numba.cuda.core.errors import (`
`15`	`15`	`NotDefinedError,`
`16`	`16`	`error_extras,`
`17`	`17`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`compute_use_defs,`
`21`	`21`	`compute_cfg_from_blocks,`
`22`	`22`	`)`
`23`		`-from numba.core.errors import (`
	`23`	`+from numba.cuda.core.errors import (`
`24`	`24`	`TypingError,`
`25`	`25`	`UnsupportedError,`
`26`	`26`	`NumbaPendingDeprecationWarning,`