Skip to content

Commit 6957b4a

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 14aabdd commit 6957b4a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

sycl/plugins/unified_runtime/CMakeLists.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ option(SYCL_PI_UR_USE_FETCH_CONTENT
1515
set(SYCL_PI_UR_SOURCE_DIR
1616
"" CACHE PATH "Path to root of Unified Runtime repository")
1717

18+
option(SYCL_UMF_DISABLE_HWLOC
19+
"Disable hwloc support in UMF" ON)
20+
1821
# Override default to enable building tests from unified-runtime
1922
set(UR_BUILD_TESTS OFF CACHE BOOL "Build unit tests.")
2023

@@ -98,23 +101,26 @@ if(SYCL_PI_UR_USE_FETCH_CONTENT)
98101
CACHE PATH "Path to external '${name}' adapter source dir" FORCE)
99102
endfunction()
100103

101-
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
104+
set(UNIFIED_RUNTIME_REPO "https://github.com/igchor/unified-runtime.git")
102105
# commit 2baf095188b235bb2b0a0140f0187d2041aef4b0
103106
# Merge: 3d8fe8d2 58f85278
104107
# Author: Piotr Balcer <[email protected]>
105108
# Date: Fri Jul 26 12:06:22 2024 +0200
106109
# Merge pull request #1900 from kswiecicki/umf-version-bump
107110
# Bump UMF version
108-
set(UNIFIED_RUNTIME_TAG 58f85278a4ebf37742dd10afb3350580b0b1d9d7)
111+
set(UNIFIED_RUNTIME_TAG 53651fc72e99b42304160bfb1ae378682cda570c)
109112

110113
set(UMF_BUILD_EXAMPLES OFF CACHE INTERNAL "EXAMPLES")
111114
# Due to the use of dependentloadflag and no installer for UMF and hwloc we need
112115
# to link statically on windows
113116
if(WIN32)
114117
set(UMF_BUILD_SHARED_LIBRARY OFF CACHE INTERNAL "Build UMF shared library")
115118
set(UMF_LINK_HWLOC_STATICALLY ON CACHE INTERNAL "static HWLOC")
119+
else()
120+
set(UMF_DISABLE_HWLOC ${SYCL_UMF_DISABLE_HWLOC} CACHE INTERNAL "disable hwloc for UMF")
116121
endif()
117122

123+
118124
fetch_adapter_source(level_zero
119125
${UNIFIED_RUNTIME_REPO}
120126
${UNIFIED_RUNTIME_TAG}

0 commit comments

Comments
 (0)