From d6d3ebcd030f4588cfb179571beb36a3480a501f Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Tue, 22 Oct 2024 07:03:46 -0700 Subject: [PATCH 1/5] [UR] Split the UNIFIED_RUNTIME_TAG to its own file With current repo setup, we need to update UNIFIED_RUNTIME_TAG constantly. This is creating conflicts when doing merge from other branches. To faciliate the automation to handle such conflicts, we would prefer to split the tag into into own file, the automation will then be triggereed whenever the file changes (implying UR tag change). --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 8 +------- sycl/cmake/modules/UnifiedRuntimeTAG.cmake | 7 +++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 sycl/cmake/modules/UnifiedRuntimeTAG.cmake diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 7dbb2f4c604ea..7745823dd2101 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,13 +117,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - # commit c742ca49efb12380a35b8b0b467e6577ab8174ce - # Merge: 3a8bf2c5 504d3b63 - # Author: Kenneth Benzie (Benie) - # Date: Mon Oct 21 11:55:23 2024 +0100 - # Merge pull request #2131 from Bensuo/ben/command-handle-fix - # [EXP][CMDBUF] Make command handle behaviour consistent - set(UNIFIED_RUNTIME_TAG c742ca49efb12380a35b8b0b467e6577ab8174ce) + include(${CMAKE_CURRENT_SOURCE_DIR}/UnifiedRuntimeTAG.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/cmake/modules/UnifiedRuntimeTAG.cmake b/sycl/cmake/modules/UnifiedRuntimeTAG.cmake new file mode 100644 index 0000000000000..0e7754f5e6e5a --- /dev/null +++ b/sycl/cmake/modules/UnifiedRuntimeTAG.cmake @@ -0,0 +1,7 @@ +# commit c742ca49efb12380a35b8b0b467e6577ab8174ce +# Merge: 3a8bf2c5 504d3b63 +# Author: Kenneth Benzie (Benie) +# Date: Mon Oct 21 11:55:23 2024 +0100 +# Merge pull request #2131 from Bensuo/ben/command-handle-fix +# [EXP][CMDBUF] Make command handle behaviour consistent +set(UNIFIED_RUNTIME_TAG c742ca49efb12380a35b8b0b467e6577ab8174ce) From 8f03e89c78ca82bb2a8f9dcc4474cdbaf1f85623 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Tue, 22 Oct 2024 07:52:50 -0700 Subject: [PATCH 2/5] Fix path --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index 7745823dd2101..cb7af45140a86 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,7 +117,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - include(${CMAKE_CURRENT_SOURCE_DIR}/UnifiedRuntimeTAG.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTAG.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need From 1470666542cbcacb807ab8c92d6aa64661a54075 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Tue, 22 Oct 2024 09:36:04 -0700 Subject: [PATCH 3/5] Rename file --- sycl/cmake/modules/FetchUnifiedRuntime.cmake | 2 +- .../{UnifiedRuntimeTAG.cmake => UnifiedRuntimeTag.cmake} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename sycl/cmake/modules/{UnifiedRuntimeTAG.cmake => UnifiedRuntimeTag.cmake} (100%) diff --git a/sycl/cmake/modules/FetchUnifiedRuntime.cmake b/sycl/cmake/modules/FetchUnifiedRuntime.cmake index cb7af45140a86..72841724fa01d 100644 --- a/sycl/cmake/modules/FetchUnifiedRuntime.cmake +++ b/sycl/cmake/modules/FetchUnifiedRuntime.cmake @@ -117,7 +117,7 @@ if(SYCL_UR_USE_FETCH_CONTENT) endfunction() set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTAG.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/UnifiedRuntimeTag.cmake) set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") # Due to the use of dependentloadflag and no installer for UMF and hwloc we need diff --git a/sycl/cmake/modules/UnifiedRuntimeTAG.cmake b/sycl/cmake/modules/UnifiedRuntimeTag.cmake similarity index 100% rename from sycl/cmake/modules/UnifiedRuntimeTAG.cmake rename to sycl/cmake/modules/UnifiedRuntimeTag.cmake From 89d74e6307aa27f710920856529cb3f04c8c5642 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Tue, 22 Oct 2024 09:36:49 -0700 Subject: [PATCH 4/5] Update codeowner file --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 910434b73d6c8..e837b56a651e4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,6 +36,7 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers # Unified Runtime sycl/cmake/modules/FetchUnifiedRuntime.cmake @intel/unified-runtime-reviewers +sycl/cmake/modules/FetchUnifiedRuntimeTag.cmake @intel/unified-runtime-reviewers sycl/include/sycl/detail/ur.hpp @intel/unified-runtime-reviewers sycl/source/detail/posix_ur.cpp @intel/unified-runtime-reviewers sycl/source/detail/ur.cpp @intel/unified-runtime-reviewers From e6e337efaf4e5a0daa74430ab2e43a78ff4831f9 Mon Sep 17 00:00:00 2001 From: Jinsong Ji Date: Tue, 22 Oct 2024 14:18:37 -0400 Subject: [PATCH 5/5] Update .github/CODEOWNERS Co-authored-by: Udit Agarwal --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e837b56a651e4..e2aaea3eaefde 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -36,7 +36,7 @@ sycl/doc/extensions/ @intel/dpcpp-specification-reviewers # Unified Runtime sycl/cmake/modules/FetchUnifiedRuntime.cmake @intel/unified-runtime-reviewers -sycl/cmake/modules/FetchUnifiedRuntimeTag.cmake @intel/unified-runtime-reviewers +sycl/cmake/modules/UnifiedRuntimeTag.cmake @intel/unified-runtime-reviewers sycl/include/sycl/detail/ur.hpp @intel/unified-runtime-reviewers sycl/source/detail/posix_ur.cpp @intel/unified-runtime-reviewers sycl/source/detail/ur.cpp @intel/unified-runtime-reviewers