Skip to content

Commit 5478f2d

Browse files
fix(cuda.core): probe nvJitLink version under DynamicLibNotFoundError guard
Address review feedback: keep the >=12.3 version-symbol check inside _optional_cuda_import's probe so a missing nvJitLink dylib still falls back to cuLink. Continue avoiding module.version(), which raises FunctionNotFoundError on nvJitLink 12.0-12.2 (NVIDIA#2408). Add coverage for missing-dylib fallback and a guard that the probe does not call module.version(). Signed-off-by: Omar Atie <[email protected]> Co-authored-by: Cursor <[email protected]>
1 parent 91a1f4f commit 5478f2d

3 files changed

Lines changed: 109 additions & 15 deletions

File tree

‎cuda_core/cuda/core/_linker.pyx‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -684,22 +684,32 @@ def _decide_nvjitlink_or_driver() -> bool:
684684
" For best results, consider upgrading to a recent version of"
685685
)
686686

687-
# Do not probe via module.version(): nvJitLink 12.0-12.2 lacks the unversioned
688-
# nvJitLinkVersion symbol, so calling version() raises FunctionNotFoundError.
689-
# Use _nvjitlink_has_version_symbol() below instead (symbol pointer inspection).
690-
nvjitlink_module = _optional_cuda_import("cuda.bindings.nvjitlink")
691-
if nvjitlink_module is None:
692-
warn_txt = f"cuda.bindings.nvjitlink is not available, therefore {warn_txt_common} cuda-bindings."
693-
else:
687+
# Probe via symbol-pointer inspection (not module.version()):
688+
# - Triggers nvJitLink dylib load; DynamicLibNotFoundError is caught by
689+
# _optional_cuda_import so a missing dylib falls back to cuLink.
690+
# - Avoids FunctionNotFoundError on nvJitLink 12.0-12.2, which lack the
691+
# unversioned nvJitLinkVersion export added in 12.3 (#2408).
692+
has_version_symbol = [False]
693+
694+
def _probe_nvjitlink(module):
694695
from cuda.bindings._internal import nvjitlink
695696

696-
if _nvjitlink_has_version_symbol(nvjitlink):
697-
_use_nvjitlink_backend = True
698-
return False # Use nvjitlink
697+
has_version_symbol[0] = _nvjitlink_has_version_symbol(nvjitlink)
698+
699+
nvjitlink_module = _optional_cuda_import(
700+
"cuda.bindings.nvjitlink",
701+
probe_function=_probe_nvjitlink,
702+
)
703+
if nvjitlink_module is None:
704+
warn_txt = f"cuda.bindings.nvjitlink is not available, therefore {warn_txt_common} cuda-bindings."
705+
elif not has_version_symbol[0]:
699706
warn_txt = (
700707
f"{'nvJitLink*.dll' if sys.platform == 'win32' else 'libnvJitLink.so*'} is too old (<12.3)."
701708
f" Therefore cuda.bindings.nvjitlink is not usable and {warn_txt_common} nvJitLink."
702709
)
710+
else:
711+
_use_nvjitlink_backend = True
712+
return False # Use nvjitlink
703713

704714
warn(warn_txt, stacklevel=2, category=RuntimeWarning)
705715
_use_nvjitlink_backend = False

‎cuda_core/tests/test_linker.py‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ def test_which_backend_falls_back_when_nvjitlink_too_old(self, monkeypatch):
310310

311311
def fake__optional_cuda_import(modname, probe_function=None):
312312
assert modname == "cuda.bindings.nvjitlink"
313-
assert probe_function is None
313+
assert probe_function is not None
314+
probe_function(object())
314315
return object()
315316

316317
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
@@ -321,6 +322,33 @@ def fake__optional_cuda_import(modname, probe_function=None):
321322

322323
assert _linker._use_nvjitlink_backend is False
323324

325+
def test_which_backend_falls_back_when_dylib_missing(self, monkeypatch):
326+
"""Missing nvJitLink dylib must fall back without raising."""
327+
from cuda.pathfinder import DynamicLibNotFoundError
328+
329+
monkeypatch.setattr(_linker, "_use_nvjitlink_backend", None)
330+
monkeypatch.setattr(_linker, "_driver", None)
331+
332+
def raise_missing(_nvjitlink):
333+
raise DynamicLibNotFoundError("missing")
334+
335+
def fake__optional_cuda_import(modname, probe_function=None):
336+
assert modname == "cuda.bindings.nvjitlink"
337+
assert probe_function is not None
338+
try:
339+
probe_function(object())
340+
except DynamicLibNotFoundError:
341+
return None
342+
return object()
343+
344+
monkeypatch.setattr(_linker, "_nvjitlink_has_version_symbol", raise_missing)
345+
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
346+
347+
with pytest.warns(RuntimeWarning, match="cuda.bindings.nvjitlink is not available"):
348+
assert Linker.which_backend() == "driver"
349+
350+
assert _linker._use_nvjitlink_backend is False
351+
324352
def test_which_backend_is_classmethod(self):
325353
attr = inspect.getattr_static(Linker, "which_backend")
326354
assert isinstance(attr, classmethod)

‎cuda_core/tests/test_optional_dependency_imports.py‎

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import pytest
66

77
from cuda.core import _linker, _program
8+
from cuda.pathfinder import DynamicLibNotFoundError
89

910

1011
@pytest.fixture(autouse=True)
@@ -78,7 +79,7 @@ def fake__optional_cuda_import(modname, probe_function=None):
7879
def test_decide_nvjitlink_or_driver_reraises_nested_module_not_found(monkeypatch):
7980
def fake__optional_cuda_import(modname, probe_function=None):
8081
assert modname == "cuda.bindings.nvjitlink"
81-
assert probe_function is None
82+
assert probe_function is not None
8283
err = ModuleNotFoundError("No module named 'not_a_real_dependency'")
8384
err.name = "not_a_real_dependency"
8485
raise err
@@ -93,7 +94,7 @@ def fake__optional_cuda_import(modname, probe_function=None):
9394
def test_decide_nvjitlink_or_driver_falls_back_when_module_missing(monkeypatch):
9495
def fake__optional_cuda_import(modname, probe_function=None):
9596
assert modname == "cuda.bindings.nvjitlink"
96-
assert probe_function is None
97+
assert probe_function is not None
9798
return None
9899

99100
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
@@ -105,10 +106,37 @@ def fake__optional_cuda_import(modname, probe_function=None):
105106
assert _linker._use_nvjitlink_backend is False
106107

107108

109+
def test_decide_nvjitlink_or_driver_falls_back_when_dylib_missing(monkeypatch):
110+
"""Missing nvJitLink dylib must fall back via DynamicLibNotFoundError in probe."""
111+
112+
def raise_missing(_nvjitlink):
113+
raise DynamicLibNotFoundError("libnvJitLink missing")
114+
115+
def fake__optional_cuda_import(modname, probe_function=None):
116+
assert modname == "cuda.bindings.nvjitlink"
117+
assert probe_function is not None
118+
try:
119+
# Faithfully simulate _optional_cuda_import's catch of DynamicLibNotFoundError.
120+
probe_function(object())
121+
except DynamicLibNotFoundError:
122+
return None
123+
return object()
124+
125+
monkeypatch.setattr(_linker, "_nvjitlink_has_version_symbol", raise_missing)
126+
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
127+
128+
with pytest.warns(RuntimeWarning, match="cuda.bindings.nvjitlink is not available"):
129+
use_driver_backend = _linker._decide_nvjitlink_or_driver()
130+
131+
assert use_driver_backend is True
132+
assert _linker._use_nvjitlink_backend is False
133+
134+
108135
def test_decide_nvjitlink_or_driver_falls_back_when_nvjitlink_too_old(monkeypatch):
109136
def fake__optional_cuda_import(modname, probe_function=None):
110137
assert modname == "cuda.bindings.nvjitlink"
111-
assert probe_function is None
138+
assert probe_function is not None
139+
probe_function(object())
112140
return object()
113141

114142
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
@@ -124,7 +152,8 @@ def fake__optional_cuda_import(modname, probe_function=None):
124152
def test_decide_nvjitlink_or_driver_selects_nvjitlink_when_version_symbol_present(monkeypatch):
125153
def fake__optional_cuda_import(modname, probe_function=None):
126154
assert modname == "cuda.bindings.nvjitlink"
127-
assert probe_function is None
155+
assert probe_function is not None
156+
probe_function(object())
128157
return object()
129158

130159
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
@@ -134,3 +163,30 @@ def fake__optional_cuda_import(modname, probe_function=None):
134163

135164
assert use_driver_backend is False
136165
assert _linker._use_nvjitlink_backend is True
166+
167+
168+
def test_decide_nvjitlink_or_driver_probe_does_not_call_version(monkeypatch):
169+
"""Regression guard for #2408: probe must not call module.version()."""
170+
called = {"version": False, "inspect": False}
171+
172+
class FakeModule:
173+
def version(self):
174+
called["version"] = True
175+
raise AssertionError("module.version() must not be used for nvJitLink probing")
176+
177+
def fake_has_version(_nvjitlink):
178+
called["inspect"] = True
179+
return True
180+
181+
def fake__optional_cuda_import(modname, probe_function=None):
182+
assert modname == "cuda.bindings.nvjitlink"
183+
assert probe_function is not None
184+
probe_function(FakeModule())
185+
return FakeModule()
186+
187+
monkeypatch.setattr(_linker, "_optional_cuda_import", fake__optional_cuda_import)
188+
monkeypatch.setattr(_linker, "_nvjitlink_has_version_symbol", fake_has_version)
189+
190+
assert _linker._decide_nvjitlink_or_driver() is False
191+
assert called["inspect"] is True
192+
assert called["version"] is False

0 commit comments

Comments
 (0)