From 94e8b53acf437cf275e7db00d53ae5d101a62b45 Mon Sep 17 00:00:00 2001 From: "Wu, Yingcong" Date: Thu, 5 Dec 2024 01:33:38 -0800 Subject: [PATCH 1/3] add ur branch --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 72841724fa01d..3e51f5e73764c 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/yingcong-wu/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 81e0ae3c1fc3a..8cebeac985b7a 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1 @@ -# commit 2bea25d7d5404ce82f36caf91c359f65b25187d7 -# Merge: 0b5d8f9e e578228a -# Author: Kenneth Benzie (Benie) -# Date: Tue Dec 3 12:41:16 2024 +0000 -# Merge pull request #2298 from Bensuo/ewan/cuda_update_local_size -# Improve CUDA/HIP local argument handling -set(UNIFIED_RUNTIME_TAG 2bea25d7d5404ce82f36caf91c359f65b25187d7) +set(UNIFIED_RUNTIME_TAG yc-PR/1204-error-on-unsupported-feature) From b732ddae358a92fafcea9250ffb189902232e9e0 Mon Sep 17 00:00:00 2001 From: Wu Yingcong Date: Thu, 5 Dec 2024 18:11:08 +0800 Subject: [PATCH 2/3] trigger CI --- sycl/cmake/modules/UnifiedRuntimeTag.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/UnifiedRuntimeTag.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake index 6f890d5fc2bf4..787b083a41f05 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -3,5 +3,5 @@ # Author: Neil R. Spruit # Date: Wed Dec 4 13:35:40 2024 -0800 # Merge pull request #2416 from nrspruit/disable_driver_inorderlists -# [L0] Disabling Driver In Order Lists by default +# [L0] Disabling Driver In Order Lists by default set(UNIFIED_RUNTIME_TAG yc-PR/1204-error-on-unsupported-feature) From 992d242b33cee29446cb24cd070299a73fb1a757 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 10 Dec 2024 18:06:07 +0000 Subject: [PATCH 3/3] [UR] Bump main tag to 870f0ed7 --- 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 3e51f5e73764c..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/yingcong-wu/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 787b083a41f05..4333e8a355972 100644 --- a/sycl/cmake/modules/UnifiedRuntimeTag.cmake +++ b/sycl/cmake/modules/UnifiedRuntimeTag.cmake @@ -1,7 +1,7 @@ -# commit b23a973a08194fbc462e968c7f0b2a04aded9b0e -# Merge: 3ad235de 447b638b -# Author: Neil R. Spruit -# Date: Wed Dec 4 13:35:40 2024 -0800 -# Merge pull request #2416 from nrspruit/disable_driver_inorderlists -# [L0] Disabling Driver In Order Lists by default -set(UNIFIED_RUNTIME_TAG yc-PR/1204-error-on-unsupported-feature) +# commit 870f0ed76aa302c23b4d72aa90d0b24b1faf1aa7 +# Merge: e1cc9b2c b532350f +# Author: Kenneth Benzie (Benie) +# Date: Tue Dec 10 18:05:02 2024 +0000 +# Merge pull request #2420 from yingcong-wu/yc-PR/1204-error-on-unsupported-feature +# [DevAsan] Report error when using unsupported extension API +set(UNIFIED_RUNTIME_TAG 870f0ed76aa302c23b4d72aa90d0b24b1faf1aa7)