Remove _find_nvidia_dynamic_library.retry_with_anchor_abs_path() method. Move run_python_code_safely.py to test/ directory.

Author: rwgk

cuda_bindings/cuda/bindings/_path_finder/find_nvidia_dynamic_library.py

@@ -108,17 +108,6 @@ def _find_dll_using_lib_dir(lib_dir, libname, error_messages, attachments):
     return None
 
 
-def _find_nvvm_lib_dir_from_anchor_abs_path(anchor_abs_path):
-    nvvm_subdir = "bin" if IS_WINDOWS else "lib64"
-    while anchor_abs_path:
-        if os.path.isdir(anchor_abs_path):
-            nvvm_lib_dir = os.path.join(anchor_abs_path, "nvvm", nvvm_subdir)
-            if os.path.isdir(nvvm_lib_dir):
-                return nvvm_lib_dir
-        anchor_abs_path = os.path.dirname(anchor_abs_path)
-    return None
-
-
 class _find_nvidia_dynamic_library:
     def __init__(self, libname: str):
         self.libname = libname
@@ -151,18 +140,6 @@ def retry_with_cuda_home_priority_last(self):
                     cuda_home_lib_dir, self.lib_searched_for, self.error_messages, self.attachments
                 )
 
-    def retry_with_anchor_abs_path(self, anchor_abs_path):
-        assert self.libname == "nvvm"
-        nvvm_lib_dir = _find_nvvm_lib_dir_from_anchor_abs_path(anchor_abs_path)
-        if nvvm_lib_dir is None:
-            return
-        if IS_WINDOWS:
-            self.abs_path = _find_dll_using_lib_dir(nvvm_lib_dir, self.libname, self.error_messages, self.attachments)
-        else:
-            self.abs_path = _find_so_using_lib_dir(
-                nvvm_lib_dir, self.lib_searched_for, self.error_messages, self.attachments
-            )
-
     def raise_if_abs_path_is_None(self):
         if self.abs_path:
             return self.abs_path

cuda_bindings/cuda/bindings/_path_finder/load_dl_common.py

@@ -4,7 +4,6 @@
 from dataclasses import dataclass
 from typing import Callable, Optional
 
-from cuda.bindings._path_finder.run_python_code_safely import run_python_code_safely
 from cuda.bindings._path_finder.supported_libs import DIRECT_DEPENDENCIES, IS_WINDOWS
 
 if IS_WINDOWS:
@@ -35,16 +34,3 @@ def load_dependencies(libname: str, load_func: Callable[[str], LoadedDL]) -> Non
     """
     for dep in DIRECT_DEPENDENCIES.get(libname, ()):
         load_func(dep)
-
-
-def load_in_subprocess(python_code, timeout=30):
-    # This is to avoid loading libraries into the parent process.
-    return run_python_code_safely(python_code, timeout=timeout)
-
-
-def build_subprocess_failed_for_libname_message(libname, result):
-    return (
-        f"Subprocess failed for {libname=!r} with exit code {result.returncode}\n"
-        f"--- stdout-from-subprocess ---\n{result.stdout}<end-of-stdout-from-subprocess>\n"
-        f"--- stderr-from-subprocess ---\n{result.stderr}<end-of-stderr-from-subprocess>\n"
-    )

cuda_bindings/cuda/bindings/_path_finder/load_nvidia_dynamic_library.py

@@ -2,15 +2,9 @@
 # SPDX-License-Identifier: LicenseRef-NVIDIA-SOFTWARE-LICENSE
 
 import functools
-import json
 
 from cuda.bindings._path_finder.find_nvidia_dynamic_library import _find_nvidia_dynamic_library
-from cuda.bindings._path_finder.load_dl_common import (
-    LoadedDL,
-    build_subprocess_failed_for_libname_message,
-    load_dependencies,
-    load_in_subprocess,
-)
+from cuda.bindings._path_finder.load_dl_common import LoadedDL, load_dependencies
 from cuda.bindings._path_finder.supported_libs import IS_WINDOWS
 
 if IS_WINDOWS:
@@ -27,21 +21,6 @@
     )
 
 
-def _load_anchor_in_subprocess(libname, error_messages):
-    code = f"""\
-from cuda.bindings._path_finder.load_nvidia_dynamic_library import load_nvidia_dynamic_library
-import json
-import sys
-loaded = load_nvidia_dynamic_library({libname!r})
-sys.stdout.write(json.dumps(loaded.abs_path, ensure_ascii=True))
-"""
-    result = load_in_subprocess(code)
-    if result.returncode == 0:
-        return json.loads(result.stdout)
-    error_messages.extend(build_subprocess_failed_for_libname_message(libname, result).splitlines())
-    return None
-
-
 def _load_nvidia_dynamic_library_no_cache(libname: str) -> LoadedDL:
     # Check whether the library is already loaded into the current process by
     # some other component. This check uses OS-level mechanisms (e.g.,

cuda_bindings/cuda/bindings/_path_finder/run_python_code_safely.py renamed to cuda_bindings/tests/run_python_code_safely.py

@@ -5,10 +5,10 @@
 import sys
 
 import pytest
+from run_python_code_safely import run_python_code_safely
 
 from cuda.bindings import path_finder
 from cuda.bindings._path_finder import supported_libs
-from cuda.bindings._path_finder.load_dl_common import build_subprocess_failed_for_libname_message, load_in_subprocess
 
 ALL_LIBNAMES = path_finder._SUPPORTED_LIBNAMES + supported_libs.PARTIALLY_SUPPORTED_LIBNAMES_ALL
 ALL_LIBNAMES_LINUX = path_finder._SUPPORTED_LIBNAMES + supported_libs.PARTIALLY_SUPPORTED_LIBNAMES_LINUX
@@ -38,6 +38,14 @@ def test_all_libnames_expected_lib_symbols_consistency():
     assert tuple(sorted(ALL_LIBNAMES)) == tuple(sorted(supported_libs.EXPECTED_LIB_SYMBOLS.keys()))
 
 
+def build_subprocess_failed_for_libname_message(libname, result):
+    return (
+        f"Subprocess failed for {libname=!r} with exit code {result.returncode}\n"
+        f"--- stdout-from-subprocess ---\n{result.stdout}<end-of-stdout-from-subprocess>\n"
+        f"--- stderr-from-subprocess ---\n{result.stderr}<end-of-stderr-from-subprocess>\n"
+    )
+
+
 @pytest.mark.parametrize("libname", TEST_FIND_OR_LOAD_LIBNAMES)
 def test_find_or_load_nvidia_dynamic_library(info_summary_append, libname):
     # We intentionally run each dynamic library operation in a subprocess
@@ -68,7 +76,7 @@ def test_find_or_load_nvidia_dynamic_library(info_summary_append, libname):
 
 print(f"{{loaded_dl_fresh.abs_path!r}}")
 """
-    result = load_in_subprocess(code)
+    result = run_python_code_safely(code, timeout=30)
     if result.returncode == 0:
         info_summary_append(f"abs_path={result.stdout.rstrip()}")
     else: