pass a few more linker tests

Author: brandon-b-miller

numba_cuda/numba/cuda/cudadrv/driver.py

@@ -2806,7 +2806,6 @@ def add_cu(self, cu, name='<cudapy-cu>'):
         numba_cuda_path = os.path.dirname(cudadrv_path)
 
         nrt_path = os.path.join(numba_cuda_path, "runtime")
-
         include_paths = cuda_include + [numba_cuda_path, nrt_path]
         prog = Program(
             cu.decode('utf-8'),

numba_cuda/numba/cuda/tests/cudadrv/test_linker.py

@@ -5,7 +5,7 @@
 from numba.cuda.testing import CUDATestCase, test_data_dir
 from numba.cuda.cudadrv.driver import (CudaAPIError, Linker,
                                        LinkerError)
-from numba.cuda.cudadrv.error import NvrtcError
+from cuda.core.experimental._utils import NVRTCError
 from numba.cuda import require_context
 from numba.tests.support import ignore_internal_warnings
 from numba import cuda, void, float64, int64, int32, typeof, float32
@@ -187,14 +187,14 @@ def test_linking_cu_error(self):
 
         link = str(test_data_dir / 'error.cu')
 
-        with self.assertRaises(NvrtcError) as e:
+        with self.assertRaises(NVRTCError) as e:
             @cuda.jit('void(int32)', link=[link])
             def kernel(x):
                 bar(x)
 
         msg = e.exception.args[0]
         # Check the error message refers to the NVRTC compile
-        self.assertIn('NVRTC Compilation failure', msg)
+        self.assertIn('NVRTC_ERROR_COMPILATION', msg)
         # Check the expected error in the CUDA source is reported
         self.assertIn('identifier "SYNTAX" is undefined', msg)
         # Check the filename is reported correctly