Skip to content

Commit

Permalink
[SYCL][E2E] Set CUDA_PATH at a later point (#12886)
Browse files Browse the repository at this point in the history
This ensures `ext_oneapi_` has been removed first. There's also no need
to set `ROCM_PATH` twice.

This builds on top of #12606
  • Loading branch information
ProGTX committed Mar 14, 2024
1 parent 38bb281 commit ab851d2
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions sycl/test-e2e/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@

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

if "cuda:gpu" in config.sycl_devices:
llvm_config.with_system_environment("CUDA_PATH")

if "hip:gpu" in config.sycl_devices:
llvm_config.with_system_environment("ROCM_PATH")

# Configure LD_LIBRARY_PATH or corresponding os-specific alternatives
if platform.system() == "Linux":
config.available_features.add("linux")
Expand Down Expand Up @@ -456,6 +450,9 @@
+ ", ".join(supported_hip_platforms)
)

if "cuda:gpu" in config.sycl_devices:
llvm_config.with_system_environment("CUDA_PATH")

# FIXME: This needs to be made per-device as well, possibly with a helper.
if "hip:gpu" in config.sycl_devices and config.hip_platform == "AMD":
llvm_config.with_system_environment("ROCM_PATH")
Expand Down

0 comments on commit ab851d2

Please sign in to comment.