Skip to content

Commit 2e2fb43

Browse files
igchorpbalcerdm-vodopyanov
authored
[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]>
1 parent 1de77c3 commit 2e2fb43

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ option(SYCL_PI_UR_USE_FETCH_CONTENT
2323
set(SYCL_PI_UR_SOURCE_DIR
2424
"" CACHE PATH "Path to root of Unified Runtime repository")
2525

26+
option(SYCL_UMF_DISABLE_HWLOC
27+
"Disable hwloc support in UMF" ON)
28+
2629
# Here we override the defaults to disable building tests from unified-runtime
2730
set(UR_BUILD_EXAMPLES OFF CACHE BOOL "Build example applications." FORCE)
2831
set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests." FORCE)
@@ -113,20 +116,22 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
113116
endfunction()
114117

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

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

132137
fetch_adapter_source(level_zero

0 commit comments

Comments
 (0)