Skip to content

Commit 7759255

Browse files
PatKaminPatKamin
committed
Remove UMF_DISABLE_HWLOC option
1 parent 70c33d0 commit 7759255

16 files changed

+137
-343
lines changed

‎.github/workflows/reusable_basic.yml

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
level_zero_provider: ['ON']
3131
cuda_provider: ['ON']
3232
install_tbb: ['ON']
33-
disable_hwloc: ['OFF']
3433
link_hwloc_statically: ['OFF']
3534
cmake_ver: ['default']
3635
include:
@@ -41,7 +40,6 @@ jobs:
4140
level_zero_provider: 'ON'
4241
cuda_provider: 'ON'
4342
install_tbb: 'ON'
44-
disable_hwloc: 'OFF'
4543
link_hwloc_statically: 'OFF'
4644
# check minimum supported cmake version
4745
cmake_ver: '3.14.0'
@@ -52,7 +50,6 @@ jobs:
5250
level_zero_provider: 'ON'
5351
cuda_provider: 'ON'
5452
install_tbb: 'ON'
55-
disable_hwloc: 'OFF'
5653
link_hwloc_statically: 'OFF'
5754
cmake_ver: '3.28.0'
5855
- os: ubuntu-24.04
@@ -62,7 +59,6 @@ jobs:
6259
level_zero_provider: 'ON'
6360
cuda_provider: 'ON'
6461
install_tbb: 'ON'
65-
disable_hwloc: 'OFF'
6662
link_hwloc_statically: 'OFF'
6763
cmake_ver: 'default'
6864
# test level_zero_provider='OFF' and cuda_provider='OFF'
@@ -73,7 +69,6 @@ jobs:
7369
level_zero_provider: 'OFF'
7470
cuda_provider: 'OFF'
7571
install_tbb: 'ON'
76-
disable_hwloc: 'OFF'
7772
link_hwloc_statically: 'OFF'
7873
cmake_ver: 'default'
7974
# test icx compiler
@@ -84,7 +79,6 @@ jobs:
8479
level_zero_provider: 'ON'
8580
cuda_provider: 'ON'
8681
install_tbb: 'ON'
87-
disable_hwloc: 'OFF'
8882
link_hwloc_statically: 'OFF'
8983
cmake_ver: 'default'
9084
# test lld linker
@@ -95,7 +89,6 @@ jobs:
9589
level_zero_provider: 'ON'
9690
cuda_provider: 'ON'
9791
install_tbb: 'ON'
98-
disable_hwloc: 'OFF'
9992
link_hwloc_statically: 'OFF'
10093
llvm_linker: '-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_MODULE_LINKER_FLAGS="-fuse-ld=lld" -DCMAKE_SHARED_LINKER_FLAGS="-fuse-ld=lld"'
10194
cmake_ver: 'default'
@@ -107,17 +100,6 @@ jobs:
107100
level_zero_provider: 'ON'
108101
cuda_provider: 'ON'
109102
install_tbb: 'OFF'
110-
disable_hwloc: 'OFF'
111-
link_hwloc_statically: 'OFF'
112-
cmake_ver: 'default'
113-
- os: ubuntu-22.04
114-
build_type: Debug
115-
compiler: {c: gcc, cxx: g++}
116-
shared_library: 'ON'
117-
level_zero_provider: 'ON'
118-
cuda_provider: 'ON'
119-
install_tbb: 'ON'
120-
disable_hwloc: 'ON'
121103
link_hwloc_statically: 'OFF'
122104
cmake_ver: 'default'
123105
- os: ubuntu-22.04
@@ -127,10 +109,9 @@ jobs:
127109
level_zero_provider: 'ON'
128110
cuda_provider: 'ON'
129111
install_tbb: 'ON'
130-
disable_hwloc: 'OFF'
131112
link_hwloc_statically: 'ON'
132113
cmake_ver: 'default'
133-
name: Basic (${{matrix.os}}, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, shared_library=${{matrix.shared_library}}, level_zero_provider=${{matrix.level_zero_provider}}, cuda_provider=${{matrix.cuda_provider}}, install_tbb=${{matrix.install_tbb}}, disable_hwloc=${{matrix.disable_hwloc}}, link_hwloc_statically=${{matrix.link_hwloc_statically}}, cmake_ver=${{matrix.cmake_ver}})
114+
name: Basic (${{matrix.os}}, build_type=${{matrix.build_type}}, compilers=${{matrix.compiler.c}}/${{matrix.compiler.cxx}}, shared_library=${{matrix.shared_library}}, level_zero_provider=${{matrix.level_zero_provider}}, cuda_provider=${{matrix.cuda_provider}}, install_tbb=${{matrix.install_tbb}}, link_hwloc_statically=${{matrix.link_hwloc_statically}}, cmake_ver=${{matrix.cmake_ver}})
134115

135116
steps:
136117
- name: Checkout
@@ -146,12 +127,6 @@ jobs:
146127
chmod +x cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh
147128
echo ${USERPASS} | sudo -Sk ./cmake-${{matrix.cmake_ver}}-Linux-x86_64.sh --skip-license --prefix=/usr/local
148129
149-
- name: Uninstall hwloc
150-
if: matrix.disable_hwloc == 'ON'
151-
run: |
152-
echo ${USERPASS} | sudo -Sk apt-get remove --purge -y '*hwloc*'
153-
echo ${USERPASS} | sudo -Sk apt-get autoremove -y
154-
155130
- name: Uninstall TBB apt package
156131
if: matrix.install_tbb == 'OFF'
157132
run: |
@@ -185,7 +160,6 @@ jobs:
185160
-DUMF_DEVELOPER_MODE=ON
186161
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
187162
-DUMF_TESTS_FAIL_ON_SKIP=ON
188-
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
189163
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
190164
${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' && '-DUMF_USE_COVERAGE=ON' || '' }}
191165
${{ matrix.llvm_linker || '' }}
@@ -205,7 +179,7 @@ jobs:
205179
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
206180
working-directory: ${{env.BUILD_DIR}}
207181
run: |
208-
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
182+
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}
209183
echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
210184
../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
211185
mkdir -p ${{env.COVERAGE_DIR}}
@@ -214,7 +188,7 @@ jobs:
214188
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
215189
if: ${{ matrix.build_type == 'Debug' && matrix.compiler.c == 'gcc' }}
216190
with:
217-
name: ${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}-no_hwloc-${{matrix.disable_hwloc}}
191+
name: ${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}
218192
path: ${{env.COVERAGE_DIR}}
219193

220194
- name: Remove the installation directory
@@ -226,7 +200,7 @@ jobs:
226200
--build-dir ${{env.BUILD_DIR}}
227201
--install-dir ${{env.INSTL_DIR}}
228202
--build-type ${{matrix.build_type}}
229-
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
203+
${{ matrix.install_tbb == 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
230204
--umf-version ${{env.UMF_VERSION}}
231205
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
232206

‎.github/workflows/reusable_docs_build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ jobs:
4141
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF \
4242
-DUMF_BUILD_CUDA_PROVIDER=OFF \
4343
-DUMF_BUILD_TESTS=OFF \
44-
-DUMF_BUILD_EXAMPLES=OFF \
45-
-DUMF_DISABLE_HWLOC=ON
44+
-DUMF_BUILD_EXAMPLES=OFF
4645
cmake --build build --target docs
4746
4847
#

‎CMakeLists.txt

Lines changed: 86 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ umf_option(UMF_BUILD_EXAMPLES "Build UMF examples" ON)
7575
umf_option(UMF_BUILD_GPU_EXAMPLES "Build UMF GPU examples" OFF)
7676
umf_option(UMF_BUILD_FUZZTESTS
7777
"Build UMF fuzz tests (supported only on Linux with Clang)" OFF)
78-
umf_option(
79-
UMF_DISABLE_HWLOC
80-
"Disable hwloc and UMF features requiring it (OS provider, memtargets, topology discovery)"
81-
OFF)
8278
umf_option(
8379
UMF_LINK_HWLOC_STATICALLY
8480
"Link UMF with HWLOC library statically (proxy library will be disabled on Windows+Debug build)"
@@ -119,13 +115,6 @@ set_property(CACHE UMF_PROXY_LIB_BASED_ON_POOL
119115
PROPERTY STRINGS ${KNOWN_PROXY_LIB_POOLS})
120116
list(APPEND UMF_OPTIONS_LIST UMF_PROXY_LIB_BASED_ON_POOL)
121117

122-
if(UMF_DISABLE_HWLOC)
123-
message(
124-
WARNING
125-
"UMF_DISABLE_HWLOC option is now deprecated and will be removed in v0.12.0 UMF release!"
126-
)
127-
endif()
128-
129118
# --------------------------------------------------------------------------- #
130119
# Setup required variables, definitions; fetch dependencies; include
131120
# sub_directories based on build options; set flags; etc.
@@ -260,7 +249,7 @@ else()
260249
)
261250
endif()
262251

263-
if(NOT UMF_DISABLE_HWLOC AND (NOT UMF_LINK_HWLOC_STATICALLY))
252+
if(NOT UMF_LINK_HWLOC_STATICALLY)
264253
pkg_check_modules(LIBHWLOC hwloc>=2.3.0)
265254
if(NOT LIBHWLOC_FOUND)
266255
find_package(LIBHWLOC 2.3.0 COMPONENTS hwloc)
@@ -275,110 +264,95 @@ if(NOT UMF_DISABLE_HWLOC AND (NOT UMF_LINK_HWLOC_STATICALLY))
275264
endif()
276265
endif()
277266

278-
if(UMF_LINK_HWLOC_STATICALLY AND LINUX)
279-
find_program(AUTORECONF_EXECUTABLE autoreconf)
280-
if(NOT AUTORECONF_EXECUTABLE)
281-
message(WARNING "autoreconf is not installed. Disabling hwloc.")
282-
set(UMF_DISABLE_HWLOC ON)
283-
set(UMF_LINK_HWLOC_STATICALLY OFF)
267+
if(UMF_LINK_HWLOC_STATICALLY)
268+
if(NOT DEFINED UMF_HWLOC_REPO)
269+
set(UMF_HWLOC_REPO "https://github.com/open-mpi/hwloc.git")
270+
endif()
271+
if(NOT DEFINED UMF_HWLOC_TAG)
272+
set(UMF_HWLOC_TAG hwloc-2.10.0)
284273
endif()
285-
endif()
286274

287-
if(UMF_DISABLE_HWLOC)
288-
message(STATUS "hwloc is disabled, hence OS provider, memtargets, "
289-
"topology discovery, examples won't be available!")
290-
else()
291-
if(UMF_LINK_HWLOC_STATICALLY)
292-
if(NOT DEFINED UMF_HWLOC_REPO)
293-
set(UMF_HWLOC_REPO "https://github.com/open-mpi/hwloc.git")
294-
endif()
275+
message(
276+
STATUS "Will fetch hwloc from ${UMF_HWLOC_REPO} (tag: ${UMF_HWLOC_TAG})"
277+
)
295278

296-
if(NOT DEFINED UMF_HWLOC_TAG)
297-
set(UMF_HWLOC_TAG hwloc-2.10.0)
279+
if(WINDOWS)
280+
set(HWLOC_ENABLE_TESTING OFF)
281+
set(HWLOC_SKIP_LSTOPO ON)
282+
set(HWLOC_SKIP_TOOLS ON)
283+
set(HWLOC_SKIP_INCLUDES ON)
284+
285+
FetchContent_Declare(
286+
hwloc_targ
287+
GIT_REPOSITORY ${UMF_HWLOC_REPO}
288+
GIT_TAG ${UMF_HWLOC_TAG}
289+
SOURCE_SUBDIR contrib/windows-cmake/)
290+
FetchContent_MakeAvailable(hwloc_targ)
291+
292+
set(HWLOC_LIB_PATH "")
293+
if(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
294+
set(HWLOC_LIB_PATH "${hwloc_targ_BINARY_DIR}/hwloc.lib")
295+
else()
296+
set(HWLOC_LIB_PATH "${hwloc_targ_BINARY_DIR}/lib/hwloc.lib")
298297
endif()
299-
message(
300-
STATUS
301-
"Will fetch hwloc from ${UMF_HWLOC_REPO} (tag: ${UMF_HWLOC_TAG})"
302-
)
303298

304-
if(WINDOWS)
305-
set(HWLOC_ENABLE_TESTING OFF)
306-
set(HWLOC_SKIP_LSTOPO ON)
307-
set(HWLOC_SKIP_TOOLS ON)
308-
set(HWLOC_SKIP_INCLUDES ON)
309-
310-
FetchContent_Declare(
311-
hwloc_targ
312-
GIT_REPOSITORY ${UMF_HWLOC_REPO}
313-
GIT_TAG ${UMF_HWLOC_TAG}
314-
SOURCE_SUBDIR contrib/windows-cmake/)
315-
FetchContent_MakeAvailable(hwloc_targ)
316-
317-
set(HWLOC_LIB_PATH "")
318-
if(CMAKE_GENERATOR STREQUAL "NMake Makefiles")
319-
set(HWLOC_LIB_PATH "${hwloc_targ_BINARY_DIR}/hwloc.lib")
320-
else()
321-
set(HWLOC_LIB_PATH "${hwloc_targ_BINARY_DIR}/lib/hwloc.lib")
322-
endif()
323-
324-
get_filename_component(LIBHWLOC_LIBRARY_DIRS ${HWLOC_LIB_PATH}
325-
DIRECTORY)
326-
set(LIBHWLOC_LIBRARIES ${HWLOC_LIB_PATH})
327-
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
328-
set(LIBHWLOC_FOUND TRUE)
329-
else() # not Windows
330-
FetchContent_Declare(
331-
hwloc_targ
332-
GIT_REPOSITORY ${UMF_HWLOC_REPO}
333-
GIT_TAG ${UMF_HWLOC_TAG})
334-
FetchContent_MakeAvailable(hwloc_targ)
335-
336-
add_custom_command(
337-
COMMAND ./autogen.sh
338-
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
339-
OUTPUT ${hwloc_targ_SOURCE_DIR}/configure)
340-
add_custom_command(
341-
COMMAND
342-
./configure --prefix=${hwloc_targ_BINARY_DIR}
343-
--enable-static=yes --enable-shared=no --disable-libxml2
344-
--disable-pci --disable-levelzero --disable-opencl
345-
--disable-cuda --disable-nvml --disable-libudev
346-
--disable-rsmi CFLAGS=-fPIC CXXFLAGS=-fPIC
347-
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
348-
OUTPUT ${hwloc_targ_SOURCE_DIR}/Makefile
349-
DEPENDS ${hwloc_targ_SOURCE_DIR}/configure)
350-
add_custom_command(
351-
COMMAND make
352-
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
353-
OUTPUT ${hwloc_targ_SOURCE_DIR}/lib/libhwloc.la
354-
DEPENDS ${hwloc_targ_SOURCE_DIR}/Makefile)
355-
add_custom_command(
356-
COMMAND make install
357-
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
358-
OUTPUT ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a
359-
DEPENDS ${hwloc_targ_SOURCE_DIR}/lib/libhwloc.la)
360-
361-
add_custom_target(hwloc_prod
362-
DEPENDS ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
363-
add_library(hwloc INTERFACE)
364-
target_link_libraries(
365-
hwloc INTERFACE ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
366-
add_dependencies(hwloc hwloc_prod)
367-
368-
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/lib)
369-
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
370-
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
371-
set(LIBHWLOC_FOUND TRUE)
372-
endif()
373-
endif() # UMF_LINK_HWLOC_STATICALLY
299+
get_filename_component(LIBHWLOC_LIBRARY_DIRS ${HWLOC_LIB_PATH}
300+
DIRECTORY)
301+
set(LIBHWLOC_LIBRARIES ${HWLOC_LIB_PATH})
302+
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
303+
set(LIBHWLOC_FOUND TRUE)
304+
else() # not Windows
305+
FetchContent_Declare(
306+
hwloc_targ
307+
GIT_REPOSITORY ${UMF_HWLOC_REPO}
308+
GIT_TAG ${UMF_HWLOC_TAG})
309+
FetchContent_MakeAvailable(hwloc_targ)
374310

375-
message(STATUS " LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
376-
message(STATUS " LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
377-
message(STATUS " LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
378-
message(STATUS " LIBHWLOC_API_VERSION = ${LIBHWLOC_API_VERSION}")
379-
if(WINDOWS)
380-
message(STATUS " LIBHWLOC_DLL_DIRS = ${LIBHWLOC_DLL_DIRS}")
311+
add_custom_command(
312+
COMMAND ./autogen.sh
313+
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
314+
OUTPUT ${hwloc_targ_SOURCE_DIR}/configure)
315+
add_custom_command(
316+
COMMAND
317+
./configure --prefix=${hwloc_targ_BINARY_DIR}
318+
--enable-static=yes --enable-shared=no --disable-libxml2
319+
--disable-pci --disable-levelzero --disable-opencl
320+
--disable-cuda --disable-nvml --disable-libudev --disable-rsmi
321+
CFLAGS=-fPIC CXXFLAGS=-fPIC
322+
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
323+
OUTPUT ${hwloc_targ_SOURCE_DIR}/Makefile
324+
DEPENDS ${hwloc_targ_SOURCE_DIR}/configure)
325+
add_custom_command(
326+
COMMAND make
327+
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
328+
OUTPUT ${hwloc_targ_SOURCE_DIR}/lib/libhwloc.la
329+
DEPENDS ${hwloc_targ_SOURCE_DIR}/Makefile)
330+
add_custom_command(
331+
COMMAND make install
332+
WORKING_DIRECTORY ${hwloc_targ_SOURCE_DIR}
333+
OUTPUT ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a
334+
DEPENDS ${hwloc_targ_SOURCE_DIR}/lib/libhwloc.la)
335+
336+
add_custom_target(hwloc_prod
337+
DEPENDS ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
338+
add_library(hwloc INTERFACE)
339+
target_link_libraries(hwloc
340+
INTERFACE ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
341+
add_dependencies(hwloc hwloc_prod)
342+
343+
set(LIBHWLOC_LIBRARY_DIRS ${hwloc_targ_BINARY_DIR}/lib)
344+
set(LIBHWLOC_INCLUDE_DIRS ${hwloc_targ_BINARY_DIR}/include)
345+
set(LIBHWLOC_LIBRARIES ${hwloc_targ_BINARY_DIR}/lib/libhwloc.a)
346+
set(LIBHWLOC_FOUND TRUE)
381347
endif()
348+
endif() # UMF_LINK_HWLOC_STATICALLY
349+
350+
message(STATUS " LIBHWLOC_LIBRARIES = ${LIBHWLOC_LIBRARIES}")
351+
message(STATUS " LIBHWLOC_INCLUDE_DIRS = ${LIBHWLOC_INCLUDE_DIRS}")
352+
message(STATUS " LIBHWLOC_LIBRARY_DIRS = ${LIBHWLOC_LIBRARY_DIRS}")
353+
message(STATUS " LIBHWLOC_API_VERSION = ${LIBHWLOC_API_VERSION}")
354+
if(WINDOWS)
355+
message(STATUS " LIBHWLOC_DLL_DIRS = ${LIBHWLOC_DLL_DIRS}")
382356
endif()
383357

384358
if(hwloc_targ_SOURCE_DIR)
@@ -533,7 +507,7 @@ if(WINDOWS AND UMF_USE_DEBUG_POSTFIX)
533507
-DUMF_BUILD_TESTS=OFF -DUMF_BUILD_GPU_TESTS=OFF
534508
-DUMF_BUILD_BENCHMARKS=OFF -DUMF_BUILD_BENCHMARKS_MT=OFF
535509
-DUMF_BUILD_EXAMPLES=OFF -DUMF_BUILD_GPU_EXAMPLES=OFF
536-
-DUMF_BUILD_FUZZTESTS=OFF -DUMF_DISABLE_HWLOC=${UMF_DISABLE_HWLOC}
510+
-DUMF_BUILD_FUZZTESTS=OFF
537511
-DUMF_LINK_HWLOC_STATICALLY=${UMF_LINK_HWLOC_STATICALLY}
538512
-DUMF_HWLOC_NAME=${UMF_HWLOC_NAME}
539513
-DUMF_INSTALL_RPATH=${UMF_INSTALL_RPATH} -DUMF_DEVELOPER_MODE=OFF
@@ -756,9 +730,7 @@ if(WINDOWS)
756730
endif()
757731

758732
# set UMF_PROXY_LIB_ENABLED
759-
if(UMF_DISABLE_HWLOC)
760-
message(STATUS "Disabling the proxy library, because HWLOC is disabled")
761-
elseif(NOT UMF_BUILD_SHARED_LIBRARY)
733+
if(NOT UMF_BUILD_SHARED_LIBRARY)
762734
# TODO enable this scenario
763735
message(
764736
STATUS
@@ -803,7 +775,7 @@ if(UMF_BUILD_BENCHMARKS)
803775
add_subdirectory(benchmark)
804776
endif()
805777

806-
if(UMF_BUILD_EXAMPLES AND NOT UMF_DISABLE_HWLOC)
778+
if(UMF_BUILD_EXAMPLES)
807779
add_subdirectory(examples)
808780
endif()
809781

0 commit comments

Comments
 (0)