diff --git a/numba_cuda/numba/cuda/tests/cudapy/test_inspect.py b/numba_cuda/numba/cuda/tests/cudapy/test_inspect.py index 5a038a11c..30bd31bc4 100644 --- a/numba_cuda/numba/cuda/tests/cudapy/test_inspect.py +++ b/numba_cuda/numba/cuda/tests/cudapy/test_inspect.py @@ -16,6 +16,14 @@ class TestInspect(CUDATestCase): def cc(self): return cuda.current_context().device.compute_capability + def skip_on_cuda_version_issues(self): + # FIXME: This should be unskipped once the cause of certain nvdisasm + # versions failing to dump SASS with certain driver / nvJitLink + # versions is understood + self.skipTest( + "Relocation information required for analysis not preserved" + ) + def test_monotyped(self): sig = (float32, int32) @@ -110,6 +118,8 @@ def _test_inspect_sass(self, kernel, name, sass): @skip_without_nvdisasm("nvdisasm needed for inspect_sass()") def test_inspect_sass_eager(self): + self.skip_on_cuda_version_issues() + sig = (float32[::1], int32[::1]) @cuda.jit(sig, lineinfo=True) @@ -122,6 +132,8 @@ def add(x, y): @skip_without_nvdisasm("nvdisasm needed for inspect_sass()") def test_inspect_sass_lazy(self): + self.skip_on_cuda_version_issues() + @cuda.jit(lineinfo=True) def add(x, y): i = cuda.grid(1) @@ -139,6 +151,8 @@ def add(x, y): "Missing nvdisasm exception only generated when it is not present" ) def test_inspect_sass_nvdisasm_missing(self): + self.skip_on_cuda_version_issues() + @cuda.jit((float32[::1],)) def f(x): x[0] = 0 @@ -150,6 +164,8 @@ def f(x): @skip_without_nvdisasm("nvdisasm needed for inspect_sass_cfg()") def test_inspect_sass_cfg(self): + self.skip_on_cuda_version_issues() + sig = (float32[::1], int32[::1]) @cuda.jit(sig) diff --git a/numba_cuda/numba/cuda/tests/test_binary_generation/generate_raw_ltoir.py b/numba_cuda/numba/cuda/tests/test_binary_generation/generate_raw_ltoir.py index 18959945f..c260b53e1 100644 --- a/numba_cuda/numba/cuda/tests/test_binary_generation/generate_raw_ltoir.py +++ b/numba_cuda/numba/cuda/tests/test_binary_generation/generate_raw_ltoir.py @@ -6,7 +6,7 @@ import subprocess import sys -from cuda import nvrtc +from cuda.bindings import nvrtc from numba.cuda.memory_management.nrt import get_include # Magic number found at the start of an LTO-IR file diff --git a/pyproject.toml b/pyproject.toml index b7c66dd32..c5798dd20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,6 +32,7 @@ cu12 = [ "nvidia-cuda-nvcc-cu12", # for libNVVM "nvidia-cuda-runtime-cu12", "nvidia-cuda-nvrtc-cu12", + "nvidia-cuda-cccl-cu12", ] test = [ "psutil",