address comments

Author: ksimpson-work

cuda_core/cuda/core/experimental/_linker.py

@@ -32,6 +32,7 @@ def _decide_nvjitlink_or_driver():
     _driver_ver = handle_return(cuda.cuDriverGetVersion())
     _driver_ver = (_driver_ver // 1000, (_driver_ver % 1000) // 10)
     try:
+        raise ImportError
         from cuda.bindings import nvjitlink as _nvjitlink
         from cuda.bindings._internal import nvjitlink as inner_nvjitlink
     except ImportError:

cuda_core/tests/test_linker.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 
 import pytest
 
@@ -20,9 +20,24 @@
 device_function_c = "__device__ int C(int a, int b) { return a + b; }"
 
 culink_backend = _linker._decide_nvjitlink_or_driver()
+skip_options = nullcontext
 if not culink_backend:
     from cuda.bindings import nvjitlink
 
+    @contextmanager
+    def skip_version_specific_linker_options():
+        if culink_backend:
+            return
+        try:
+            yield
+        except nvjitlink.nvJitLinkError as e:
+            if e.status == nvjitlink.Result.ERROR_UNRECOGNIZED_OPTION:
+                pytest.skip("current nvjitlink version does not support the option provided")
+            else:
+                raise
+
+    skip_options = skip_version_specific_linker_options
+
 
 @pytest.fixture(scope="function")
 def compile_ptx_functions(init_cuda):
@@ -44,17 +59,6 @@ def compile_ltoir_functions(init_cuda):
     return object_code_a_ltoir, object_code_b_ltoir, object_code_c_ltoir
 
 
-@contextmanager
-def skip_version_specific_linker_options():
-    if culink_backend:
-        return
-    try:
-        yield
-    except nvjitlink.nvJitLinkError as e:
-        if e.status == nvjitlink.Result.ERROR_UNRECOGNIZED_OPTION:
-            pytest.skip("current nvjitlink version does not support the option provided")
-
-
 culink_options = [
     LinkerOptions(arch=ARCH, verbose=True),
     LinkerOptions(arch=ARCH, max_register_count=32),
@@ -87,11 +91,11 @@ def skip_version_specific_linker_options():
     ],
 )
 def test_linker_init(compile_ptx_functions, options):
-    with skip_version_specific_linker_options():
+    with skip_options():
         linker = Linker(*compile_ptx_functions, options=options)
 
-    object_code = linker.link("cubin")
-    assert isinstance(object_code, ObjectCode)
+        object_code = linker.link("cubin")
+        assert isinstance(object_code, ObjectCode)
 
 
 def test_linker_init_invalid_arch():