Factor out _load_nvidia_dynamic_library_no_cache() and use for exercising LoadedDL.was_already_loaded_from_elsewhere

Author: rwgk

cuda_bindings/cuda/bindings/_path_finder/load_nvidia_dynamic_library.py

@@ -134,8 +134,7 @@ class LoadedDL:
     was_already_loaded_from_elsewhere: bool
 
 
-@functools.cache
-def load_nvidia_dynamic_library(libname: str) -> LoadedDL:
+def _load_nvidia_dynamic_library_no_cache(libname: str) -> LoadedDL:
     # Detect if the library was loaded already in some other way (i.e. not via this function).
     if sys.platform == "win32":
         for dll_name in SUPPORTED_WINDOWS_DLLS.get(libname, ()):
@@ -187,3 +186,8 @@ def load_nvidia_dynamic_library(libname: str) -> LoadedDL:
         except OSError as e:
             raise RuntimeError(f"Failed to dlopen {found.abs_path}: {e}") from e
         return LoadedDL(handle._handle, found.abs_path, False)
+
+
+@functools.cache
+def load_nvidia_dynamic_library(libname: str) -> LoadedDL:
+    return _load_nvidia_dynamic_library_no_cache(libname)

cuda_bindings/tests/test_path_finder.py

@@ -52,7 +52,21 @@ def test_find_or_load_nvidia_dynamic_library(api, libname):
     else:
         code = f"""\
 from cuda.bindings.path_finder import load_nvidia_dynamic_library
-load_nvidia_dynamic_library({libname!r})
+from cuda.bindings._path_finder.load_nvidia_dynamic_library import _load_nvidia_dynamic_library_no_cache
+
+loaded_dl_fresh = load_nvidia_dynamic_library({libname!r})
+if loaded_dl_fresh.was_already_loaded_from_elsewhere:
+    raise RuntimeError("loaded_dl_fresh.was_already_loaded_from_elsewhere")
+
+loaded_dl_from_cache = load_nvidia_dynamic_library({libname!r})
+if loaded_dl_from_cache is not loaded_dl_fresh:
+    raise RuntimeError("loaded_dl_from_cache is not loaded_dl_fresh")
+
+loaded_dl_no_cache = _load_nvidia_dynamic_library_no_cache({libname!r})
+if not loaded_dl_no_cache.was_already_loaded_from_elsewhere:
+    raise RuntimeError("loaded_dl_no_cache.was_already_loaded_from_elsewhere")
+if loaded_dl_no_cache.abs_path != loaded_dl_fresh.abs_path:
+    raise RuntimeError(f"{{loaded_dl_no_cache.abs_path=!r}} != {{loaded_dl_fresh.abs_path=!r}}")
 """
     result = subprocess.run(
         [sys.executable, "-c", code],