update skip_on_cudasim to have messages, and update errors import to use vendored in numba.cuda.core.errors

Author: atmnp

numba_cuda/numba/cuda/tests/test_array_attr.py

@@ -10,7 +10,7 @@
 from numba.core import types
 from numba.cuda.tests.support import MemoryLeakMixin
 from numba.cuda.testing import CUDATestCase
-from numba.core.errors import TypingError
+from numba.cuda.core.errors import TypingError
 from numba.cuda.tests.support import override_config
 from numba.cuda import config
 

numba_cuda/numba/cuda/tests/test_array_constants.py

@@ -118,7 +118,7 @@ def bytes_as_const_array_kernel(output_array, size):
             output_array[i] = 111  # 'o'
 
 
-@skip_on_cudasim
+@skip_on_cudasim("CUDA simulator does not support array constants")
 class TestConstantArray(CUDATestCase):
     """
     Test array constants.
@@ -260,7 +260,7 @@ def big_array_kernel(input_array, output_array, size):
         np.testing.assert_array_equal(f_array.flatten(), result)
 
 
-@skip_on_cudasim
+@skip_on_cudasim("CUDA simulator does not support array constants")
 class TestConstantBytes(CUDATestCase):
     def test_constant_bytes(self):
         # Test constant bytes array in CUDA kernel

numba_cuda/numba/cuda/tests/test_array_iterators.py

@@ -617,7 +617,7 @@ def test_nditer3(self):
     def test_errors(self):
         # Incompatible shapes
         pyfunc = np_nditer2b_err
-        cfunc = jit(debug=True)(pyfunc)
+        cfunc = jit(debug=True, opt=False)(pyfunc)
 
         self.disable_leak_check()
 

numba_cuda/numba/cuda/typing/context.py

@@ -491,13 +491,7 @@ def is_external(obj):
             else:
                 # A type was already inserted, see if we can add to it
                 newty = existing.augment(gty)
-                if (
-                    newty is None
-                    and ".".join(
-                        str(existing.__class__.__module__).split(".")[:2]
-                    )
-                    != "numba.core"
-                ):
+                if newty is None:
                     raise TypeError(
                         "cannot augment %s with %s" % (existing, gty)
                     )