Skip to content

Commit 0119d48

Browse files
authored
[CI] Fix CI issues caused by recent UR version bump (#14796)
`hwloc` became a dependency after #13343 was merged. CI infrastructure has been updated to have `hwloc` installed, but it's still missing on macOS runner. Additionally, UMF compile options caused errors on SYCL runners that should be resolved after UR version bump included in this patch. Logs: https://github.com/intel/llvm/actions/runs/10106492701/job/27948711331 and https://github.com/intel/llvm/actions/runs/10106492701/job/27948711538.
1 parent e4ad627 commit 0119d48

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/sycl-macos-build-and-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
3131
steps:
3232
- name: Install dependencies
33-
run: brew install ccache ninja
33+
run: brew install ccache ninja hwloc
3434
- uses: actions/checkout@v4
3535
with:
3636
ref: ${{ inputs.build_ref }}

sycl/plugins/unified_runtime/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
9999
endfunction()
100100

101101
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
102-
# commit 3d8fe8d298cec8db624fc230fa5c0e19865aa6f1
103-
# Merge: e8c9f3db 0a259f33
102+
# commit 2baf095188b235bb2b0a0140f0187d2041aef4b0
103+
# Merge: 3d8fe8d2 58f85278
104104
# Author: Piotr Balcer <[email protected]>
105-
# Date: Thu Jul 25 15:13:00 2024 +0200
106-
# Merge pull request #1430 from igchor/umf_dynamic_linking
107-
# Bump UMF version and switch to dynamic linking
108-
set(UNIFIED_RUNTIME_TAG 3d8fe8d298cec8db624fc230fa5c0e19865aa6f1)
105+
# Date: Fri Jul 26 12:06:22 2024 +0200
106+
# Merge pull request #1900 from kswiecicki/umf-version-bump
107+
# Bump UMF version
108+
set(UNIFIED_RUNTIME_TAG 58f85278a4ebf37742dd10afb3350580b0b1d9d7)
109109

110110
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
111111
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need

0 commit comments

Comments
 (0)