Skip to content

Commit ac367e5

Browse files
lplewalplewa
authored
Merge pull request #898 from bratpiorka/rrudnick_disjoint_c
make disjoint pool a C structure
2 parents ba4d909 + 368ab19 commit ac367e5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+1587
-1596
lines changed

‎.github/workflows/coverity.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ jobs:
4949
-DUMF_FORMAT_CODE_STYLE=OFF
5050
-DUMF_DEVELOPER_MODE=OFF
5151
-DUMF_TESTS_FAIL_ON_SKIP=ON
52-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
5352
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
5453
5554
- name: Build

‎.github/workflows/nightly.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ jobs:
7676
-DCMAKE_BUILD_TYPE=Debug
7777
-DUMF_FORMAT_CODE_STYLE=OFF
7878
-DUMF_DEVELOPER_MODE=ON
79-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
8079
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8180
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
8281
-DUMF_BUILD_CUDA_PROVIDER=OFF
@@ -138,7 +137,6 @@ jobs:
138137
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.static_hwloc}}
139138
-DUMF_FORMAT_CODE_STYLE=OFF
140139
-DUMF_DEVELOPER_MODE=ON
141-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
142140
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
143141
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
144142
-DUMF_BUILD_CUDA_PROVIDER=ON
@@ -219,7 +217,6 @@ jobs:
219217
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^
220218
-DUMF_FORMAT_CODE_STYLE=OFF ^
221219
-DUMF_DEVELOPER_MODE=ON ^
222-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON ^
223220
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON ^
224221
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON ^
225222
-DUMF_BUILD_CUDA_PROVIDER=ON ^

‎.github/workflows/reusable_basic.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ jobs:
165165
-DUMF_FORMAT_CODE_STYLE=OFF
166166
-DUMF_DEVELOPER_MODE=ON
167167
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
168-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
169168
-DUMF_TESTS_FAIL_ON_SKIP=ON
170169
-DUMF_DISABLE_HWLOC=${{matrix.disable_hwloc}}
171170
-DUMF_LINK_HWLOC_STATICALLY=${{matrix.link_hwloc_statically}}
@@ -208,7 +207,6 @@ jobs:
208207
--build-dir ${{env.BUILD_DIR}}
209208
--install-dir ${{env.INSTL_DIR}}
210209
--build-type ${{matrix.build_type}}
211-
--disjoint-pool
212210
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
213211
--umf-version ${{env.UMF_VERSION}}
214212
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
@@ -284,7 +282,6 @@ jobs:
284282
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
285283
-DUMF_FORMAT_CODE_STYLE=OFF
286284
-DUMF_DEVELOPER_MODE=ON
287-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
288285
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
289286
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
290287
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
@@ -304,7 +301,6 @@ jobs:
304301
--build-dir ${{env.BUILD_DIR}}
305302
--install-dir ${{env.INSTL_DIR}}
306303
--build-type ${{matrix.build_type}}
307-
--disjoint-pool
308304
${{matrix.shared_library == 'ON' && '--proxy' || '' }}
309305
--umf-version ${{env.UMF_VERSION}}
310306
${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
@@ -342,7 +338,6 @@ jobs:
342338
-DUMF_BUILD_EXAMPLES=ON
343339
-DUMF_FORMAT_CODE_STYLE=OFF
344340
-DUMF_DEVELOPER_MODE=ON
345-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
346341
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
347342
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
348343
-DUMF_BUILD_CUDA_PROVIDER=ON
@@ -385,7 +380,6 @@ jobs:
385380
-DUMF_BUILD_EXAMPLES=ON
386381
-DUMF_FORMAT_CODE_STYLE=OFF
387382
-DUMF_DEVELOPER_MODE=ON
388-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
389383
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
390384
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
391385
-DUMF_BUILD_CUDA_PROVIDER=ON
@@ -496,7 +490,6 @@ jobs:
496490
-DUMF_FORMAT_CODE_STYLE=OFF
497491
-DUMF_DEVELOPER_MODE=ON
498492
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
499-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
500493
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
501494
-DUMF_BUILD_SHARED_LIBRARY=ON
502495
-DUMF_TESTS_FAIL_ON_SKIP=ON
@@ -511,7 +504,6 @@ jobs:
511504
--build-dir ${{env.BUILD_DIR}}
512505
--install-dir ${{env.INSTL_DIR}}
513506
--build-type ${{env.BUILD_TYPE}}
514-
--disjoint-pool
515507
--proxy
516508
--umf-version ${{env.UMF_VERSION}}
517509
--shared-library

‎.github/workflows/reusable_benchmarks.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ jobs:
9393
-DUMF_FORMAT_CODE_STYLE=OFF
9494
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
9595
-DUMF_BUILD_CUDA_PROVIDER=ON
96-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
9796
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
9897
9998
- name: Build UMF

‎.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_BUILD_GPU_EXAMPLES=OFF
8585
-DUMF_FORMAT_CODE_STYLE=OFF
8686
-DUMF_DEVELOPER_MODE=ON
87-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
8887
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
8988
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
9089
-DUMF_TESTS_FAIL_ON_SKIP=ON

‎.github/workflows/reusable_fast.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,32 @@ jobs:
1919
matrix:
2020
include:
2121
- os: windows-latest
22-
disjoint: 'OFF'
2322
build_tests: 'ON'
2423
simple_cmake: 'OFF'
2524
# pure C build (Windows)
2625
- os: windows-latest
27-
disjoint: 'OFF'
2826
# Tests' building is off for a pure C build
2927
build_tests: 'OFF'
3028
simple_cmake: 'OFF'
3129
- os: ubuntu-latest
32-
disjoint: 'ON'
3330
build_tests: 'ON'
3431
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
3532
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
3633
simple_cmake: 'OFF'
3734
# pure C build (Linux)
3835
- os: ubuntu-latest
39-
disjoint: 'OFF'
4036
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
4137
# Tests' building is off for a pure C build
4238
build_tests: 'OFF'
4339
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON'
4440
simple_cmake: 'OFF'
4541
# simplest CMake on ubuntu-latest
4642
- os: ubuntu-latest
47-
disjoint: 'OFF'
4843
build_tests: 'ON'
4944
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
5045
simple_cmake: 'ON'
5146
# simplest CMake ubuntu-20.04
5247
- os: ubuntu-20.04
53-
disjoint: 'OFF'
5448
build_tests: 'ON'
5549
extra_build_options: '-DCMAKE_BUILD_TYPE=Release'
5650
simple_cmake: 'ON'
@@ -97,7 +91,6 @@ jobs:
9791
-DCMAKE_PREFIX_PATH="${{env.VCPKG_PATH}}"
9892
-DUMF_FORMAT_CODE_STYLE=OFF
9993
-DUMF_DEVELOPER_MODE=ON
100-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
10194
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
10295
-DUMF_BUILD_TESTS=${{matrix.build_tests}}
10396
-DUMF_BUILD_EXAMPLES=ON

‎.github/workflows/reusable_gpu.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ jobs:
9494
-DUMF_BUILD_GPU_TESTS=ON
9595
-DUMF_BUILD_GPU_EXAMPLES=ON
9696
-DUMF_DEVELOPER_MODE=ON
97-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
9897
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
9998
-DUMF_BUILD_CUDA_PROVIDER=OFF
10099
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF

‎.github/workflows/reusable_multi_numa.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
-DUMF_BUILD_BENCHMARKS=OFF
4646
-DUMF_BUILD_TESTS=ON
4747
-DUMF_DEVELOPER_MODE=ON
48-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
4948
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=${{ matrix.os == 'rhel-9.1' && 'OFF' || 'ON' }}
5049
-DUMF_TESTS_FAIL_ON_SKIP=ON
5150
${{ matrix.build_type == 'Debug' && matrix.os == 'ubuntu-22.04' && '-DUMF_USE_COVERAGE=ON' || '' }}
@@ -61,11 +60,12 @@ jobs:
6160
# On RHEL, hwloc version is just a little too low.
6261
# Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation.
6362
# TODO: fix issue #560
63+
# TODO: add issue for -E umf-init_teardown - it is not clear why it fails
6464
- name: Run tests (on RHEL)
6565
if: matrix.os == 'rhel-9.1'
6666
working-directory: ${{github.workspace}}/build
6767
run: |
68-
ctest --output-on-failure --test-dir test -E "umf-provider_os_memory_multiple_numa_nodes"
68+
ctest --output-on-failure --test-dir test -E "umf-provider_os_memory_multiple_numa_nodes|umf-init_teardown"
6969
./test/umf_test-provider_os_memory_multiple_numa_nodes \
7070
--gtest_filter="-*checkModeLocal/*:*checkModePreferredEmptyNodeset/*:testNuma.checkModeInterleave"
7171

‎.github/workflows/reusable_proxy_lib.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
-DUMF_FORMAT_CODE_STYLE=OFF
4949
-DUMF_DEVELOPER_MODE=ON
5050
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
51-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
5251
-DUMF_TESTS_FAIL_ON_SKIP=ON
5352
-DUMF_PROXY_LIB_BASED_ON_POOL=${{matrix.proxy_lib_pool}}
5453
${{ matrix.build_type == 'Debug' && '-DUMF_USE_COVERAGE=ON' || '' }}

‎.github/workflows/reusable_sanitizers.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
-DUMF_FORMAT_CODE_STYLE=OFF
5656
-DUMF_DEVELOPER_MODE=ON
5757
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
58-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
5958
-DUMF_USE_ASAN=${{matrix.sanitizers.asan}}
6059
-DUMF_USE_UBSAN=${{matrix.sanitizers.ubsan}}
6160
-DUMF_USE_TSAN=${{matrix.sanitizers.tsan}}
@@ -127,7 +126,6 @@ jobs:
127126
-DUMF_BUILD_SHARED_LIBRARY=OFF
128127
-DUMF_FORMAT_CODE_STYLE=OFF
129128
-DUMF_DEVELOPER_MODE=ON
130-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
131129
-DUMF_USE_ASAN=${{matrix.sanitizers.asan}}
132130
-DUMF_BUILD_EXAMPLES=ON
133131
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF

‎.github/workflows/reusable_valgrind.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
-DCMAKE_BUILD_TYPE=Debug
3030
-DUMF_FORMAT_CODE_STYLE=OFF
3131
-DUMF_DEVELOPER_MODE=ON
32-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
3332
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
3433
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
3534
-DUMF_BUILD_CUDA_PROVIDER=OFF

‎CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ endmacro()
6060
umf_option(UMF_BUILD_SHARED_LIBRARY "Build UMF as shared library" OFF)
6161
umf_option(UMF_BUILD_LEVEL_ZERO_PROVIDER "Build Level Zero memory provider" ON)
6262
umf_option(UMF_BUILD_CUDA_PROVIDER "Build CUDA memory provider" ON)
63-
umf_option(UMF_BUILD_LIBUMF_POOL_DISJOINT
64-
"Build the libumf_pool_disjoint static library" OFF)
6563
umf_option(UMF_BUILD_LIBUMF_POOL_JEMALLOC
6664
"Build the libumf_pool_jemalloc static library" OFF)
6765
umf_option(UMF_BUILD_TESTS "Build UMF tests" ON)
@@ -497,8 +495,8 @@ endif()
497495
# For using the options listed in the OPTIONS_REQUIRING_CXX variable a C++17
498496
# compiler is required. Moreover, if these options are not set, CMake will set
499497
# up a strict C build, without C++ support.
500-
set(OPTIONS_REQUIRING_CXX "UMF_BUILD_TESTS" "UMF_BUILD_LIBUMF_POOL_DISJOINT"
501-
"UMF_BUILD_BENCHMARKS_MT" "UMF_BUILD_BENCHMARKS")
498+
set(OPTIONS_REQUIRING_CXX "UMF_BUILD_TESTS" "UMF_BUILD_BENCHMARKS_MT"
499+
"UMF_BUILD_BENCHMARKS")
502500
foreach(option_name ${OPTIONS_REQUIRING_CXX})
503501
if(${option_name})
504502
enable_language(CXX)

‎README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ For development and contributions:
3939
- cmake-format-0.6 (can be installed with `python -m pip install cmake-format==0.6.13`)
4040
- black (can be installed with `python -m pip install black==24.3.0`)
4141

42-
For building tests, multithreaded benchmarks and Disjoint Pool:
42+
For building tests and multithreaded benchmarks:
4343

4444
- C++ compiler with C++17 support
4545

@@ -106,7 +106,6 @@ List of options provided by CMake:
106106
| UMF_BUILD_SHARED_LIBRARY | Build UMF as shared library | ON/OFF | OFF |
107107
| UMF_BUILD_LEVEL_ZERO_PROVIDER | Build Level Zero memory provider | ON/OFF | ON |
108108
| UMF_BUILD_CUDA_PROVIDER | Build CUDA memory provider | ON/OFF | ON |
109-
| UMF_BUILD_LIBUMF_POOL_DISJOINT | Build the libumf_pool_disjoint static library | ON/OFF | OFF |
110109
| UMF_BUILD_LIBUMF_POOL_JEMALLOC | Build the libumf_pool_jemalloc static library | ON/OFF | OFF |
111110
| UMF_BUILD_TESTS | Build UMF tests | ON/OFF | ON |
112111
| UMF_BUILD_GPU_TESTS | Build UMF GPU tests | ON/OFF | OFF |
@@ -267,13 +266,11 @@ This memory pool is distributed as part of libumf. It forwards all requests to t
267266
memory provider. Currently umfPoolRealloc, umfPoolCalloc and umfPoolMallocUsableSize functions
268267
are not supported by the proxy pool.
269268

270-
#### Disjoint pool
269+
#### Disjoint pool (part of libumf)
271270

272-
TODO: Add a description
273-
274-
##### Requirements
275-
276-
To enable this feature, the `UMF_BUILD_LIBUMF_POOL_DISJOINT` option needs to be turned `ON`.
271+
The Disjoint pool is designed to keep internal metadata separate from user data.
272+
This separation is particularly useful when user data needs to be placed in memory with relatively high latency,
273+
such as GPU memory or disk storage.
277274

278275
#### Jemalloc pool
279276

‎benchmark/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,6 @@ function(add_umf_benchmark)
9797
)
9898
endif()
9999

100-
if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
101-
target_compile_definitions(${BENCH_NAME}
102-
PRIVATE UMF_POOL_DISJOINT_ENABLED=1)
103-
endif()
104100
if(UMF_POOL_JEMALLOC_ENABLED)
105101
target_compile_definitions(${BENCH_NAME}
106102
PRIVATE UMF_POOL_JEMALLOC_ENABLED=1)
@@ -131,9 +127,6 @@ endfunction()
131127
set(LIB_DIRS ${LIBHWLOC_LIBRARY_DIRS})
132128

133129
# optional libraries
134-
if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
135-
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} disjoint_pool)
136-
endif()
137130
if(LINUX)
138131
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} m)
139132
endif()

‎benchmark/benchmark.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ UMF_BENCHMARK_TEMPLATE_DEFINE(alloc_benchmark, proxy_pool, fixed_alloc_size,
6666
UMF_BENCHMARK_REGISTER_F(alloc_benchmark, proxy_pool)
6767
->Apply(&default_alloc_fix_size);
6868

69-
#ifdef UMF_POOL_DISJOINT_ENABLED
7069
UMF_BENCHMARK_TEMPLATE_DEFINE(alloc_benchmark, disjoint_pool_fix,
7170
fixed_alloc_size,
7271
pool_allocator<disjoint_pool<os_provider>>);
@@ -80,7 +79,6 @@ UMF_BENCHMARK_REGISTER_F(alloc_benchmark, disjoint_pool_fix)
8079
UMF_BENCHMARK_REGISTER_F(alloc_benchmark, disjoint_pool_uniform)
8180
->Apply(&default_alloc_uniform_size);
8281
*/
83-
#endif
8482

8583
#ifdef UMF_POOL_JEMALLOC_ENABLED
8684
UMF_BENCHMARK_TEMPLATE_DEFINE(alloc_benchmark, jemalloc_pool_fix,
@@ -150,21 +148,17 @@ UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark, os_provider,
150148
UMF_BENCHMARK_REGISTER_F(multiple_malloc_free_benchmark, os_provider)
151149
->Apply(&default_multiple_alloc_fix_size);
152150

153-
#ifdef UMF_POOL_DISJOINT_ENABLED
154151
UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark, disjoint_pool_fix,
155152
fixed_alloc_size,
156153
pool_allocator<disjoint_pool<os_provider>>);
157154
UMF_BENCHMARK_REGISTER_F(multiple_malloc_free_benchmark, disjoint_pool_fix)
158155
->Apply(&default_multiple_alloc_fix_size);
159156

160-
// TODO: debug why this crashes
161-
/*UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark,
157+
UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark,
162158
disjoint_pool_uniform, uniform_alloc_size,
163159
pool_allocator<disjoint_pool<os_provider>>);
164160
UMF_BENCHMARK_REGISTER_F(multiple_malloc_free_benchmark, disjoint_pool_uniform)
165161
->Apply(&default_multiple_alloc_uniform_size);
166-
*/
167-
#endif
168162

169163
#ifdef UMF_POOL_JEMALLOC_ENABLED
170164
UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark, jemalloc_pool_fix,

‎benchmark/benchmark_umf.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,14 @@
1313
#include <umf/memory_provider.h>
1414

1515
#include <benchmark/benchmark.h>
16+
#include <umf/pools/pool_disjoint.h>
1617
#include <umf/pools/pool_proxy.h>
18+
1719
#ifdef UMF_POOL_SCALABLE_ENABLED
1820
#include <umf/pools/pool_scalable.h>
1921
#endif
2022
#include <umf/providers/provider_os_memory.h>
2123

22-
#ifdef UMF_POOL_DISJOINT_ENABLED
23-
#include <umf/pools/pool_disjoint.h>
24-
#endif
25-
2624
#ifdef UMF_POOL_JEMALLOC_ENABLED
2725
#include <umf/pools/pool_jemalloc.h>
2826
#endif
@@ -167,7 +165,6 @@ struct proxy_pool : public pool_interface<Provider> {
167165
static std::string name() { return "proxy_pool<" + Provider::name() + ">"; }
168166
};
169167

170-
#ifdef UMF_POOL_DISJOINT_ENABLED
171168
template <typename Provider>
172169
struct disjoint_pool : public pool_interface<Provider> {
173170
umf_memory_pool_ops_t *
@@ -221,7 +218,6 @@ struct disjoint_pool : public pool_interface<Provider> {
221218
return "disjoint_pool<" + Provider::name() + ">";
222219
}
223220
};
224-
#endif
225221

226222
#ifdef UMF_POOL_JEMALLOC_ENABLED
227223
template <typename Provider>

0 commit comments

Comments
 (0)