first round of Cursor refactoring (about 4 iterations until all tests passed), followed by ruff auto-fixes

Author: rwgk

cuda_bindings/cuda/bindings/_path_finder/find_dl_common.py

@@ -0,0 +1,79 @@
+# Copyright 2024-2025 NVIDIA Corporation.  All rights reserved.
+#
+# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
+
+import os
+from typing import List, Optional
+
+from .cuda_paths import get_cuda_paths
+from .sys_path_find_sub_dirs import sys_path_find_sub_dirs
+
+
+def no_such_file_in_sub_dirs(
+    sub_dirs: tuple[str, ...], file_wild: str, error_messages: List[str], attachments: List[str]
+) -> None:
+    """Report that a file was not found in the given subdirectories.
+
+    Args:
+        sub_dirs: Tuple of subdirectory names to search
+        file_wild: The file pattern to search for
+        error_messages: List to append error messages to
+        attachments: List to append directory listings to
+    """
+    error_messages.append(f"No such file: {file_wild}")
+    for sub_dir in sys_path_find_sub_dirs(sub_dirs):
+        attachments.append(f'  listdir("{sub_dir}"):')
+        for node in sorted(os.listdir(sub_dir)):
+            attachments.append(f"    {node}")
+
+
+def get_cuda_paths_info(key: str, error_messages: List[str]) -> Optional[str]:
+    """Get information from cuda_paths for a given key.
+
+    Args:
+        key: The key to look up in cuda_paths
+        error_messages: List to append error messages to
+
+    Returns:
+        The path info if found, None otherwise
+    """
+    env_path_tuple = get_cuda_paths()[key]
+    if not env_path_tuple:
+        error_messages.append(f'Failure obtaining get_cuda_paths()["{key}"]')
+        return None
+    if not env_path_tuple.info:
+        error_messages.append(f'Failure obtaining get_cuda_paths()["{key}"].info')
+        return None
+    return env_path_tuple.info
+
+
+class FindResult:
+    """Result of a library search operation.
+
+    Attributes:
+        abs_path: The absolute path to the found library, or None if not found
+        error_messages: List of error messages encountered during the search
+        attachments: List of additional information (e.g. directory listings)
+        lib_searched_for: The library name that was searched for
+    """
+
+    def __init__(self, lib_searched_for: str):
+        self.abs_path: Optional[str] = None
+        self.error_messages: List[str] = []
+        self.attachments: List[str] = []
+        self.lib_searched_for = lib_searched_for
+
+    def raise_if_abs_path_is_None(self) -> str:
+        """Raise an error if no library was found.
+
+        Returns:
+            The absolute path to the found library
+
+        Raises:
+            RuntimeError: If no library was found
+        """
+        if self.abs_path:
+            return self.abs_path
+        err = ", ".join(self.error_messages)
+        att = "\n".join(self.attachments)
+        raise RuntimeError(f'Failure finding "{self.lib_searched_for}": {err}\n{att}')

cuda_bindings/cuda/bindings/_path_finder/find_dl_linux.py

@@ -0,0 +1,116 @@
+# Copyright 2024-2025 NVIDIA Corporation.  All rights reserved.
+#
+# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
+
+import os
+
+from .find_dl_common import FindResult, get_cuda_paths_info, no_such_file_in_sub_dirs
+from .sys_path_find_sub_dirs import sys_path_find_sub_dirs
+
+
+def find_so_using_nvidia_lib_dirs(lib_searched_for: str) -> FindResult:
+    """Find a .so file using NVIDIA library directories.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    file_wild = f"lib{lib_searched_for}.so*"
+    sub_dirs = ("lib", "lib64")
+
+    for sub_dir in sys_path_find_sub_dirs(sub_dirs):
+        for node in sorted(os.listdir(sub_dir)):
+            if node.startswith(f"lib{lib_searched_for}.so"):
+                result.abs_path = os.path.join(sub_dir, node)
+                return result
+
+    no_such_file_in_sub_dirs(sub_dirs, file_wild, result.error_messages, result.attachments)
+    return result
+
+
+def find_so_using_cudalib_dir(lib_searched_for: str) -> FindResult:
+    """Find a .so file using the CUDA library directory.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    cudalib_dir = get_cuda_paths_info("cudalib_dir", result.error_messages)
+    if not cudalib_dir:
+        return result
+
+    file_wild = f"lib{lib_searched_for}.so*"
+    for node in sorted(os.listdir(cudalib_dir)):
+        if node.startswith(f"lib{lib_searched_for}.so"):
+            result.abs_path = os.path.join(cudalib_dir, node)
+            return result
+
+    result.error_messages.append(f"No such file: {file_wild}")
+    result.attachments.append(f'  listdir("{cudalib_dir}"):')
+    for node in sorted(os.listdir(cudalib_dir)):
+        result.attachments.append(f"    {node}")
+    return result
+
+
+def find_so_using_cuda_path(lib_searched_for: str) -> FindResult:
+    """Find a .so file using the CUDA path.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    cuda_path = get_cuda_paths_info("cuda_path", result.error_messages)
+    if not cuda_path:
+        return result
+
+    file_wild = f"lib{lib_searched_for}.so*"
+    for sub_dir in ("lib", "lib64"):
+        path = os.path.join(cuda_path, sub_dir)
+        if not os.path.isdir(path):
+            continue
+        for node in sorted(os.listdir(path)):
+            if node.startswith(f"lib{lib_searched_for}.so"):
+                result.abs_path = os.path.join(path, node)
+                return result
+
+    result.error_messages.append(f"No such file: {file_wild}")
+    for sub_dir in ("lib", "lib64"):
+        path = os.path.join(cuda_path, sub_dir)
+        if os.path.isdir(path):
+            result.attachments.append(f'  listdir("{path}"):')
+            for node in sorted(os.listdir(path)):
+                result.attachments.append(f"    {node}")
+    return result
+
+
+def find_nvidia_dynamic_library(lib_searched_for: str) -> FindResult:
+    """Find a NVIDIA dynamic library on Linux.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    # Try NVIDIA library directories first
+    result = find_so_using_nvidia_lib_dirs(lib_searched_for)
+    if result.abs_path:
+        return result
+
+    # Then try CUDA library directory
+    result = find_so_using_cudalib_dir(lib_searched_for)
+    if result.abs_path:
+        return result
+
+    # Finally try CUDA path
+    result = find_so_using_cuda_path(lib_searched_for)
+    return result

cuda_bindings/cuda/bindings/_path_finder/find_dl_windows.py

@@ -0,0 +1,90 @@
+# Copyright 2024-2025 NVIDIA Corporation.  All rights reserved.
+#
+# SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
+
+import os
+
+from .find_dl_common import FindResult, get_cuda_paths_info
+
+
+def find_dll_under_dir(lib_searched_for: str, dir_path: str) -> FindResult:
+    """Find a .dll file under a specific directory.
+
+    Args:
+        lib_searched_for: The library name to search for
+        dir_path: The directory to search in
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    file_wild = f"{lib_searched_for}.dll"
+
+    if not os.path.isdir(dir_path):
+        result.error_messages.append(f"No such directory: {dir_path}")
+        return result
+
+    for node in sorted(os.listdir(dir_path)):
+        if node.lower() == file_wild.lower():
+            result.abs_path = os.path.join(dir_path, node)
+            return result
+
+    result.error_messages.append(f"No such file: {file_wild}")
+    result.attachments.append(f'  listdir("{dir_path}"):')
+    for node in sorted(os.listdir(dir_path)):
+        result.attachments.append(f"    {node}")
+    return result
+
+
+def find_dll_using_cudalib_dir(lib_searched_for: str) -> FindResult:
+    """Find a .dll file using the CUDA library directory.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    cudalib_dir = get_cuda_paths_info("cudalib_dir", result.error_messages)
+    if not cudalib_dir:
+        return result
+
+    return find_dll_under_dir(lib_searched_for, cudalib_dir)
+
+
+def find_dll_using_cuda_path(lib_searched_for: str) -> FindResult:
+    """Find a .dll file using the CUDA path.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    result = FindResult(lib_searched_for)
+    cuda_path = get_cuda_paths_info("cuda_path", result.error_messages)
+    if not cuda_path:
+        return result
+
+    bin_path = os.path.join(cuda_path, "bin")
+    return find_dll_under_dir(lib_searched_for, bin_path)
+
+
+def find_nvidia_dynamic_library(lib_searched_for: str) -> FindResult:
+    """Find a NVIDIA dynamic library on Windows.
+
+    Args:
+        lib_searched_for: The library name to search for
+
+    Returns:
+        FindResult containing the search results
+    """
+    # Try CUDA library directory first
+    result = find_dll_using_cudalib_dir(lib_searched_for)
+    if result.abs_path:
+        return result
+
+    # Then try CUDA path
+    result = find_dll_using_cuda_path(lib_searched_for)
+    return result