forked from intel/llvm
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[CI] Fix CI issues caused by recent UR version bump (intel#14796)
`hwloc` became a dependency after intel#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.
- Loading branch information
1 parent
e4ad627
commit 0119d48
Showing
2 changed files
with
7 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -99,13 +99,13 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT) | |
endfunction() | ||
|
||
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git") | ||
# commit 3d8fe8d298cec8db624fc230fa5c0e19865aa6f1 | ||
# Merge: e8c9f3db 0a259f33 | ||
# commit 2baf095188b235bb2b0a0140f0187d2041aef4b0 | ||
# Merge: 3d8fe8d2 58f85278 | ||
# Author: Piotr Balcer <[email protected]> | ||
# Date: Thu Jul 25 15:13:00 2024 +0200 | ||
# Merge pull request #1430 from igchor/umf_dynamic_linking | ||
# Bump UMF version and switch to dynamic linking | ||
set(UNIFIED_RUNTIME_TAG 3d8fe8d298cec8db624fc230fa5c0e19865aa6f1) | ||
# Date: Fri Jul 26 12:06:22 2024 +0200 | ||
# Merge pull request #1900 from kswiecicki/umf-version-bump | ||
# Bump UMF version | ||
set(UNIFIED_RUNTIME_TAG 58f85278a4ebf37742dd10afb3350580b0b1d9d7) | ||
|
||
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES") | ||
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need | ||
|