Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Fix CI issues caused by recent UR version bump #14796

Merged
merged 2 commits into from
Jul 26, 2024
Merged

[CI] Fix CI issues caused by recent UR version bump #14796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4955b
[CI] Install hwloc dependency on macOS runner
kswiecicki Jul 26, 2024
65afca5
[UR] Bump UR version
kswiecicki Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sycl-macos-build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
CCACHE_MAXSIZE: ${{ inputs.build_cache_size }}
steps:
- name: Install dependencies
run: brew install ccache ninja
run: brew install ccache ninja hwloc
- uses: actions/checkout@v4
with:
ref: ${{ inputs.build_ref }}
Expand Down
12 changes: 6 additions & 6 deletions sycl/plugins/unified_runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading