Remove fallback code paths in _find_so_using_nvidia_lib_dirs, _find_dll_using_nvidia_bin_dirs and associated foreign_wheels unit test

Author: rwgk

.github/workflows/test-wheel-linux.yml

@@ -325,7 +325,7 @@ jobs:
         run: |
           set -euo pipefail
           pushd cuda_pathfinder
-          pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host,foreign_wheels]"
+          pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host]"
           pip list
           popd
 

.github/workflows/test-wheel-windows.yml

@@ -292,7 +292,7 @@ jobs:
         shell: bash --noprofile --norc -xeuo pipefail {0}
         run: |
           pushd cuda_pathfinder
-          pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host,foreign_wheels]"
+          pip install --only-binary=:all: -v ".[nvidia_wheels_cu${TEST_CUDA_MAJOR},nvidia_wheels_host]"
           pip list
           popd
 

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/find_nvidia_dynamic_lib.py

@@ -14,8 +14,6 @@
     SITE_PACKAGES_LIBDIRS_WINDOWS,
     is_suppressed_dll_file,
 )
-from cuda.pathfinder._utils.find_site_packages_dll import find_all_dll_files_via_metadata
-from cuda.pathfinder._utils.find_site_packages_so import find_all_so_files_via_metadata
 from cuda.pathfinder._utils.find_sub_dirs import find_sub_dirs, find_sub_dirs_all_sitepackages
 
 
@@ -34,7 +32,6 @@ def _find_so_using_nvidia_lib_dirs(
 ) -> Optional[str]:
     rel_dirs = SITE_PACKAGES_LIBDIRS_LINUX.get(libname)
     if rel_dirs is not None:
-        # Fast direct access with minimal globbing.
         sub_dirs_searched = []
         file_wild = so_basename + "*"
         for rel_dir in rel_dirs:
@@ -52,14 +49,6 @@ def _find_so_using_nvidia_lib_dirs(
             sub_dirs_searched.append(sub_dir)
         for sub_dir in sub_dirs_searched:
             _no_such_file_in_sub_dirs(sub_dir, file_wild, error_messages, attachments)
-    else:
-        # This fallback is relatively slow, but acceptable.
-        candidates = find_all_so_files_via_metadata().get(so_basename)
-        if candidates:
-            so_versions = candidates.keys()
-            # For now, simply take the first candidate after sorting.
-            all_abs_paths: list[str] = candidates[next(iter(sorted(so_versions)))]
-            return next(iter(sorted(all_abs_paths)))
     return None
 
 
@@ -77,7 +66,6 @@ def _find_dll_using_nvidia_bin_dirs(
 ) -> Optional[str]:
     rel_dirs = SITE_PACKAGES_LIBDIRS_WINDOWS.get(libname)
     if rel_dirs is not None:
-        # Fast direct access with minimal globbing.
         sub_dirs_searched = []
         for rel_dir in rel_dirs:
             sub_dir = tuple(rel_dir.split(os.path.sep))
@@ -88,20 +76,6 @@ def _find_dll_using_nvidia_bin_dirs(
             sub_dirs_searched.append(sub_dir)
         for sub_dir in sub_dirs_searched:
             _no_such_file_in_sub_dirs(sub_dir, lib_searched_for, error_messages, attachments)
-    else:
-        # This fallback is relatively slow, but acceptable.
-        libname_lower = libname.lower()
-        candidates = []
-        for relname, abs_paths in find_all_dll_files_via_metadata().items():
-            if is_suppressed_dll_file(relname):
-                continue
-            if relname.startswith(libname_lower):
-                for abs_path in abs_paths:
-                    candidates.append(abs_path)
-        if candidates:
-            candidates.sort()
-            result: str = candidates[0]  # help mypy
-            return result
     return None
 
 

cuda_pathfinder/pyproject.toml

@@ -29,10 +29,6 @@ nvidia_wheels_cu13 = [
 nvidia_wheels_host = [
     "nvpl-fft; platform_system == 'Linux' and platform_machine == 'aarch64'",
 ]
-foreign_wheels = [
-    # For tests/test_load_nvidia_dynamic_lib.py. See comment there (look for pygit2).
-    "pygit2",
-]
 
 [project.urls]
 Repository = "https://github.com/NVIDIA/cuda-python"

cuda_pathfinder/tests/test_load_nvidia_dynamic_lib.py

@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import functools
-import importlib.metadata
 import os
 from unittest.mock import patch
 
@@ -70,31 +69,6 @@ def test_runtime_error_on_non_64bit_python():
         load_nvidia_dynamic_lib("not_used")
 
 
-def _get_git2_libname():
-    # For testing the fallback code paths in find_nvidia_dynamic_lib.py we need a
-    # "foreign" shared library unrelated to CUDA. To keep things simple, we pick a
-    # small, widely used wheel that bundles its own .so/.dll. The choice of pygit2
-    # is arbitrary — it is a stable dependency and unrelated to NVIDIA software.
-    try:
-        pygit2_dist = importlib.metadata.distribution("pygit2")
-    except importlib.metadata.PackageNotFoundError:
-        pass
-    else:
-        for df in pygit2_dist.files:
-            fname = df.name
-            libname = ""
-            if supported_nvidia_libs.IS_WINDOWS:
-                if fname.endswith(".dll"):
-                    libname = os.path.basename(fname)[:-4]
-            elif fname.startswith("libgit2"):
-                idx = fname.find(".so")
-                if idx > 0:
-                    libname = fname[3:idx]
-            if libname.startswith("git2"):
-                return libname
-    return None
-
-
 @functools.cache
 def _get_libnames_for_test_load_nvidia_dynamic_lib():
     result = list(SUPPORTED_NVIDIA_LIBNAMES)
@@ -113,10 +87,6 @@ def _get_libnames_for_test_load_nvidia_dynamic_lib():
             if so_basename in all_dyn_libs:
                 result.append(libname)
 
-    libname = _get_git2_libname()
-    if libname is not None:
-        result.append(libname)
-
     return tuple(result)
 
 

toolshed/collect_site_packages_dll_files.ps1

@@ -23,11 +23,11 @@ function Fresh-Venv {
 Set-Location -Path 'cuda_pathfinder'
 
 Fresh-Venv -Path '..\TmpCp12Venv'
-pip install --only-binary=:all: -e '.[test,nvidia_wheels_cu12,nvidia_wheels_host,foreign_wheels]'
+pip install --only-binary=:all: -e '.[test,nvidia_wheels_cu12,nvidia_wheels_host]'
 deactivate
 
 Fresh-Venv -Path '..\TmpCp13Venv'
-pip install --only-binary=:all: -e '.[test,nvidia_wheels_cu13,nvidia_wheels_host,foreign_wheels]'
+pip install --only-binary=:all: -e '.[test,nvidia_wheels_cu13,nvidia_wheels_host]'
 deactivate
 
 Set-Location -Path '..'

toolshed/collect_site_packages_so_files.sh

@@ -17,12 +17,12 @@ fresh_venv() {
 cd cuda_pathfinder/
 fresh_venv ../TmpCp12Venv
 set -x
-pip install --only-binary=:all: -e .[test,nvidia_wheels_cu12,nvidia_wheels_host,foreign_wheels]
+pip install --only-binary=:all: -e .[test,nvidia_wheels_cu12,nvidia_wheels_host]
 set +x
 deactivate
 fresh_venv ../TmpCp13Venv
 set -x
-pip install --only-binary=:all: -e .[test,nvidia_wheels_cu13,nvidia_wheels_host,foreign_wheels]
+pip install --only-binary=:all: -e .[test,nvidia_wheels_cu13,nvidia_wheels_host]
 set +x
 deactivate
 cd ..