[Refactor][NFC] Vendor-in numba.np modules for future CUDA-specific changes

numba_cuda/numba/cuda/core/base.py

@@ -1040,15 +1040,15 @@ def make_data_helper(self, builder, typ, ref=None):
         return self._make_helper(builder, typ, ref=ref, kind="data")
 
     def make_array(self, typ):
-        from numba.np import arrayobj
+        from numba.cuda.np import arrayobj
 
         return arrayobj.make_array(typ)
 
     def populate_array(self, arr, **kwargs):
         """
         Populate array structure.
         """
-        from numba.np import arrayobj
+        from numba.cuda.np import arrayobj
 
         return arrayobj.populate_array(arr, **kwargs)
 

numba_cuda/numba/cuda/core/config.py

@@ -149,7 +149,7 @@ def check_numba_config(self):
                         "numba.config is deprecated for numba-cuda "
                         "and support for configuration values from it "
                         "will be removed in a future release. "
-                        "Please use numba.cuda.config."
+                        "Please use numba.cuda.core.config."
                     )
                     warnings.warn(msg, category=DeprecationWarning)
                     self.value = config_value
@@ -610,7 +610,7 @@ def num_threads_default():
             "NUMBA_NUM_THREADS" in globals()
             and globals()["NUMBA_NUM_THREADS"] != _NUMBA_NUM_THREADS
         ):
-            from numba.np.ufunc import parallel
+            from numba.cuda.np.ufunc import parallel
 
             if parallel._is_initialized:
                 raise RuntimeError(

numba_cuda/numba/cuda/core/inline_closurecall.py

@@ -38,7 +38,7 @@
 from numba.core.typing import signature
 
 from numba.cuda.core import postproc, rewrites
-from numba.np.unsafe.ndarray import empty_inferred as unsafe_empty_inferred
+from numba.cuda.np.unsafe.ndarray import empty_inferred as unsafe_empty_inferred
 import numpy as np
 import operator
 from numba.cuda.misc.special import prange
@@ -1119,7 +1119,7 @@ def codegen(context, builder, sig, args):
             intp_t = context.get_value_type(types.intp)
             iterobj = context.make_helper(builder, iterty, value=value)
             arrayty = iterty.array_type
-            from numba.np.arrayobj import make_array
+            from numba.cuda.np.arrayobj import make_array
 
             ary = make_array(arrayty)(context, builder, value=iterobj.array)
             shape = cgutils.unpack_tuple(builder, ary.shape)

numba_cuda/numba/cuda/cudadrv/devicearray.py

@@ -21,9 +21,9 @@
 from numba.cuda.cudadrv import driver as _driver
 from numba.core import types
 from numba.cuda.core import config
-from numba.np.unsafe.ndarray import to_fixed_tuple
-from numba.np.numpy_support import numpy_version
-from numba.np import numpy_support
+from numba.cuda.np.unsafe.ndarray import to_fixed_tuple
+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 warnings import warn

numba_cuda/numba/cuda/cudaimpl.py

@@ -14,8 +14,8 @@
 from numba.core.datamodel import models
 from numba.core import types
 from numba.cuda import cgutils
-from numba.np import ufunc_db
-from numba.np.npyimpl import register_ufuncs
+from numba.cuda.np import ufunc_db
+from numba.cuda.np.npyimpl import register_ufuncs
 from .cudadrv import nvvm
 from numba import cuda
 from numba.cuda import nvvmutils, stubs

numba_cuda/numba/cuda/kernels/reduction.py

@@ -5,7 +5,7 @@
 A library written in CUDA Python for generating reduction kernels
 """
 
-from numba.np.numpy_support import from_dtype
+from numba.cuda.np.numpy_support import from_dtype
 
 
 _WARPSIZE = 32

numba_cuda/numba/cuda/kernels/transpose.py

@@ -4,7 +4,7 @@
 from numba import cuda
 from numba.cuda.cudadrv.driver import driver
 import math
-from numba.np import numpy_support as nps
+from numba.cuda.np import numpy_support as nps
 
 
 def transpose(a, b=None):

numba_cuda/numba/cuda/misc/cffiimpl.py

@@ -7,7 +7,7 @@
 
 from numba.core.imputils import Registry
 from numba.core import types
-from numba.np import arrayobj
+from numba.cuda.np import arrayobj
 
 registry = Registry("cffiimpl")