From 90628f4dce2eaddd405a18afc4566a0363cb6ac9 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Wed, 10 Jan 2024 09:33:16 +0000 Subject: [PATCH 1/4] [Bindless] 1D Image copy fix --- sycl/plugins/unified_runtime/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 46bd16b592553..98ec68a93bf86 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -56,14 +56,9 @@ endif() if(SYCL_PI_UR_USE_FETCH_CONTENT) include(FetchContent) + # DO NOT MERGE set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 12a67f56c3c5d08cfac0852d552b4e5fe0452d04 - # Merge: 2b7b827c c10968f5 - # Author: Kenneth Benzie (Benie) - # Date: Tue Jan 9 10:53:32 2024 +0000 - # Merge pull request #1027 from GeorgeWeb/georgi/hip_memadvise - # [SYCL][HIP] Implement mem_advise for HIP - set(UNIFIED_RUNTIME_TAG 12a67f56c3c5d08cfac0852d552b4e5fe0452d04) + set(UNIFIED_RUNTIME_TAG 0b41fddee88ff2e919b1f6719222a98c392fabc1) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}") From a2f63781f9ce8651408fa4c713abee9ebb7c2620 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Wed, 10 Jan 2024 09:42:59 +0000 Subject: [PATCH 2/4] fetch from fork --- 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 98ec68a93bf86..3242a565ac786 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) include(FetchContent) # DO NOT MERGE - set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") + set(UNIFIED_RUNTIME_REPO "https://github.com/cppchedy/unified-runtime.git") set(UNIFIED_RUNTIME_TAG 0b41fddee88ff2e919b1f6719222a98c392fabc1) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) From f6734c3b309ce7fb84b8d894d4fa5f5f2ba2d3d2 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Fri, 2 Feb 2024 15:03:30 +0000 Subject: [PATCH 3/4] update UR commit --- 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 3242a565ac786..e561ab7bd2e42 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -58,7 +58,7 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) # DO NOT MERGE set(UNIFIED_RUNTIME_REPO "https://github.com/cppchedy/unified-runtime.git") - set(UNIFIED_RUNTIME_TAG 0b41fddee88ff2e919b1f6719222a98c392fabc1) + set(UNIFIED_RUNTIME_TAG cf806c37c9f8678f895899ea86e2459ade49b7e7) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}") From d2fce9af16345eb29e78ecc1195f5d11a886d289 Mon Sep 17 00:00:00 2001 From: "chedy.najjar" Date: Mon, 5 Feb 2024 17:30:57 +0000 Subject: [PATCH 4/4] update commit for UR --- sycl/plugins/unified_runtime/CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index e561ab7bd2e42..754a8a51ea3ad 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -56,9 +56,16 @@ endif() if(SYCL_PI_UR_USE_FETCH_CONTENT) include(FetchContent) - # DO NOT MERGE - set(UNIFIED_RUNTIME_REPO "https://github.com/cppchedy/unified-runtime.git") - set(UNIFIED_RUNTIME_TAG cf806c37c9f8678f895899ea86e2459ade49b7e7) + set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") +# commit c0b1f13d94966090a1bb982b3bd747b30b9ef9d3 +# Merge: 475ce8b4 cf806c37 +# Author: aarongreig +# Date: Mon Feb 5 13:41:50 2024 +0000 +# +# Merge pull request #1240 from cppchedy/chedy/fix-bi-copy-image +# +# [Bindless][exp] 1D Image copy fix + set(UNIFIED_RUNTIME_TAG c0b1f13d94966090a1bb982b3bd747b30b9ef9d3) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}")