From 2dfdc06aa05ff9e0c31cb08b5d0c855bb25acaca Mon Sep 17 00:00:00 2001 From: Sean Stirling Date: Thu, 18 Jul 2024 11:08:48 +0100 Subject: [PATCH] Update UR CMakeLists --- sycl/include/sycl/detail/pi.h | 1 - sycl/plugins/unified_runtime/CMakeLists.txt | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/sycl/include/sycl/detail/pi.h b/sycl/include/sycl/detail/pi.h index 40c5036372528..e25ac61c8cea1 100644 --- a/sycl/include/sycl/detail/pi.h +++ b/sycl/include/sycl/detail/pi.h @@ -205,7 +205,6 @@ // piextImportExternalSemaphoreOpaqueFD // 19.61 Rename piextDestroyExternalSemaphore to piextReleaseExternalSemaphore - #define _PI_H_VERSION_MAJOR 19 #define _PI_H_VERSION_MINOR 61 diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index b737a4fa69e12..2f6bb78a74eda 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -99,14 +99,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/Seanst98/unified-runtime.git") - # commit 9d3bce6ad92e6f0a4af0139f9744584b5a402827 - # Merge: e0775441 1c9c2d0b + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + # commit 0abf37072567c27ff412ea7acfce7b72b9e4b3c0 # Author: Kenneth Benzie (Benie) - # Date: Tue Jul 9 15:57:44 2024 +0100 - # Merge pull request #1822 from JackAKirk/cuda-cubemap-driver-fix - # [cuda][bindless_images][2025.0 req] Fix for cuda < 11.6 support. - set(UNIFIED_RUNTIME_TAG 037d3b57d9c7c62f5989ba9950d926f800f8d84c) + # Date: Wed Jul 17 19:12:31 2024 +0100 + # Reinstate "Merge pull request #1855 from Seanst98/sean/rename-external-semaphore-release"" + # This reverts commit b26e53cdbd178ee03c3e8252aa00e596deb1f313. + set(UNIFIED_RUNTIME_TAG 0abf37072567c27ff412ea7acfce7b72b9e4b3c0) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO}