[Refactor][NFC] Vendor-in errors for future CUDA-specific changes (#534)

This change vendors in numba.core.errors for future CUDA-specific
changes.

This change also incorporates some minor import cleanups to use already
vendored in modules instead of upstream ones.

---------

Co-authored-by: Graham Markall <[email protected]>
Co-authored-by: Graham Markall <[email protected]>

Author: atmnp

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

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/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

numba_cuda/numba/cuda/core/consts.py

@@ -4,8 +4,8 @@
 
 import weakref
 
-from numba.core.errors import ConstantInferenceError, NumbaError
-from numba.core import ir
+from numba.cuda.core.errors import ConstantInferenceError, NumbaError
+from numba.cuda.core import ir
 
 
 class ConstantInference(object):

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