Move _handle_uint last in LoadedDL, to emphasize that this is private member.

Author: rwgk

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/load_dl_common.py

@@ -13,9 +13,9 @@ class DynamicLibNotFound(RuntimeError):
 
 @dataclass
 class LoadedDL:
-    _handle_uint: int  # Platform-agnostic unsigned pointer value
     abs_path: Optional[str]
     was_already_loaded_from_elsewhere: bool
+    _handle_uint: int  # Platform-agnostic unsigned pointer value
 
 
 def load_dependencies(libname: str, load_func: Callable[[str], LoadedDL]) -> None:

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/load_dl_linux.py

@@ -78,7 +78,7 @@ def check_if_already_loaded_from_elsewhere(libname: str) -> Optional[LoadedDL]:
         except OSError:
             continue
         else:
-            return LoadedDL(handle._handle, abs_path_for_dynamic_library(libname, handle), True)
+            return LoadedDL(abs_path_for_dynamic_library(libname, handle), True, handle._handle)
     return None
 
 
@@ -100,7 +100,7 @@ def load_with_system_search(libname: str, soname: str) -> Optional[LoadedDL]:
         abs_path = abs_path_for_dynamic_library(libname, handle)
         if abs_path is None:
             raise RuntimeError(f"No expected symbol for {libname=!r}")
-        return LoadedDL(handle._handle, abs_path, False)
+        return LoadedDL(abs_path, False, handle._handle)
     except OSError:
         return None
 
@@ -122,4 +122,4 @@ def load_with_abs_path(libname: str, found_path: str) -> LoadedDL:
         handle = ctypes.CDLL(found_path, CDLL_MODE)
     except OSError as e:
         raise RuntimeError(f"Failed to dlopen {found_path}: {e}") from e
-    return LoadedDL(handle._handle, found_path, False)
+    return LoadedDL(found_path, False, handle._handle)

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/load_dl_windows.py

@@ -77,7 +77,7 @@ def check_if_already_loaded_from_elsewhere(libname: str) -> Optional[LoadedDL]:
             continue
         else:
             return LoadedDL(
-                pywintypes_handle_to_unsigned_int(handle), abs_path_for_dynamic_library(libname, handle), True
+                abs_path_for_dynamic_library(libname, handle), True, pywintypes_handle_to_unsigned_int(handle)
             )
     return None
 
@@ -101,7 +101,7 @@ def load_with_system_search(libname: str, soname: str) -> Optional[LoadedDL]:
             continue
         else:
             return LoadedDL(
-                pywintypes_handle_to_unsigned_int(handle), abs_path_for_dynamic_library(libname, handle), False
+                abs_path_for_dynamic_library(libname, handle), False, pywintypes_handle_to_unsigned_int(handle)
             )
 
     return None
@@ -132,4 +132,4 @@ def load_with_abs_path(libname: str, found_path: str) -> LoadedDL:
         handle = win32api.LoadLibraryEx(found_path, 0, flags)
     except pywintypes.error as e:
         raise RuntimeError(f"Failed to load DLL at {found_path}: {e}") from e
-    return LoadedDL(pywintypes_handle_to_unsigned_int(handle), found_path, False)
+    return LoadedDL(found_path, False, pywintypes_handle_to_unsigned_int(handle))