From 51e6466fe29d3104dc4576dbb3694010468f9e30 Mon Sep 17 00:00:00 2001 From: Ewan Crawford Date: Fri, 29 Nov 2024 12:13:06 +0000 Subject: [PATCH 1/2] [SYCL][Graph] Bump UR with Coverity fixes Bump the UR tag to include coverity fixes for command-buffers https://github.com/oneapi-src/unified-runtime/pull/2379 --- 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 e9d52c5b23dac..ca6f6121146c3 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") + set(UNIFIED_RUNTIME_REPO "https://github.com/Bensuo/unified-runtime") 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 b5c82c3ead941..9d91a7603d817 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Wed Nov 27 16:04:19 2024 +0000 # Merge pull request #2261 from againull/againull/2d_block_exp # Add new device descriptor to query 2D block array capabilities of the Intel GPU -set(UNIFIED_RUNTIME_TAG db83117e830406b0d9950e24892dba868acba354) +set(UNIFIED_RUNTIME_TAG "ben/coverity-fixes") From 59806bdb3eeac27ed908cca8321da1e014fb4652 Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Fri, 6 Dec 2024 18:04:35 +0000 Subject: [PATCH 2/2] [UR] Update tag to e37f75f for https://github.com/oneapi-src/unified-runtime/pull/2379. --- 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 ca6f6121146c3..e9d52c5b23dac 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/Bensuo/unified-runtime") + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime") 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 9d91a7603d817..32b4b39c67ac9 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit db83117e830406b0d9950e24892dba868acba354 -# Merge: 0a90db9b c79df596 -# Author: Callum Fare -# Date: Wed Nov 27 16:04:19 2024 +0000 -# Merge pull request #2261 from againull/againull/2d_block_exp -# Add new device descriptor to query 2D block array capabilities of the Intel GPU -set(UNIFIED_RUNTIME_TAG "ben/coverity-fixes") +# commit e37f75ffad5ad22e96c46eb70ab1757be7cc5afc +# Merge: daa0b110464c 323b37c55504 +# Author: Martin Grant +# Date: Fri Dec 6 18:03:11 2024 +0000 +# Merge pull request #2379 from Bensuo/ben/coverity-fixes +# Fix command_buffer coverity issues +set(UNIFIED_RUNTIME_TAG e37f75ffad5ad22e96c46eb70ab1757be7cc5afc)