Strict wheel, conda, system rule: try using the platform-specific dynamic loader search mechanisms only last

Author: rwgk

cuda_bindings/cuda/bindings/_path_finder/load_nvidia_dynamic_library.py

@@ -21,7 +21,7 @@
 
     _LINUX_CDLL_MODE = os.RTLD_NOW | os.RTLD_GLOBAL
 
-from .find_nvidia_dynamic_library import find_nvidia_dynamic_library
+from .find_nvidia_dynamic_library import _find_nvidia_dynamic_library
 from .supported_libs import DIRECT_DEPENDENCIES, SUPPORTED_WINDOWS_DLLS
 
 
@@ -63,38 +63,39 @@ def _windows_load_with_dll_basename(name: str) -> int:
 
 
 @functools.cache
-def load_nvidia_dynamic_library(name: str) -> int:
-    for dep in DIRECT_DEPENDENCIES.get(name, ()):
+def load_nvidia_dynamic_library(libname: str) -> int:
+    for dep in DIRECT_DEPENDENCIES.get(libname, ()):
         load_nvidia_dynamic_library(dep)
 
-    # First try using the platform-specific dynamic loader search mechanisms
-    if sys.platform == "win32":
-        handle = _windows_load_with_dll_basename(name)
-        if handle:
-            return handle
-    else:
-        dl_path = f"lib{name}.so"  # Version intentionally no specified.
-        try:
-            handle = ctypes.CDLL(dl_path, _LINUX_CDLL_MODE)
-        except OSError:
-            pass
+    found = _find_nvidia_dynamic_library(libname)
+    if found.abs_path is None:
+        if sys.platform == "win32":
+            handle = _windows_load_with_dll_basename(libname)
+            if handle:
+                # Use `cdef void* ptr = <void*><intptr_t>` in cython to convert back to void*
+                return handle
         else:
-            # Use `cdef void* ptr = <void*><uintptr_t>` in cython to convert back to void*
-            return handle._handle  # C unsigned int
+            try:
+                handle = ctypes.CDLL(found.lib_searched_for, _LINUX_CDLL_MODE)
+            except OSError:
+                pass
+            else:
+                # Use `cdef void* ptr = <void*><uintptr_t>` in cython to convert back to void*
+                return handle._handle  # C unsigned int
+        found.raise_if_abs_path_is_None()
 
-    dl_path = find_nvidia_dynamic_library(name)
     if sys.platform == "win32":
         flags = _WINBASE_LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | _WINBASE_LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR
         try:
-            handle = win32api.LoadLibraryEx(dl_path, 0, flags)
+            handle = win32api.LoadLibraryEx(found.abs_path, 0, flags)
         except pywintypes.error as e:
-            raise RuntimeError(f"Failed to load DLL at {dl_path}: {e}") from e
+            raise RuntimeError(f"Failed to load DLL at {found.abs_path}: {e}") from e
         # Use `cdef void* ptr = <void*><intptr_t>` in cython to convert back to void*
         return handle  # C signed int, matches win32api.GetProcAddress
     else:
         try:
-            handle = ctypes.CDLL(dl_path, _LINUX_CDLL_MODE)
+            handle = ctypes.CDLL(found.abs_path, _LINUX_CDLL_MODE)
         except OSError as e:
-            raise RuntimeError(f"Failed to dlopen {dl_path}: {e}") from e
+            raise RuntimeError(f"Failed to dlopen {found.abs_path}: {e}") from e
         # Use `cdef void* ptr = <void*><uintptr_t>` in cython to convert back to void*
         return handle._handle  # C unsigned int