Skip to content

Commit 6f45e21

Browse files
rparolinclaude
andcommitted
Fix pre-commit findings: ruff (SIM103, isort), ruff-format, mypy
- Inline boolean return in `_is_expected_find_failure`. - Re-sort imports / let ruff-format reflow long signatures. - Restructure the `find_nvidia_dynamic_lib` STATUS_OK / error-message branches so mypy can narrow `payload.abs_path` to `str`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 86ab025 commit 6f45e21

4 files changed

Lines changed: 14 additions & 19 deletions

File tree

cuda_pathfinder/cuda/pathfinder/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
find_nvidia_binary_utility as find_nvidia_binary_utility,
1212
)
1313
from cuda.pathfinder._binaries.supported_nvidia_binaries import SUPPORTED_BINARIES as _SUPPORTED_BINARIES
14+
from cuda.pathfinder._dynamic_libs.find_nvidia_dynamic_lib import (
15+
find_nvidia_dynamic_lib as find_nvidia_dynamic_lib,
16+
)
1417
from cuda.pathfinder._dynamic_libs.load_dl_common import (
1518
DynamicLibNotAvailableError as DynamicLibNotAvailableError,
1619
)
1720
from cuda.pathfinder._dynamic_libs.load_dl_common import DynamicLibNotFoundError as DynamicLibNotFoundError
1821
from cuda.pathfinder._dynamic_libs.load_dl_common import (
1922
DynamicLibUnknownError as DynamicLibUnknownError,
2023
)
21-
from cuda.pathfinder._dynamic_libs.find_nvidia_dynamic_lib import (
22-
find_nvidia_dynamic_lib as find_nvidia_dynamic_lib,
23-
)
2424
from cuda.pathfinder._dynamic_libs.load_dl_common import LoadedDL as LoadedDL
2525
from cuda.pathfinder._dynamic_libs.load_nvidia_dynamic_lib import load_nvidia_dynamic_lib as load_nvidia_dynamic_lib
2626
from cuda.pathfinder._dynamic_libs.supported_nvidia_libs import (

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/find_nvidia_dynamic_lib.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,13 @@ def find_nvidia_dynamic_lib(libname: str) -> str:
7979
error_label=f"find_nvidia_dynamic_lib subprocess for {libname!r}",
8080
)
8181
if payload.status == STATUS_OK:
82-
assert payload.abs_path is not None
83-
return payload.abs_path
82+
abs_path: str | None = payload.abs_path
83+
assert abs_path is not None
84+
return abs_path
8485

85-
message = (
86-
payload.error["message"]
87-
if payload.error and "message" in payload.error
88-
else f"find_nvidia_dynamic_lib could not locate {libname!r}"
89-
)
86+
error = payload.error
87+
if error is not None and "message" in error:
88+
message = error["message"]
89+
else:
90+
message = f"find_nvidia_dynamic_lib could not locate {libname!r}"
9091
raise DynamicLibNotFoundError(message)

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/subprocess_protocol.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,7 @@ def run_dynamic_lib_subprocess(
128128
cwd=DYNAMIC_LIB_SUBPROCESS_CWD,
129129
)
130130
except subprocess.TimeoutExpired as exc:
131-
raise_subprocess_child_process_error(
132-
error_label, timeout=exc.timeout, stdout=exc.stdout, stderr=exc.stderr
133-
)
131+
raise_subprocess_child_process_error(error_label, timeout=exc.timeout, stdout=exc.stdout, stderr=exc.stderr)
134132

135133
if result.returncode != 0:
136134
raise_subprocess_child_process_error(

cuda_pathfinder/tests/test_find_nvidia_dynamic_lib.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ def test_unknown_libname_raises_dynamic_lib_unknown_error():
3232

3333
def test_known_but_platform_unavailable_libname_raises_dynamic_lib_not_available_error(monkeypatch):
3434
find_nvidia_dynamic_lib.cache_clear()
35-
monkeypatch.setattr(
36-
load_nvidia_dynamic_lib_module, "_ALL_KNOWN_LIBNAMES", frozenset(("known_but_unavailable",))
37-
)
35+
monkeypatch.setattr(load_nvidia_dynamic_lib_module, "_ALL_KNOWN_LIBNAMES", frozenset(("known_but_unavailable",)))
3836
monkeypatch.setattr(load_nvidia_dynamic_lib_module, "_ALL_SUPPORTED_LIBNAMES", frozenset())
3937
monkeypatch.setattr(load_nvidia_dynamic_lib_module, "_PLATFORM_NAME", "TestOS")
4038
with pytest.raises(
@@ -47,9 +45,7 @@ def test_known_but_platform_unavailable_libname_raises_dynamic_lib_not_available
4745
def _is_expected_find_failure(libname: str) -> bool:
4846
# Mirror load-side strictness: libnames known to fail loading on this
4947
# platform are also allowed to fail finding.
50-
if libname == "nvpl_fftw" and platform.machine().lower() != "aarch64":
51-
return True
52-
return False
48+
return libname == "nvpl_fftw" and platform.machine().lower() != "aarch64"
5349

5450

5551
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)