Skip to content

Commit 159cc42

Browse files
committed
[UR] disable hwloc support for UMF
Hwloc package is not avalable on certain distros (e.g. RHEL). To avoid forcing users to install hwloc from sources, disable hwloc in UMF.
1 parent ebb3b4a commit 159cc42

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

sycl/cmake/modules/FetchUnifiedRuntime.cmake

Lines changed: 13 additions & 7 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)
@@ -112,23 +115,26 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
112115
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
113116
endfunction()
114117

115-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
116-
# commit b7b0c8b3d17aa7d511c67ec219d58091d07cfa60
117-
# Merge: 2baf0951 5b8936da
118+
set(UNIFIED_RUNTIME_REPO "https://github.com/igchor/unified-runtime.git")
119+
# commit 2baf095188b235bb2b0a0140f0187d2041aef4b0
120+
# Merge: 3d8fe8d2 58f85278
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: Fri Jul 26 12:06:22 2024 +0200
123+
# Merge pull request #1900 from kswiecicki/umf-version-bump
124+
# Bump UMF version
125+
set(UNIFIED_RUNTIME_TAG 723c04544697b55f86ba25474faab516a7727d59)
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

137+
132138
fetch_adapter_source(level_zero
133139
${UNIFIED_RUNTIME_REPO}
134140
${UNIFIED_RUNTIME_TAG}

0 commit comments

Comments
 (0)