-
Notifications
You must be signed in to change notification settings - Fork 731
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[UR] disable hwloc support for UMF (#14812)
Hwloc package is not avalable on certain distros (e.g. RHEL). To avoid forcing users to install hwloc from sources, disable hwloc in UMF. Based on: oneapi-src/unified-memory-framework#642 --------- Co-authored-by: Piotr Balcer <[email protected]> Co-authored-by: Dmitry Vodopyanov <[email protected]>
- Loading branch information
1 parent
1de77c3
commit 2e2fb43
Showing
1 changed file
with
11 additions
and
6 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
|
@@ -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 | ||
|