pathfinder: share libnvcudla test skip helper

Move the libnvcudla.so skip logic into conftest so cudla and nvcudla tests use
one shared rule. Keeping the helper in the pytest support layer avoids duplicate
test code while still deferring the pathfinder import until the helper runs.

Made-with: Cursor

Author: rwgk

cuda_pathfinder/tests/conftest.py

@@ -29,3 +29,15 @@ def _append(message):
         request.config.custom_info.append(f"{request.node.name}: {message}")
 
     return _append
+
+
+def skip_if_missing_libnvcudla_so(libname: str, *, timeout: float) -> None:
+    if libname not in ("cudla", "nvcudla"):
+        return
+    # Keep the import inside the helper so unrelated import issues do not fail
+    # pytest collection for the whole test suite.
+    from cuda.pathfinder._dynamic_libs import load_nvidia_dynamic_lib as load_nvidia_dynamic_lib_module
+
+    if load_nvidia_dynamic_lib_module._loadable_via_canary_subprocess("nvcudla", timeout=timeout):
+        return
+    pytest.skip("libnvcudla.so is not loadable via canary subprocess on this host.")

cuda_pathfinder/tests/test_driver_lib_loading.py

@@ -16,7 +16,7 @@
     run_load_nvidia_dynamic_lib_in_subprocess,
 )
 
-from cuda.pathfinder._dynamic_libs import load_nvidia_dynamic_lib as load_nvidia_dynamic_lib_module
+from conftest import skip_if_missing_libnvcudla_so
 from cuda.pathfinder._dynamic_libs.lib_descriptor import LIB_DESCRIPTORS
 from cuda.pathfinder._dynamic_libs.load_dl_common import DynamicLibNotFoundError, LoadedDL
 from cuda.pathfinder._dynamic_libs.load_nvidia_dynamic_lib import (
@@ -41,14 +41,6 @@ def _make_loaded_dl(path, found_via):
     return LoadedDL(path, False, 0xDEAD, found_via)
 
 
-def _skip_if_missing_nvcudla_runtime(libname: str, *, timeout: float) -> None:
-    if libname != "nvcudla":
-        return
-    if load_nvidia_dynamic_lib_module._loadable_via_canary_subprocess("nvcudla", timeout=timeout):
-        return
-    pytest.skip("libnvcudla.so is not loadable via canary subprocess on this host.")
-
-
 # ---------------------------------------------------------------------------
 # _load_driver_lib_no_cache
 # ---------------------------------------------------------------------------
@@ -156,7 +148,7 @@ def raise_child_process_failed():
         error_label="Load subprocess child process",
     )
     if payload.status == STATUS_NOT_FOUND:
-        _skip_if_missing_nvcudla_runtime(libname, timeout=timeout)
+        skip_if_missing_libnvcudla_so(libname, timeout=timeout)
         if STRICTNESS == "all_must_work":
             raise_child_process_failed()
         info_summary_append(f"Not found: {libname=!r}")

cuda_pathfinder/tests/test_load_nvidia_dynamic_lib.py

@@ -11,6 +11,7 @@
 )
 from local_helpers import have_distribution
 
+from conftest import skip_if_missing_libnvcudla_so
 from cuda.pathfinder import DynamicLibNotAvailableError, DynamicLibUnknownError, load_nvidia_dynamic_lib
 from cuda.pathfinder._dynamic_libs import load_nvidia_dynamic_lib as load_nvidia_dynamic_lib_module
 from cuda.pathfinder._dynamic_libs import supported_nvidia_libs
@@ -106,14 +107,6 @@ def _is_expected_load_nvidia_dynamic_lib_failure(libname):
     return False
 
 
-def _skip_if_missing_nvcudla_runtime(libname: str, *, timeout: float) -> None:
-    if libname not in ("cudla", "nvcudla"):
-        return
-    if load_nvidia_dynamic_lib_module._loadable_via_canary_subprocess("nvcudla", timeout=timeout):
-        return
-    pytest.skip("libnvcudla.so is not loadable via canary subprocess on this host.")
-
-
 @pytest.mark.parametrize(
     "libname",
     supported_nvidia_libs.SUPPORTED_WINDOWS_DLLS if IS_WINDOWS else supported_nvidia_libs.SUPPORTED_LINUX_SONAMES,
@@ -128,7 +121,7 @@ def raise_child_process_failed():
         raise RuntimeError(build_child_process_failed_for_libname_message(libname, result))
 
     if result.returncode != 0:
-        _skip_if_missing_nvcudla_runtime(libname, timeout=timeout)
+        skip_if_missing_libnvcudla_so(libname, timeout=timeout)
         raise_child_process_failed()
     assert not result.stderr
     payload = parse_dynamic_lib_subprocess_payload(
@@ -137,7 +130,7 @@ def raise_child_process_failed():
         error_label="Load subprocess child process",
     )
     if payload.status == STATUS_NOT_FOUND:
-        _skip_if_missing_nvcudla_runtime(libname, timeout=timeout)
+        skip_if_missing_libnvcudla_so(libname, timeout=timeout)
         if STRICTNESS == "all_must_work" and not _is_expected_load_nvidia_dynamic_lib_failure(libname):
             raise_child_process_failed()
         info_summary_append(f"Not found: {libname=!r}")