From dff7e07a7ce70f6b7483f3752aa1ac8f6f09e44f Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Fri, 13 Dec 2024 11:50:45 -0800 Subject: [PATCH 1/2] [UR][L0] Fix external semaphore import function call to match the header -pre-commit PR for https://github.com/oneapi-src/unified-runtime/pull/2467 Signed-off-by: Neil R. Spruit --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..1483823428d9c 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/nrspruit/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 0c84410ab5aa9..d2ea987b9e547 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Fri Dec 13 14:20:15 2024 +0000 # Merge pull request #2454 from Bensuo/l0_cmd-buf_multi-device # Fix L0 command-buffer consumption of multi-device kernels -set(UNIFIED_RUNTIME_TAG b7047f6c36ec17b8560c2f1cd9ac9521715a9127) +set(UNIFIED_RUNTIME_TAG be27d8f06e559890ca47c131b3346e0e2a551057) From f18bb38750645fc2c5ac1752675dd84eb50c8aca Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Mon, 16 Dec 2024 14:04:58 +0000 Subject: [PATCH 2/2] [UR] Bump main tag to 39df0317 --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 1483823428d9c..72841724fa01d 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -116,7 +116,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) CACHE PATH "Path to external '${name}' adapter source dir" FORCE) endfunction() - set(UNIFIED_RUNTIME_REPO "https://github.com/nrspruit/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index d2ea987b9e547..6a43c3098288b 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit b7047f6c36ec17b8560c2f1cd9ac9521715a9127 -# Merge: 73e5f3c6ff2d fcddf077c290 -# Author: Martin Grant -# Date: Fri Dec 13 14:20:15 2024 +0000 -# Merge pull request #2454 from Bensuo/l0_cmd-buf_multi-device -# Fix L0 command-buffer consumption of multi-device kernels -set(UNIFIED_RUNTIME_TAG be27d8f06e559890ca47c131b3346e0e2a551057) +# commit 39df0317814c164f5242eda8d6f08550f6268492 +# Merge: 68d93efd be27d8f0 +# Author: Kenneth Benzie (Benie) +# Date: Mon Dec 16 13:53:13 2024 +0000 +# Merge pull request #2467 from nrspruit/fix_external_import_function_call +# [L0] Fix external semaphore import function calls to match the header +set(UNIFIED_RUNTIME_TAG 39df0317814c164f5242eda8d6f08550f6268492)