Skip to content

[SYCL][CUDA][HIP] Update images enable variable #16147

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 3 commits into from
Dec 12, 2024
Merged

[SYCL][CUDA][HIP] Update images enable variable #16147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d963d9
[SYCL][CUDA][HIP] Update images enable variable
npmiller Nov 21, 2024
131c543
wip: use fork UR tag for testing
npmiller Nov 21, 2024
2950a2f
[UR] Update tag to 06f48f6 for https://github.com/oneapi-src/unified-…
martygrant Dec 12, 2024
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
12 changes: 6 additions & 6 deletions sycl/cmake/modules/UnifiedRuntimeTag.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# commit 098deca1f9f3b9f3f0563ee823ac424d8db30668
# Merge: 58e4d76c2ace 73ba29bfe9df
# commit 06f48f674445532d8c04be431474901b82c3c449
# Merge: 098deca1f9f3 1b373f83c71e
# Author: Martin Grant <[email protected]>
# Date: Wed Dec 11 17:23:43 2024 +0000
# Merge pull request #2299 from cppchedy/chedy/fix-mipmap-leak
# [CUDA][Bindless] Fix memory leak in interop mapping
set(UNIFIED_RUNTIME_TAG 098deca1f9f3b9f3f0563ee823ac424d8db30668)
# Date: Thu Dec 12 11:04:15 2024 +0000
# Merge pull request #2356 from npmiller/hip-images
# [HIP] Disable SYCL images by default
set(UNIFIED_RUNTIME_TAG 06f48f674445532d8c04be431474901b82c3c449)
5 changes: 4 additions & 1 deletion sycl/test-e2e/format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,10 @@ def get_extra_env(sycl_devices):
)

if "cuda:gpu" in sycl_devices:
extra_env.append("SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT=1")
extra_env.append("UR_CUDA_ENABLE_IMAGE_SUPPORT=1")

if "hip:gpu" in sycl_devices:
extra_env.append("UR_HIP_ENABLE_IMAGE_SUPPORT=1")

return extra_env

Expand Down
4 changes: 3 additions & 1 deletion sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,9 @@ def open_check_file(file_name):
env = copy.copy(llvm_config.config.environment)
env["ONEAPI_DEVICE_SELECTOR"] = sycl_device
if sycl_device.startswith("cuda:"):
env["SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
env["UR_CUDA_ENABLE_IMAGE_SUPPORT"] = "1"
if sycl_device.startswith("hip:"):
env["UR_HIP_ENABLE_IMAGE_SUPPORT"] = "1"
# When using the ONEAPI_DEVICE_SELECTOR environment variable, sycl-ls
# prints warnings that might derail a user thinking something is wrong
# with their test run. It's just us filtering here, so silence them unless
Expand Down
Loading