From fcfe36b705fa715b4813de95565bbba9a5b88223 Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Mon, 10 Jun 2024 10:16:54 +0100 Subject: [PATCH] [UR] Bump main tag to f06bc02a (#14047) Includes the following: * https://github.com/oneapi-src/unified-runtime/pull/1653 * https://github.com/oneapi-src/unified-runtime/pull/1568 * https://github.com/oneapi-src/unified-runtime/pull/1634 * https://github.com/oneapi-src/unified-runtime/pull/1669 --- sycl/plugins/unified_runtime/CMakeLists.txt | 44 +++++---------------- 1 file changed, 10 insertions(+), 34 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 7257b5e1734a9..0bfe955d14689 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -100,23 +100,17 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit 755a1e75e24ed55070a0f457d2d8a676521ad4f7 - # Merge: 6469b890 5593d84c + # commit f06bc02a24418990ecb9d41471b729f32aebd804 + # Merge: 42c0b025 9868e3b0 # Author: Kenneth Benzie (Benie) - # Date: Tue Jun 4 10:34:57 2024 +0100 - # Merge pull request #1385 from yingcong-wu/yc/new-api-suggestgroupsize - # Implement urKernelGetSuggestedLocalWorkSize - set(UNIFIED_RUNTIME_TAG 755a1e75e24ed55070a0f457d2d8a676521ad4f7) + # Date: Wed Jun 5 12:02:53 2024 +0100 + # Merge pull request #1669 from JackAKirk/fix-usmptr-get-dev + # [CUDA][HIP] Fix urUSMGetMemAllocInfo impl to use single platform. + set(UNIFIED_RUNTIME_TAG f06bc02a24418990ecb9d41471b729f32aebd804) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO} - # commit 8e47ab5057458c5522ce5d86f7996b2882020220 - # Merge: b816fe82 3d3aba65 - # Author: Kenneth Benzie (Benie) - # Date: Tue Jun 4 17:28:43 2024 +0100 - # Merge pull request #1694 from Bensuo/ewan/L0_update_query - # Set minimum L0 device support to support UR kernel update - 8e47ab5057458c5522ce5d86f7996b2882020220 + ${UNIFIED_RUNTIME_TAG} ) fetch_adapter_source(opencl @@ -126,35 +120,17 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) fetch_adapter_source(cuda ${UNIFIED_RUNTIME_REPO} - # commit 0e38fda02ca00aaab28018240eb526da7dd08f56 - # Merge: f4968809 b7c8ac18 - # Author: Kenneth Benzie (Benie) - # Date: Tue Jun 4 14:18:15 2024 +0100 - # Merge pull request #1552 from mmoadeli/atomic-access-on-host-malloc - # [CUDA] Remove the support of concurrent atomic access to host allocated pinned memory. - 0e38fda02ca00aaab28018240eb526da7dd08f56 + ${UNIFIED_RUNTIME_TAG} ) fetch_adapter_source(hip ${UNIFIED_RUNTIME_REPO} - # commit 399430da9613269a0dc8ddf605415942e0a37e9c - # Merge: 39cb69ab 10b04891 - # Author: Kenneth Benzie (Benie) - # Date: Tue Jun 4 17:15:33 2024 +0100 - # Merge pull request #1688 from frasercrmck/hip-enqueue-mem-readwritecopy - # [HIP] Various fixes for urEnqueueMemImage(Read|Write|Copy) - 399430da9613269a0dc8ddf605415942e0a37e9c + ${UNIFIED_RUNTIME_TAG} ) fetch_adapter_source(native_cpu ${UNIFIED_RUNTIME_REPO} - # commit 31ee5d536130a6d2ce09661db1bef3bd1cd4d705 - # Merge: ab151e98 53e43466 - # Author: Kenneth Benzie (Benie) - # Date: Tue Jun 4 14:10:39 2024 +0100 - # Merge pull request #1527 from PietroGhg/pietro/report_atomics - # [NATIVECPU] Report correct memory order capabilities for Native CPU - 31ee5d536130a6d2ce09661db1bef3bd1cd4d705 + ${UNIFIED_RUNTIME_TAG} ) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO)