Skip to content

[UR] disable hwloc support for UMF #14812

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

Merged
merged 4 commits into from
Jul 29, 2024
Merged

[UR] disable hwloc support for UMF #14812

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
159cc42
[UR] disable hwloc support for UMF
igchor Jul 26, 2024
98bf233
update to upstream
pbalcer Jul 29, 2024
2d3ad9b
Update sycl/cmake/modules/FetchUnifiedRuntime.cmake
pbalcer Jul 29, 2024
53155dc
remove redundant newline
pbalcer Jul 29, 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
17 changes: 11 additions & 6 deletions sycl/cmake/modules/FetchUnifiedRuntime.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ option(SYCL_PI_UR_USE_FETCH_CONTENT
set(SYCL_PI_UR_SOURCE_DIR
"" CACHE PATH "Path to root of Unified Runtime repository")

option(SYCL_UMF_DISABLE_HWLOC
"Disable hwloc support in UMF" ON)

# Here we override the defaults to disable building tests from unified-runtime
set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE)
set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE)
Expand Down Expand Up @@ -113,20 +116,22 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
endfunction()

set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
# commit b7b0c8b3d17aa7d511c67ec219d58091d07cfa60
# Merge: 2baf0951 5b8936da
# commit a985a81dc9ba8adfcc8b54e35ad287e97766fb3e
# Merge: b7b0c8b3 f772f907
# Author: Piotr Balcer <[email protected]>
# Date: Fri Jul 26 15:48:04 2024 +0200
# Merge pull request #1903 from kswiecicki/umf-version-bump
# Bump UMF version again
set(UNIFIED_RUNTIME_TAG b7b0c8b3d17aa7d511c67ec219d58091d07cfa60)
# Date: Mon Jul 29 09:11:29 2024 +0200
# Merge pull request #1905 from igchor/umf_hwloc_disable
# Bump UMF version to allow disabling hwloc
set(UNIFIED_RUNTIME_TAG a985a81dc9ba8adfcc8b54e35ad287e97766fb3e)

set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
# to link statically on windows
if(WIN32)
set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
else()
set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "Disable hwloc for UMF")
endif()

fetch_adapter_source(level_zero
Expand Down
Loading