Merge branch 'path_finder_search_priority_v2' into path_finder_search_priority_v2_use_in_bindings

Author: rwgk

cuda_bindings/cuda/bindings/_path_finder/load_dl_windows.py

@@ -35,7 +35,7 @@ def add_dll_directory(dll_abs_path: str) -> None:
     os.environ["PATH"] = dirpath if curr_path is None else os.pathsep.join((curr_path, dirpath))
 
 
-def abs_path_for_dynamic_library(handle: int) -> str:
+def abs_path_for_dynamic_library(libname: str, handle: int) -> str:
     """Get the absolute path of a loaded dynamic library on Windows.
 
     Args:
@@ -57,7 +57,8 @@ def abs_path_for_dynamic_library(handle: int) -> str:
 
         if n_chars == 0:
             raise OSError(
-                "GetModuleFileNameW failed. Long paths may require enabling the "
+                f"GetModuleFileNameW failed ({libname=!r}, {buf_size=}). "
+                "Long paths may require enabling the "
                 "Windows 10+ long path registry setting. See: "
                 "https://docs.python.org/3/using/windows.html#removing-the-max-path-limitation"
             )
@@ -99,7 +100,7 @@ def check_if_already_loaded_from_elsewhere(libname: str) -> Optional[LoadedDL]:
         except pywintypes.error:
             continue
         else:
-            return LoadedDL(handle, abs_path_for_dynamic_library(handle), True)
+            return LoadedDL(handle, abs_path_for_dynamic_library(libname, handle), True)
     return None
 
 
@@ -118,7 +119,7 @@ def load_with_system_search(libname: str, _unused: str) -> Optional[LoadedDL]:
     for dll_name in SUPPORTED_WINDOWS_DLLS.get(libname, ()):
         handle = ctypes.windll.kernel32.LoadLibraryW(ctypes.c_wchar_p(dll_name))
         if handle:
-            return LoadedDL(handle, abs_path_for_dynamic_library(handle), False)
+            return LoadedDL(handle, abs_path_for_dynamic_library(libname, handle), False)
 
     return None
 

cuda_bindings/cuda/bindings/_path_finder/supported_libs.py

@@ -111,6 +111,7 @@
 #   cuda_12.5.1_555.42.06_linux.run
 #   cuda_12.6.2_560.35.03_linux.run
 #   cuda_12.8.0_570.86.10_linux.run
+#   cuda_12.9.0_575.51.03_linux.run
 # Generated with toolshed/build_path_finder_sonames.py
 SUPPORTED_LINUX_SONAMES = {
     "cublas": (
@@ -232,6 +233,7 @@
 #   cuda_12.5.1_555.85_windows.exe
 #   cuda_12.6.2_560.94_windows.exe
 #   cuda_12.8.1_572.61_windows.exe
+#   cuda_12.9.0_576.02_windows.txt
 # Generated with toolshed/build_path_finder_dlls.py (WITH MANUAL EDITS)
 SUPPORTED_WINDOWS_DLLS = {
     "cublas": (
@@ -339,6 +341,7 @@
         "nvvm64.dll",
         "nvvm64_33_0.dll",
         "nvvm64_40_0.dll",
+        "nvvm70.dll",
     ),
 }