Skip to content

[SYCL][E2E] Fix CUDA/HIP options on Windows #17985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

[SYCL][E2E] Fix CUDA/HIP options on Windows #17985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sycl/test-e2e/E2EExpr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class E2EExpr(BooleanExpression):
"hip_dev_kit",
"zstd",
"vulkan",
"hip_options",
"cuda_options",
"true",
"false",
}
Expand Down
11 changes: 8 additions & 3 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ def open_check_file(file_name):
)
)

cuda_options = cuda_options = (
cuda_options = (
(" -L" + config.cuda_libs_dir if config.cuda_libs_dir else "")
+ " -lcuda "
+ " -I"
Expand All @@ -447,6 +447,10 @@ def open_check_file(file_name):
+ " /I"
+ config.cuda_include
)
if platform.system() == "Windows":
cuda_options += (
" --cuda-path=" + os.path.dirname(os.path.dirname(config.cuda_libs_dir)) + f'"'
)

config.substitutions.append(("%cuda_options", cuda_options))

Expand Down Expand Up @@ -483,7 +487,7 @@ def open_check_file(file_name):
)
)

hip_options = hip_options = (
hip_options = (
(" -L" + config.hip_libs_dir if config.hip_libs_dir else "")
+ " -lamdhip64 "
+ " -I"
Expand All @@ -500,7 +504,8 @@ def open_check_file(file_name):
+ " /I"
+ config.hip_include
)

if platform.system() == "Windows":
hip_options += " --rocm-path=" + os.path.dirname(config.hip_libs_dir) + f'"'
with test_env():
sp = subprocess.getstatusoutput(
config.dpcpp_compiler + " -fsycl " + check_hip_file + hip_options
Expand Down