Switch to real NumPy from mock NumPy

Now that keyword arguments are supported for overloads, there is no need
to use the kwarg-free mock NumPy functions, and the real ones can be
used instead.

Author: gmarkall

numba_cuda/numba/cuda/tests/nrt/mock_numpy.py

@@ -5,7 +5,6 @@
 import unittest
 from numba.cuda.testing import CUDATestCase
 
-from numba.cuda.tests.nrt.mock_numpy import cuda_empty, cuda_ones, cuda_arange
 from numba.tests.support import run_in_subprocess, override_config
 
 from numba import cuda
@@ -24,7 +23,7 @@ def f(x):
 
         @cuda.jit
         def g():
-            x = cuda_empty(10, np.int64)
+            x = np.empty(10, np.int64)
             f(x)
 
         g[1,1]()
@@ -37,7 +36,7 @@ def f(x):
 
         @cuda.jit
         def g():
-            x = cuda_empty(10, np.int64)
+            x = np.empty(10, np.int64)
             f(x)
 
         g[1,1]()
@@ -66,7 +65,7 @@ def f(x):
 
         @cuda.jit
         def g(out_ary):
-            x = cuda_empty(10, np.int64)
+            x = np.empty(10, np.int64)
             x[5] = 1
             y = f(x)
             out_ary[0] = y[0]
@@ -97,11 +96,11 @@ def test_stats_env_var_explicit_on(self):
         src = """if 1:
         from numba import cuda
         from numba.cuda.runtime import rtsys
-        from numba.cuda.tests.nrt.mock_numpy import cuda_arange
+        import numpy as np
 
         @cuda.jit
         def foo():
-            x = cuda_arange(10)[0]
+            x = np.arange(10)[0]
 
         # initialize the NRT before use
         rtsys.initialize()
@@ -167,8 +166,8 @@ def test_stats_status_toggle(self):
 
         @cuda.jit
         def foo():
-            tmp = cuda_ones(3)
-            arr = cuda_arange(5 * tmp[0]) # noqa: F841
+            tmp = np.ones(3)
+            arr = np.arange(5 * tmp[0]) # noqa: F841
             return None
 
         with (

numba_cuda/numba/cuda/tests/nrt/test_nrt.py

@@ -4,7 +4,6 @@
 from numba.cuda.runtime import rtsys
 from numba.cuda.tests.support import EnableNRTStatsMixin
 from numba.cuda.testing import CUDATestCase
-from numba.cuda.tests.nrt.mock_numpy import cuda_empty, cuda_empty_like
 
 from numba import cuda
 
@@ -34,7 +33,7 @@ def test_no_return(self):
         @cuda.jit
         def kernel():
             for i in range(n):
-                temp = cuda_empty(2, np.float64) # noqa: F841
+                temp = np.empty(2) # noqa: F841
             return None
 
         init_stats = rtsys.get_allocation_stats()
@@ -51,7 +50,7 @@ def test_escaping_var_init_in_loop(self):
         @cuda.jit
         def g(n):
 
-            x = cuda_empty((n, 2), np.float64)
+            x = np.empty((n, 2))
 
             for i in range(n):
                 y = x[i]
@@ -73,13 +72,13 @@ def test_invalid_computation_of_lifetime(self):
         """
         @cuda.jit
         def if_with_allocation_and_initialization(arr1, test1):
-            tmp_arr = cuda_empty_like(arr1)
+            tmp_arr = np.empty_like(arr1)
 
             for i in range(tmp_arr.shape[0]):
                 pass
 
             if test1:
-                cuda_empty_like(arr1)
+                np.empty_like(arr1)
 
         arr = np.random.random((5, 5))  # the values are not consumed