Address comments in PR

Author: mdboom

cuda_bindings/cuda/bindings/_lib/windll.pxd

@@ -12,6 +12,7 @@ cdef extern from "windows.h" nogil:
     ctypedef unsigned long DWORD
     ctypedef const wchar_t *LPCWSTR
     ctypedef const char *LPCSTR
+    ctypedef int BOOL
 
     cdef DWORD LOAD_LIBRARY_SEARCH_SYSTEM32 = 0x00000800
 
@@ -23,6 +24,8 @@ cdef extern from "windows.h" nogil:
 
     FARPROC _GetProcAddress "GetProcAddress"(HMODULE hModule, LPCSTR lpProcName)
 
+    BOOL _FreeLibrary "FreeLibrary"(HMODULE hLibModule)
+
 cdef inline uintptr_t LoadLibraryExW(str path, HANDLE hFile, DWORD dwFlags):
     cdef uintptr_t result
     cdef wchar_t* wpath = PyUnicode_AsWideCharString(path, NULL)
@@ -37,3 +40,6 @@ cdef inline uintptr_t LoadLibraryExW(str path, HANDLE hFile, DWORD dwFlags):
 
 cdef inline FARPROC GetProcAddress(uintptr_t hModule, const char* lpProcName) nogil:
     return _GetProcAddress(<HMODULE>hModule, lpProcName)
+
+cdef inline BOOL FreeLibrary(uintptr_t hLibModule) nogil:
+    return _FreeLibrary(<HMODULE>hLibModule)

cuda_bindings/cuda/bindings/cyruntime.pyx.in

@@ -1897,7 +1897,7 @@ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCa
 
     # Load
     with gil:
-        lib = load_nvidia_dynamic_lib("cudart")
+        loaded_dl = load_nvidia_dynamic_lib("cudart")
         {{if 'Windows' == platform.system()}}
         handle = <uintptr_t>lib._handle_uint
         {{else}}
@@ -1912,14 +1912,16 @@ cdef cudaError_t getLocalRuntimeVersion(int* runtimeVersion) except ?cudaErrorCa
 
     if __cudaRuntimeGetVersion == NULL:
         with gil:
-            raise RuntimeError(f'Function "cudaRuntimeGetVersion" not found in {lib.abs_path}')
+            raise RuntimeError(f'Function "cudaRuntimeGetVersion" not found in {loaded_dl.abs_path}')
 
     # Call
     cdef cudaError_t err = cudaSuccess
     err = (<cudaError_t (*)(int*) except ?cudaErrorCallRequiresNewerDriver nogil> __cudaRuntimeGetVersion)(runtimeVersion)
 
     # Unload
-    {{if 'Windows' != platform.system()}}
+    {{if 'Windows' == platform.system()}}
+    windll.FreeLibrary(handle) 
+    {{else}}
     dlfcn.dlclose(handle)
     {{endif}}
 

cuda_bindings/tests/test_cudart.py

@@ -1407,7 +1407,7 @@ def test_getLocalRuntimeVersion():
     try:
         err, version = cudart.getLocalRuntimeVersion()
     except pathfinder.DynamicLibNotFoundError:
-        pass
+        pytest.skip("cudart dynamic lib not available")
     else:
         assertSuccess(err)
         assert version >= 12000  # CUDA 12.0