Skip to content

Commit 0255083

Browse files
committed
Systematically rename find_in_cuda_home → find_in_cuda_path
1 parent 00f202d commit 0255083

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

cuda_pathfinder/cuda/pathfinder/_dynamic_libs/search_steps.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def find_in_conda(ctx: SearchContext) -> FindResult | None:
182182
return None
183183

184184

185-
def find_in_cuda_home(ctx: SearchContext) -> FindResult | None:
185+
def find_in_cuda_path(ctx: SearchContext) -> FindResult | None:
186186
"""Search ``$CUDA_PATH`` / ``$CUDA_HOME``.
187187
188188
On Windows, this is the normal fallback for system-installed CTK DLLs when
@@ -211,7 +211,7 @@ def find_in_cuda_home(ctx: SearchContext) -> FindResult | None:
211211
EARLY_FIND_STEPS: tuple[FindStep, ...] = (find_in_site_packages, find_in_conda)
212212

213213
#: Find steps that run after system search fails.
214-
LATE_FIND_STEPS: tuple[FindStep, ...] = (find_in_cuda_home,)
214+
LATE_FIND_STEPS: tuple[FindStep, ...] = (find_in_cuda_path,)
215215

216216

217217
# ---------------------------------------------------------------------------

cuda_pathfinder/cuda/pathfinder/_headers/find_nvidia_headers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def find_in_conda(desc: HeaderDescriptor) -> LocatedHeaderDir | None:
100100
return None
101101

102102

103-
def find_in_cuda_home(desc: HeaderDescriptor) -> LocatedHeaderDir | None:
103+
def find_in_cuda_path(desc: HeaderDescriptor) -> LocatedHeaderDir | None:
104104
"""Search ``$CUDA_PATH`` / ``$CUDA_HOME``."""
105105
cuda_home = get_cuda_path_or_home()
106106
if cuda_home is None:
@@ -150,7 +150,7 @@ def find_in_system_install_dirs(desc: HeaderDescriptor) -> LocatedHeaderDir | No
150150
FIND_STEPS: tuple[HeaderFindStep, ...] = (
151151
find_in_site_packages,
152152
find_in_conda,
153-
find_in_cuda_home,
153+
find_in_cuda_path,
154154
find_via_ctk_root_canary,
155155
find_in_system_install_dirs,
156156
)

cuda_pathfinder/tests/test_search_steps.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
SearchContext,
2020
_find_lib_dir_using_anchor,
2121
find_in_conda,
22-
find_in_cuda_home,
22+
find_in_cuda_path,
2323
find_in_site_packages,
2424
run_find_steps,
2525
)
@@ -191,14 +191,14 @@ def test_found_windows(self, mocker, tmp_path):
191191

192192

193193
# ---------------------------------------------------------------------------
194-
# find_in_cuda_home
194+
# find_in_cuda_path
195195
# ---------------------------------------------------------------------------
196196

197197

198198
class TestFindInCudaHome:
199199
def test_returns_none_without_env_var(self, mocker):
200200
mocker.patch(f"{_STEPS_MOD}.get_cuda_path_or_home", return_value=None)
201-
assert find_in_cuda_home(_ctx(platform=LinuxSearchPlatform())) is None
201+
assert find_in_cuda_path(_ctx(platform=LinuxSearchPlatform())) is None
202202

203203
def test_found_linux(self, mocker, tmp_path):
204204
lib_dir = tmp_path / "lib64"
@@ -208,7 +208,7 @@ def test_found_linux(self, mocker, tmp_path):
208208

209209
mocker.patch(f"{_STEPS_MOD}.get_cuda_path_or_home", return_value=str(tmp_path))
210210

211-
result = find_in_cuda_home(_ctx(platform=LinuxSearchPlatform()))
211+
result = find_in_cuda_path(_ctx(platform=LinuxSearchPlatform()))
212212
assert result is not None
213213
assert result.abs_path == str(so_file)
214214
assert result.found_via == "CUDA_PATH"
@@ -221,7 +221,7 @@ def test_found_windows(self, mocker, tmp_path):
221221

222222
mocker.patch(f"{_STEPS_MOD}.get_cuda_path_or_home", return_value=str(tmp_path))
223223

224-
result = find_in_cuda_home(_ctx(platform=WindowsSearchPlatform()))
224+
result = find_in_cuda_path(_ctx(platform=WindowsSearchPlatform()))
225225
assert result is not None
226226
assert result.abs_path == str(dll)
227227
assert result.found_via == "CUDA_PATH"
@@ -269,7 +269,7 @@ def test_early_find_steps_contains_expected(self):
269269
assert find_in_conda in EARLY_FIND_STEPS
270270

271271
def test_late_find_steps_contains_expected(self):
272-
assert find_in_cuda_home in LATE_FIND_STEPS
272+
assert find_in_cuda_path in LATE_FIND_STEPS
273273

274274
def test_early_and_late_are_disjoint(self):
275275
assert not set(EARLY_FIND_STEPS) & set(LATE_FIND_STEPS)
@@ -318,7 +318,7 @@ def test_find_lib_dir_returns_none_when_no_match(self, tmp_path):
318318
assert _find_lib_dir_using_anchor(desc, LinuxSearchPlatform(), str(tmp_path)) is None
319319

320320
def test_nvvm_cuda_home_linux(self, mocker, tmp_path):
321-
"""End-to-end: find_in_cuda_home resolves nvvm under its custom subdir."""
321+
"""End-to-end: find_in_cuda_path resolves nvvm under its custom subdir."""
322322
mocker.patch(f"{_STEPS_MOD}.get_cuda_path_or_home", return_value=str(tmp_path))
323323

324324
nvvm_dir = tmp_path / "nvvm" / "lib64"
@@ -331,7 +331,7 @@ def test_nvvm_cuda_home_linux(self, mocker, tmp_path):
331331
linux_sonames=("libnvvm.so",),
332332
anchor_rel_dirs_linux=("nvvm/lib64",),
333333
)
334-
result = find_in_cuda_home(_ctx(desc, platform=LinuxSearchPlatform()))
334+
result = find_in_cuda_path(_ctx(desc, platform=LinuxSearchPlatform()))
335335
assert result is not None
336336
assert result.abs_path == str(so_file)
337337
assert result.found_via == "CUDA_PATH"

0 commit comments

Comments
 (0)