Skip to content

Commit aed8c12

Browse files
ldorauldorau
committed
Incorporate jemalloc_pool into libumf
Remove the separate static `jemalloc_pool` library. Remove the `UMF_BUILD_LIBUMF_POOL_JEMALLOC` option. Incorporate jemalloc_pool into libumf. Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
1 parent c7694fd commit aed8c12

27 files changed

+62
-88
lines changed

‎.github/workflows/coverity.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
-DUMF_DEVELOPER_MODE=OFF
5151
-DUMF_TESTS_FAIL_ON_SKIP=ON
5252
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
53-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
5453
5554
- name: Build
5655
run: |

‎.github/workflows/nightly.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
-DUMF_FORMAT_CODE_STYLE=OFF
7878
-DUMF_DEVELOPER_MODE=ON
7979
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
80-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8180
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
8281
-DUMF_BUILD_CUDA_PROVIDER=OFF
8382
-DUMF_USE_VALGRIND=1
@@ -157,7 +156,6 @@ jobs:
157156
# -DUMF_FORMAT_CODE_STYLE=OFF ^
158157
# -DUMF_DEVELOPER_MODE=ON ^
159158
# -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON ^
160-
# -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON ^
161159
# -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON ^
162160
# -DUMF_BUILD_CUDA_PROVIDER=ON ^
163161
# -DUMF_TESTS_FAIL_ON_SKIP=ON

‎.github/workflows/performance.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
7979
-DUMF_BUILD_CUDA_PROVIDER=ON
8080
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
81-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8281
8382
- name: Build
8483
run: cmake --build ${{env.BUILD_DIR}} -j $(nproc)

‎.github/workflows/reusable_basic.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ jobs:
164164
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
165165
-DUMF_FORMAT_CODE_STYLE=OFF
166166
-DUMF_DEVELOPER_MODE=ON
167-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
168167
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
169168
-DUMF_TESTS_FAIL_ON_SKIP=ON
170169
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
@@ -280,7 +279,6 @@ jobs:
280279
-DUMF_FORMAT_CODE_STYLE=OFF
281280
-DUMF_DEVELOPER_MODE=ON
282281
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
283-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
284282
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
285283
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
286284
-DUMF_TESTS_FAIL_ON_SKIP=ON
@@ -339,7 +337,6 @@ jobs:
339337
-DUMF_FORMAT_CODE_STYLE=OFF
340338
-DUMF_DEVELOPER_MODE=ON
341339
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
342-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
343340
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
344341
-DUMF_BUILD_CUDA_PROVIDER=ON
345342
-DUMF_TESTS_FAIL_ON_SKIP=ON
@@ -382,7 +379,6 @@ jobs:
382379
-DUMF_FORMAT_CODE_STYLE=OFF
383380
-DUMF_DEVELOPER_MODE=ON
384381
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
385-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
386382
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
387383
-DUMF_BUILD_CUDA_PROVIDER=ON
388384
-DUMF_TESTS_FAIL_ON_SKIP=ON
@@ -481,7 +477,6 @@ jobs:
481477
-DUMF_DEVELOPER_MODE=ON
482478
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
483479
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
484-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
485480
-DUMF_BUILD_SHARED_LIBRARY=ON
486481
-DUMF_TESTS_FAIL_ON_SKIP=ON
487482

‎.github/workflows/reusable_benchmarks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
6666
-DUMF_BUILD_CUDA_PROVIDER=ON
6767
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
68-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
6968
7069
- name: Build UMF on Linux
7170
if: matrix.os == 'ubuntu-latest'

‎.github/workflows/reusable_checks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
-DUMF_BUILD_TESTS=OFF
4040
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
4141
-DUMF_BUILD_CUDA_PROVIDER=OFF
42-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
4342
4443
- name: Check C/C++ formatting
4544
run: cmake --build build --target clang-format-check

‎.github/workflows/reusable_codeql.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ jobs:
8282
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
8383
-DUMF_FORMAT_CODE_STYLE=OFF
8484
-DUMF_DEVELOPER_MODE=ON
85-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8685
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
8786
-DUMF_BUILD_CUDA_PROVIDER=ON
8887
-DUMF_TESTS_FAIL_ON_SKIP=ON

‎.github/workflows/reusable_dax.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ jobs:
8484
-DUMF_FORMAT_CODE_STYLE=OFF
8585
-DUMF_DEVELOPER_MODE=ON
8686
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
87-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8887
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
8988
-DUMF_TESTS_FAIL_ON_SKIP=ON
9089
${{ matrix.build_type == 'Debug' && '-DUMF_USE_COVERAGE=ON' || '' }}

‎.github/workflows/reusable_fast.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
-DUMF_FORMAT_CODE_STYLE=OFF
103103
-DUMF_DEVELOPER_MODE=ON
104104
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
105-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
106105
-DUMF_BUILD_TESTS=${{matrix.build_tests}}
107106
-DUMF_BUILD_EXAMPLES=ON
108107
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON

‎.github/workflows/reusable_gpu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ jobs:
9393
-DUMF_BUILD_GPU_EXAMPLES=ON
9494
-DUMF_DEVELOPER_MODE=ON
9595
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
96-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
9796
-DUMF_BUILD_CUDA_PROVIDER=OFF
9897
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
9998
-DUMF_BUILD_${{inputs.name}}_PROVIDER=ON

‎.github/workflows/reusable_multi_numa.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
-DUMF_BUILD_TESTS=ON
4646
-DUMF_DEVELOPER_MODE=ON
4747
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
48-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=${{ matrix.os == 'rhel-9.1' && 'OFF' || 'ON' }}
4948
-DUMF_TESTS_FAIL_ON_SKIP=ON
5049
${{ matrix.build_type == 'Debug' && matrix.os == 'ubuntu-22.04' && '-DUMF_USE_COVERAGE=ON' || '' }}
5150

‎.github/workflows/reusable_proxy_lib.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
-DUMF_BUILD_TESTS=ON
5151
-DUMF_FORMAT_CODE_STYLE=OFF
5252
-DUMF_DEVELOPER_MODE=OFF
53-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
5453
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
5554
-DUMF_TESTS_FAIL_ON_SKIP=ON
5655
-DUMF_PROXY_LIB_BASED_ON_POOL=${{matrix.proxy_lib_pool}}

‎.github/workflows/reusable_sanitizers.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
-DUMF_BUILD_CUDA_PROVIDER=ON
5959
-DUMF_FORMAT_CODE_STYLE=OFF
6060
-DUMF_DEVELOPER_MODE=ON
61-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
6261
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
6362
-DUMF_USE_ASAN=${{matrix.sanitizers.asan}}
6463
-DUMF_USE_UBSAN=${{matrix.sanitizers.ubsan}}

‎.github/workflows/reusable_valgrind.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
-DUMF_FORMAT_CODE_STYLE=OFF
3131
-DUMF_DEVELOPER_MODE=ON
3232
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
33-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
3433
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
3534
-DUMF_BUILD_CUDA_PROVIDER=OFF
3635
-DUMF_USE_VALGRIND=1

‎CMakeLists.txt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ option(UMF_BUILD_LEVEL_ZERO_PROVIDER "Build Level Zero memory provider" ON)
3939
option(UMF_BUILD_CUDA_PROVIDER "Build CUDA memory provider" ON)
4040
option(UMF_BUILD_LIBUMF_POOL_DISJOINT
4141
"Build the libumf_pool_disjoint static library" OFF)
42-
option(UMF_BUILD_LIBUMF_POOL_JEMALLOC
43-
"Build the libumf_pool_jemalloc static library" OFF)
4442
option(UMF_BUILD_TESTS "Build UMF tests" ON)
4543
option(UMF_BUILD_GPU_TESTS "Build UMF GPU tests" OFF)
4644
option(UMF_BUILD_BENCHMARKS "Build UMF benchmarks" OFF)
@@ -111,9 +109,7 @@ else()
111109
message(FATAL_ERROR "Unknown OS type")
112110
endif()
113111

114-
if(NOT UMF_BUILD_LIBUMF_POOL_JEMALLOC)
115-
set(UMF_POOL_JEMALLOC_ENABLED FALSE)
116-
elseif(WINDOWS)
112+
if(WINDOWS)
117113
pkg_check_modules(JEMALLOC jemalloc)
118114
if(NOT JEMALLOC_FOUND)
119115
find_package(JEMALLOC REQUIRED jemalloc)
@@ -190,6 +186,12 @@ if(JEMALLOC_FOUND OR JEMALLOC_LIBRARIES)
190186
message(STATUS " JEMALLOC_LIBRARIES = ${JEMALLOC_LIBRARIES}")
191187
message(STATUS " JEMALLOC_INCLUDE_DIRS = ${JEMALLOC_INCLUDE_DIRS}")
192188
message(STATUS " JEMALLOC_LIBRARY_DIRS = ${JEMALLOC_LIBRARY_DIRS}")
189+
else()
190+
set(UMF_POOL_JEMALLOC_ENABLED FALSE)
191+
message(
192+
STATUS
193+
"Disabling the Jemalloc Pool and tests and benchmarks that use it because jemalloc was not built/found."
194+
)
193195
endif()
194196

195197
if(UMF_DISABLE_HWLOC)
@@ -523,14 +525,14 @@ elseif(UMF_PROXY_LIB_BASED_ON_POOL STREQUAL SCALABLE)
523525
)
524526
endif()
525527
elseif(UMF_PROXY_LIB_BASED_ON_POOL STREQUAL JEMALLOC)
526-
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
528+
if(UMF_POOL_JEMALLOC_ENABLED)
527529
set(UMF_PROXY_LIB_ENABLED ON)
528530
set(PROXY_LIB_USES_JEMALLOC_POOL ON)
529-
set(PROXY_LIBS jemalloc_pool umf)
531+
set(PROXY_LIBS umf)
530532
else()
531533
message(
532534
STATUS
533-
"Disabling the proxy library, because UMF_PROXY_LIB_BASED_ON_POOL==JEMALLOC but UMF_BUILD_LIBUMF_POOL_JEMALLOC is OFF"
535+
"Disabling the proxy library, because UMF_PROXY_LIB_BASED_ON_POOL==JEMALLOC but JEMALLOC was not found"
534536
)
535537
endif()
536538
else()

‎README.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ List of options provided by CMake:
101101
| UMF_BUILD_LEVEL_ZERO_PROVIDER | Build Level Zero memory provider | ON/OFF | ON |
102102
| UMF_BUILD_CUDA_PROVIDER | Build CUDA memory provider | ON/OFF | ON |
103103
| UMF_BUILD_LIBUMF_POOL_DISJOINT | Build the libumf_pool_disjoint static library | ON/OFF | OFF |
104-
| UMF_BUILD_LIBUMF_POOL_JEMALLOC | Build the libumf_pool_jemalloc static library | ON/OFF | OFF |
105104
| UMF_BUILD_TESTS | Build UMF tests | ON/OFF | ON |
106105
| UMF_BUILD_GPU_TESTS | Build UMF GPU tests | ON/OFF | OFF |
107106
| UMF_BUILD_BENCHMARKS | Build UMF benchmarks | ON/OFF | OFF |
@@ -279,7 +278,6 @@ To enable this feature, the `UMF_BUILD_LIBUMF_POOL_DISJOINT` option needs to be
279278
Jemalloc pool is a [jemalloc](https://github.com/jemalloc/jemalloc)-based memory
280279
pool manager built as a separate static library: libjemalloc_pool.a on Linux and
281280
jemalloc_pool.lib on Windows.
282-
The `UMF_BUILD_LIBUMF_POOL_JEMALLOC` option has to be turned `ON` to build this library.
283281

284282
[jemalloc](https://github.com/jemalloc/jemalloc) is required to build the jemalloc pool.
285283

@@ -297,9 +295,8 @@ The default jemalloc package is required on Windows.
297295

298296
##### Requirements
299297

300-
1) The `UMF_BUILD_LIBUMF_POOL_JEMALLOC` option turned `ON`
301-
2) Required packages:
302-
- jemalloc (Windows only)
298+
- on Linux and MacOS: the custom jemalloc fetched and built from sources,
299+
- on Windows: the default jemalloc package
303300

304301
#### Scalable Pool (part of libumf)
305302

‎benchmark/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function(add_umf_benchmark)
3434

3535
set(BENCH_NAME umf-bench-${ARG_NAME})
3636

37-
set(BENCH_LIBS ${ARG_LIBS} umf)
37+
set(BENCH_LIBS ${ARG_LIBS} umf umf_utils)
3838

3939
add_umf_executable(
4040
NAME ${BENCH_NAME}
@@ -70,9 +70,9 @@ function(add_umf_benchmark)
7070
target_compile_definitions(${BENCH_NAME}
7171
PRIVATE UMF_BUILD_LIBUMF_POOL_DISJOINT=1)
7272
endif()
73-
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
73+
if(UMF_POOL_JEMALLOC_ENABLED)
7474
target_compile_definitions(${BENCH_NAME}
75-
PRIVATE UMF_BUILD_LIBUMF_POOL_JEMALLOC=1)
75+
PRIVATE UMF_POOL_JEMALLOC_ENABLED=1)
7676
endif()
7777
if(UMF_POOL_SCALABLE_ENABLED)
7878
target_compile_definitions(${BENCH_NAME}
@@ -100,8 +100,7 @@ set(LIB_DIRS ${LIBHWLOC_LIBRARY_DIRS})
100100
if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
101101
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} disjoint_pool)
102102
endif()
103-
if(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
104-
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} jemalloc_pool ${JEMALLOC_LIBRARIES})
103+
if(UMF_POOL_JEMALLOC_ENABLED)
105104
set(LIB_DIRS ${LIB_DIRS} ${JEMALLOC_LIBRARY_DIRS})
106105
endif()
107106
if(LINUX)

‎benchmark/multithread.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ int main() {
113113
std::cout << "skipping scalable_pool mt_alloc_free" << std::endl;
114114
#endif
115115

116-
#if defined(UMF_BUILD_LIBUMF_POOL_JEMALLOC)
116+
#if defined(UMF_POOL_JEMALLOC_ENABLED)
117117
std::cout << "jemalloc_pool mt_alloc_free: ";
118118
mt_alloc_free(poolCreateExtParams{umfJemallocPoolOps(), nullptr,
119119
umfOsMemoryProviderOps(), osParams});
@@ -139,11 +139,13 @@ int main() {
139139
// ctest looks for "PASSED" in the output
140140
std::cout << "PASSED" << std::endl;
141141

142+
#if defined(UMF_BUILD_LIBUMF_POOL_DISJOINT)
142143
ret = umfDisjointPoolParamsDestroy(hDisjointParams);
143144
if (ret != UMF_RESULT_SUCCESS) {
144145
std::cerr << "disjoint pool params destroy failed" << std::endl;
145146
return -1;
146147
}
148+
#endif
147149

148150
return 0;
149151
}

‎benchmark/ubench.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <umf/pools/pool_disjoint.h>
2525
#endif
2626

27-
#ifdef UMF_BUILD_LIBUMF_POOL_JEMALLOC
27+
#ifdef UMF_POOL_JEMALLOC_ENABLED
2828
#include <umf/pools/pool_jemalloc.h>
2929
#endif
3030

@@ -329,7 +329,7 @@ UBENCH_EX(simple, disjoint_pool_with_os_memory_provider) {
329329
}
330330
#endif /* (defined UMF_BUILD_LIBUMF_POOL_DISJOINT) */
331331

332-
#if (defined UMF_BUILD_LIBUMF_POOL_JEMALLOC)
332+
#if (defined UMF_POOL_JEMALLOC_ENABLED)
333333
////////////////// JEMALLOC POOL WITH OS MEMORY PROVIDER
334334

335335
UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
@@ -373,7 +373,7 @@ UBENCH_EX(simple, jemalloc_pool_with_os_memory_provider) {
373373
umfMemoryProviderDestroy(os_memory_provider);
374374
free(array);
375375
}
376-
#endif /* (defined UMF_BUILD_LIBUMF_POOL_JEMALLOC) */
376+
#endif /* (defined UMF_POOL_JEMALLOC_ENABLED) */
377377

378378
#if (defined UMF_POOL_SCALABLE_ENABLED)
379379
////////////////// SCALABLE (TBB) POOL WITH OS MEMORY PROVIDER

‎examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ if(LINUX)
282282
add_umf_executable(
283283
NAME ${EXAMPLE_NAME}
284284
SRCS dram_and_fsdax/dram_and_fsdax.c
285-
LIBS umf jemalloc_pool)
285+
LIBS umf)
286286

287287
target_link_options(${EXAMPLE_NAME} PRIVATE "-Wl,--no-as-needed,-ldl")
288288

‎examples/dram_and_fsdax/CMakeLists.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,15 @@ if(NOT LIBHWLOC_FOUND)
2121
find_package(LIBHWLOC 2.3.0 REQUIRED hwloc)
2222
endif()
2323

24-
# find the custom jemalloc pointed by CMAKE_PREFIX_PATH
25-
find_package(JEMALLOC REQUIRED jemalloc)
26-
2724
# build the example
2825
set(EXAMPLE_NAME umf_example_dram_and_fsdax)
2926
add_executable(${EXAMPLE_NAME} dram_and_fsdax.c)
3027
target_include_directories(${EXAMPLE_NAME} PRIVATE ${LIBUMF_INCLUDE_DIRS})
3128

32-
target_link_directories(
33-
${EXAMPLE_NAME}
34-
PRIVATE
35-
${LIBUMF_LIBRARY_DIRS}
36-
${LIBHWLOC_LIBRARY_DIRS}
37-
${JEMALLOC_LIBRARY_DIRS})
29+
target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBUMF_LIBRARY_DIRS}
30+
${LIBHWLOC_LIBRARY_DIRS})
3831

39-
target_link_libraries(
40-
${EXAMPLE_NAME} PRIVATE hwloc jemalloc_pool ${JEMALLOC_LIBRARIES}
41-
${LIBUMF_LIBRARIES})
32+
target_link_libraries(${EXAMPLE_NAME} PRIVATE hwloc ${LIBUMF_LIBRARIES})
4233

4334
# an optional part - adds a test of this example
4435
add_test(
@@ -54,6 +45,6 @@ if(LINUX)
5445
TEST ${EXAMPLE_NAME}
5546
PROPERTY
5647
ENVIRONMENT_MODIFICATION
57-
"LD_LIBRARY_PATH=path_list_append:${LIBUMF_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${JEMALLOC_LIBRARY_DIRS}"
48+
"LD_LIBRARY_PATH=path_list_append:${LIBUMF_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS}"
5849
)
5950
endif()

‎scripts/qemu/run-build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ cmake .. \
2626
-DUMF_FORMAT_CODE_STYLE=OFF \
2727
-DUMF_DEVELOPER_MODE=ON \
2828
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON \
29-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON \
3029
-DUMF_BUILD_EXAMPLES=ON \
3130
-DUMF_USE_COVERAGE=${COVERAGE} \
3231
-DUMF_TESTS_FAIL_ON_SKIP=ON

0 commit comments

Comments
 (0)