From c8ac0e2a31b8879e5cb4dc8b79db5d4729846874 Mon Sep 17 00:00:00 2001 From: "Neil R. Spruit" Date: Thu, 28 Mar 2024 12:28:33 -0700 Subject: [PATCH 1/2] [UR][L0] Fix regular in order command list reuse given inorder queue pre-commit PR for https://github.com/oneapi-src/unified-runtime/pull/1483 Signed-off-by: Neil R. Spruit --- sycl/plugins/unified_runtime/CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 1fcc91bdc31af..62909779b8ea7 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -81,14 +81,8 @@ if(SYCL_PI_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") - # commit ff276ab1cd584557f8ed4d176109057684a5f4ca - # Merge: ed949ecd 2968cc14 - # Author: aarongreig - # Date: Wed Mar 27 11:28:34 2024 +0000 - # Merge pull request #1363 from hdelan/refactor-device-initialization - # [CUDA] Refactor device initialization - set(UNIFIED_RUNTIME_TAG ff276ab1cd584557f8ed4d176109057684a5f4ca) + set(UNIFIED_RUNTIME_REPO "https://github.com/nrspruit/unified-runtime.git") + set(UNIFIED_RUNTIME_TAG e2e447282f029187add3093459098b810431e8eb) if(SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO) set(UNIFIED_RUNTIME_REPO "${SYCL_PI_UR_OVERRIDE_FETCH_CONTENT_REPO}") From 0b2c0d33fd7c308cac988f4caef5b237157a311f Mon Sep 17 00:00:00 2001 From: Aaron Greig Date: Thu, 11 Apr 2024 15:23:51 +0100 Subject: [PATCH 2/2] Update to merged UR tag --- sycl/plugins/unified_runtime/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sycl/plugins/unified_runtime/CMakeLists.txt b/sycl/plugins/unified_runtime/CMakeLists.txt index 94674836206e9..1bad20d303258 100644 --- a/sycl/plugins/unified_runtime/CMakeLists.txt +++ b/sycl/plugins/unified_runtime/CMakeLists.txt @@ -95,13 +95,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit e00a764f8dafd1319b636aa99c15601ec0d4d7fc - # Merge: 85b75590 92b60b77 + # commit 758c61490442456933e3957aac568e13287429eb + # Merge: e2b5b7fa e2e44728 # Author: aarongreig - # Date: Wed Apr 10 10:21:22 2024 +0100 - # Merge pull request #1455 from GeorgeWeb/georgi/fix-hip-usm-copy2d - # [HIP] Fix memory type detection in allocation info queries and USM copy2D - set(UNIFIED_RUNTIME_TAG e00a764f8dafd1319b636aa99c15601ec0d4d7fc) + # Date: Wed Apr 10 16:15:45 2024 +0100 + # Merge pull request #1483 from nrspruit/fix_inorder_lists_reuse + # [L0] Fix regular in order command list reuse given inorder queue + set(UNIFIED_RUNTIME_TAG 758c61490442456933e3957aac568e13287429eb) fetch_adapter_source(level_zero ${UNIFIED_RUNTIME_REPO}