Skip to content

Commit ab851d2

Browse files
authored
[SYCL][E2E] Set CUDA_PATH at a later point (#12886)
This ensures `ext_oneapi_` has been removed first. There's also no need to set `ROCM_PATH` twice. This builds on top of #12606
1 parent 38bb281 commit ab851d2

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

sycl/test-e2e/lit.cfg.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,6 @@
8080

8181
llvm_config.with_environment("PATH", config.lit_tools_dir, append_path=True)
8282

83-
if "cuda:gpu" in config.sycl_devices:
84-
llvm_config.with_system_environment("CUDA_PATH")
85-
86-
if "hip:gpu" in config.sycl_devices:
87-
llvm_config.with_system_environment("ROCM_PATH")
88-
8983
# Configure LD_LIBRARY_PATH or corresponding os-specific alternatives
9084
if platform.system() == "Linux":
9185
config.available_features.add("linux")
@@ -456,6 +450,9 @@
456450
+ ", ".join(supported_hip_platforms)
457451
)
458452

453+
if "cuda:gpu" in config.sycl_devices:
454+
llvm_config.with_system_environment("CUDA_PATH")
455+
459456
# FIXME: This needs to be made per-device as well, possibly with a helper.
460457
if "hip:gpu" in config.sycl_devices and config.hip_platform == "AMD":
461458
llvm_config.with_system_environment("ROCM_PATH")

0 commit comments

Comments
 (0)