From 828148ae13dce2ca339df2e9c80a559e02895163 Mon Sep 17 00:00:00 2001 From: Hugh Delaney Date: Wed, 15 Nov 2023 11:56:54 +0000 Subject: [PATCH 1/3] Run CI for Revert HIP prefetch --- sycl/plugins/unified_runtime/CMakeLists.txt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index af3e1397b3a6f..c8a61fc3bcd65 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -55,14 +55,9 @@ endif() if(SYCL_PI_UR_USE_FETCH_CONTENT) include(FetchContent) - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 659d3f469faa99a886fa680a3d6d20449b109578 - # Merge: 192e9404 f94550b4 - # Author: Kenneth Benzie (Benie) - # Date: Tue Nov 14 16:45:24 2023 +0000 - # Merge pull request #1059 from martygrant/martin/moveNativeCPUAdapterToUR - # [NATIVECPU] Move Native CPU adapter to UR. - set(UNIFIED_RUNTIME_TAG 659d3f469faa99a886fa680a3d6d20449b109578) + # DO NOT MERGE + set(UNIFIED_RUNTIME_REPO https://github.com/hdelan/unified-runtime.git) + set(UNIFIED_RUNTIME_TAG b3887e61d9ebc45b0d0c43aaec4c9772d3fab654) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}") From d3ada21c707843b73d9b799f321d997db662bdfb Mon Sep 17 00:00:00 2001 From: Hugh Delaney Date: Mon, 20 Nov 2023 11:34:25 +0000 Subject: [PATCH 2/3] Use branch instead of commit SHA --- sycl/plugins/unified_runtime/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index c8a61fc3bcd65..c68f3ddda8963 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -57,7 +57,7 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) # DO NOT MERGE set(UNIFIED_RUNTIME_REPO https://github.com/hdelan/unified-runtime.git) - set(UNIFIED_RUNTIME_TAG b3887e61d9ebc45b0d0c43aaec4c9772d3fab654) + set(UNIFIED_RUNTIME_TAG revert-hip-prefetch) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}") From 624c9556f80a86ee595dfbd6a9cb865bac5d23f9 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 28 Nov 2023 13:35:37 +0000 Subject: [PATCH 3/3] [UR] Bump tag to v0.8.0 --- sycl/plugins/unified_runtime/CMakeLists.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index f61f942e762f9..20ac4f1d9bc97 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -56,9 +56,12 @@ endif() if(SYCL_PI_UR_USE_FETCH_CONTENT) include(FetchContent) - # DO NOT MERGE - set(UNIFIED_RUNTIME_REPO https://github.com/hdelan/unified-runtime.git) - set(UNIFIED_RUNTIME_TAG revert-hip-prefetch) + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + # commit 712d79120e0a9293daf5741f9c0b5269ddd862ce + # Author: Kenneth Benzie (Benie) + # Date: Fri Nov 24 12:34:51 2023 +0000 + # Set version to v0.8.0 + set(UNIFIED_RUNTIME_TAG v0.8.0) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")