cuda.pathfinder.nvidia_dynamic_libs.load_lib → cuda.pathfinder.load_nvidia_dynamic_lib

Author: rwgk

cuda_bindings/cuda/bindings/path_finder.py

@@ -1,8 +1,8 @@
 # Copyright 2024-2025 NVIDIA Corporation.  All rights reserved.
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
-from cuda.pathfinder.nvidia_dynamic_libs import SUPPORTED_LIBNAMES as _SUPPORTED_LIBNAMES
-from cuda.pathfinder.nvidia_dynamic_libs import load_lib as _load_nvidia_dynamic_library
+from cuda.pathfinder import SUPPORTED_NVIDIA_LIBNAMES as _SUPPORTED_LIBNAMES
+from cuda.pathfinder import load_nvidia_dynamic_lib as _load_nvidia_dynamic_library
 
 __all__ = [
     "_load_nvidia_dynamic_library",

cuda_pathfinder/cuda/pathfinder/__init__.py

@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+from cuda.pathfinder._dynamic_libs import load_nvidia_dynamic_lib as _load_nvidia_dynamic_lib
+from cuda.pathfinder._dynamic_libs.load_dl_common import LoadedDL
+from cuda.pathfinder._dynamic_libs.supported_nvidia_libs import SUPPORTED_LIBNAMES as SUPPORTED_NVIDIA_LIBNAMES
+
+__all__ = ["SUPPORTED_NVIDIA_LIBNAMES", "load_nvidia_dynamic_lib"]
+
+
+def load_nvidia_dynamic_lib(libname: str) -> LoadedDL:
+    """Load a NVIDIA dynamic library by name.
+
+    Args:
+        libname: The name of the library to load (e.g. "cudart", "nvvm", etc.)
+
+    Returns:
+        A LoadedDL object containing the library handle and path
+
+    Raises:
+        RuntimeError: If the library cannot be found or loaded
+    """
+    return _load_nvidia_dynamic_lib.load_lib(libname)

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/load_nvidia_dynamic_library.py renamed to cuda_pathfinder/cuda/pathfinder/_dynamic_libs/load_nvidia_dynamic_lib.py

@@ -49,15 +49,4 @@ def _load_lib_no_cache(libname: str) -> LoadedDL:
 
 @functools.cache
 def load_lib(libname: str) -> LoadedDL:
-    """Load a NVIDIA dynamic library by name.
-
-    Args:
-        libname: The name of the library to load (e.g. "cudart", "nvvm", etc.)
-
-    Returns:
-        A LoadedDL object containing the library handle and path
-
-    Raises:
-        RuntimeError: If the library cannot be found or loaded
-    """
     return _load_lib_no_cache(libname)

cuda_pathfinder/cuda/pathfinder/nvidia_dynamic_libs.py

@@ -7,21 +7,19 @@
 import pytest
 import spawned_process_runner
 
-from cuda.pathfinder import nvidia_dynamic_libs
+from cuda.pathfinder import SUPPORTED_NVIDIA_LIBNAMES, load_nvidia_dynamic_lib
 from cuda.pathfinder._dynamic_libs import supported_nvidia_libs
 
-ALL_LIBNAMES = nvidia_dynamic_libs.SUPPORTED_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_ALL
-ALL_LIBNAMES_LINUX = nvidia_dynamic_libs.SUPPORTED_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_LINUX
-ALL_LIBNAMES_WINDOWS = (
-    nvidia_dynamic_libs.SUPPORTED_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_WINDOWS
-)
-if os.environ.get("CUDA_PATHFINDER_TEST_ALL_LIBNAMES", False):
+ALL_LIBNAMES = SUPPORTED_NVIDIA_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_ALL
+ALL_LIBNAMES_LINUX = SUPPORTED_NVIDIA_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_LINUX
+ALL_LIBNAMES_WINDOWS = SUPPORTED_NVIDIA_LIBNAMES + supported_nvidia_libs.PARTIALLY_SUPPORTED_LIBNAMES_WINDOWS
+if os.environ.get("CUDA_PATHFINDER_TEST_ALL_NVIDIA_LIBNAMES", False):
     if sys.platform == "win32":
         TEST_FIND_OR_LOAD_LIBNAMES = ALL_LIBNAMES_WINDOWS
     else:
         TEST_FIND_OR_LOAD_LIBNAMES = ALL_LIBNAMES_LINUX
 else:
-    TEST_FIND_OR_LOAD_LIBNAMES = nvidia_dynamic_libs.SUPPORTED_LIBNAMES
+    TEST_FIND_OR_LOAD_LIBNAMES = SUPPORTED_NVIDIA_LIBNAMES
 
 
 def test_all_libnames_linux_sonames_consistency():
@@ -63,14 +61,13 @@ def build_child_process_failed_for_libname_message(libname, result):
 def child_process_func(libname):
     import os
 
-    from cuda.pathfinder._dynamic_libs.load_nvidia_dynamic_library import _load_lib_no_cache
-    from cuda.pathfinder.nvidia_dynamic_libs import load_lib
+    from cuda.pathfinder._dynamic_libs.load_nvidia_dynamic_lib import _load_lib_no_cache
 
-    loaded_dl_fresh = load_lib(libname)
+    loaded_dl_fresh = load_nvidia_dynamic_lib(libname)
     if loaded_dl_fresh.was_already_loaded_from_elsewhere:
         raise RuntimeError("loaded_dl_fresh.was_already_loaded_from_elsewhere")
 
-    loaded_dl_from_cache = load_lib(libname)
+    loaded_dl_from_cache = load_nvidia_dynamic_lib(libname)
     if loaded_dl_from_cache is not loaded_dl_fresh:
         raise RuntimeError("loaded_dl_from_cache is not loaded_dl_fresh")
 
@@ -84,7 +81,7 @@ def child_process_func(libname):
 
 
 @pytest.mark.parametrize("libname", TEST_FIND_OR_LOAD_LIBNAMES)
-def test_find_or_load_nvidia_dynamic_library(info_summary_append, libname):
+def test_load_nvidia_dynamic_lib(info_summary_append, libname):
     # We intentionally run each dynamic library operation in a child process
     # to ensure isolation of global dynamic linking state (e.g., dlopen handles).
     # Without child processes, loading/unloading libraries during testing could