From a8a18e23cc5fbb617b418d952742cd53fb2e234b Mon Sep 17 00:00:00 2001 From: Martin Morrison-Grant Date: Thu, 14 Nov 2024 11:07:54 +0000 Subject: [PATCH 1/2] [UR] Update tag to 1f68788 for UR#2326 - Index into property array in urDevicePartition for OpenCL. --- 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..21b3e98a8e71e 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/martygrant/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 95a7b4dc86bce..9d2a98478e1d3 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Wed Nov 20 14:49:17 2024 +0000 # Merge pull request #2258 from aarongreig/aaron/tryUseExtensionSubgroupInfo # Use extension version of clGetKernelSubGroupInfo when necessary. -set(UNIFIED_RUNTIME_TAG 9937d029c7fdcbf101e89f8515f640c145e059c5) +set(UNIFIED_RUNTIME_TAG 1f68788020e2f13602cd209e6e59ede6626185d4) From 97df49b58196e1a3ef2256d515c739e13d1fb552 Mon Sep 17 00:00:00 2001 From: Callum Fare Date: Fri, 22 Nov 2024 11:56:01 +0000 Subject: [PATCH 2/2] Bump UR tag --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 21b3e98a8e71e..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/martygrant/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 9d2a98478e1d3..9a74cee6d706f 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit 9937d029c7fdcbf101e89f8515f640c145e059c5 -# Merge: 9ac6d5d9 10b0e101 +# commit b0f9293d9b39ce0f8019a02198119a8b6fe0b05f +# Merge: b5294ee0 1f687880 # Author: Callum Fare -# Date: Wed Nov 20 14:49:17 2024 +0000 -# Merge pull request #2258 from aarongreig/aaron/tryUseExtensionSubgroupInfo -# Use extension version of clGetKernelSubGroupInfo when necessary. -set(UNIFIED_RUNTIME_TAG 1f68788020e2f13602cd209e6e59ede6626185d4) +# Date: Fri Nov 22 11:50:36 2024 +0000 +# Merge pull request #2326 from martygrant/martin/fixDevicePartitionOpenCL +# Index into property array in urDevicePartition for OpenCL +set(UNIFIED_RUNTIME_TAG b0f9293d9b39ce0f8019a02198119a8b6fe0b05f)