From cc9b99da66b13d6426535c478ed0b44f87de5cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Mestre?= Date: Wed, 22 Jan 2025 15:14:25 +0000 Subject: [PATCH 1/2] [UR] Fix kernel arguments being overwritten in the CUDA and HIP adapters --- 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 72841724fa01..202bfdcdc19e 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/Bensuo/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 839ff5564af9..40218c012be1 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -4,4 +4,4 @@ # Date: Tue Jan 21 15:49:41 2025 +0000 # Merge pull request #2593 from RossBrunton/ross/formatall # Ensure all files are clang formatted -set(UNIFIED_RUNTIME_TAG f058cb230c65fe8094f74043d0c9afd5ba0e8325) +set(UNIFIED_RUNTIME_TAG 9de10cd9547db008ef4347f86dc0bf9198a8fb97) From 371fe15f814eab3fda9d86805882661eb7ef010b Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Thu, 23 Jan 2025 16:09:38 +0000 Subject: [PATCH 2/2] [UR] Bump main tag to b8416916 --- 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 202bfdcdc19e..72841724fa01 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.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 40218c012be1..5ba8a6aa938f 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit f058cb230c65fe8094f74043d0c9afd5ba0e8325 -# Merge: 871061f1 3bf76246 -# Author: Ross Brunton -# Date: Tue Jan 21 15:49:41 2025 +0000 -# Merge pull request #2593 from RossBrunton/ross/formatall -# Ensure all files are clang formatted -set(UNIFIED_RUNTIME_TAG 9de10cd9547db008ef4347f86dc0bf9198a8fb97) +# commit b841691699393dd2375e987c3d38d5f59c3e35cf +# Merge: c6859445 9de10cd9 +# Author: Kenneth Benzie (Benie) +# Date: Thu Jan 23 16:07:06 2025 +0000 +# Merge pull request #2559 from Bensuo/fix_kernel_arg_indices +# [CUDA][HIP] Fix kernel arguments being overwritten when added out of order +set(UNIFIED_RUNTIME_TAG b841691699393dd2375e987c3d38d5f59c3e35cf)