Skip to content

Commit fb51caa

Browse files
bratpiorkabratpiorka
committed
make disjoint pool a C structure
1 parent 16c10da commit fb51caa

Some content is hidden

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

44 files changed

+1638
-1567
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 & 2 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
@@ -156,7 +155,6 @@ jobs:
156155
# -DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}} ^
157156
# -DUMF_FORMAT_CODE_STYLE=OFF ^
158157
# -DUMF_DEVELOPER_MODE=ON ^
159-
# -DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON ^
160158
# -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON ^
161159
# -DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON ^
162160
# -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}}
@@ -207,7 +206,6 @@ jobs:
207206
--build-dir ${{env.BUILD_DIR}}
208207
--install-dir ${{env.INSTL_DIR}}
209208
--build-type ${{matrix.build_type}}
210-
--disjoint-pool
211209
${{ matrix.install_tbb == 'ON' && matrix.disable_hwloc != 'ON' && matrix.shared_library == 'ON' && '--proxy' || '' }}
212210
--umf-version ${{env.UMF_VERSION}}
213211
${{ matrix.shared_library == 'ON' && '--shared-library' || '' }}
@@ -283,7 +281,6 @@ jobs:
283281
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
284282
-DUMF_FORMAT_CODE_STYLE=OFF
285283
-DUMF_DEVELOPER_MODE=ON
286-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
287284
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
288285
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=${{matrix.level_zero_provider}}
289286
-DUMF_BUILD_CUDA_PROVIDER=${{matrix.cuda_provider}}
@@ -303,7 +300,6 @@ jobs:
303300
--build-dir ${{env.BUILD_DIR}}
304301
--install-dir ${{env.INSTL_DIR}}
305302
--build-type ${{matrix.build_type}}
306-
--disjoint-pool
307303
${{matrix.shared_library == 'ON' && '--proxy' || '' }}
308304
--umf-version ${{env.UMF_VERSION}}
309305
${{ matrix.shared_library == 'ON' && '--shared-library' || ''}}
@@ -341,7 +337,6 @@ jobs:
341337
-DUMF_BUILD_EXAMPLES=OFF
342338
-DUMF_FORMAT_CODE_STYLE=OFF
343339
-DUMF_DEVELOPER_MODE=ON
344-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
345340
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
346341
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
347342
-DUMF_BUILD_CUDA_PROVIDER=ON
@@ -384,7 +379,6 @@ jobs:
384379
-DUMF_BUILD_EXAMPLES=OFF
385380
-DUMF_FORMAT_CODE_STYLE=OFF
386381
-DUMF_DEVELOPER_MODE=ON
387-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
388382
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
389383
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
390384
-DUMF_BUILD_CUDA_PROVIDER=ON
@@ -495,7 +489,6 @@ jobs:
495489
-DUMF_FORMAT_CODE_STYLE=OFF
496490
-DUMF_DEVELOPER_MODE=ON
497491
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
498-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
499492
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
500493
-DUMF_BUILD_SHARED_LIBRARY=ON
501494
-DUMF_TESTS_FAIL_ON_SKIP=ON
@@ -510,7 +503,6 @@ jobs:
510503
--build-dir ${{env.BUILD_DIR}}
511504
--install-dir ${{env.INSTL_DIR}}
512505
--build-type ${{env.BUILD_TYPE}}
513-
--disjoint-pool
514506
--proxy
515507
--umf-version ${{env.UMF_VERSION}}
516508
--shared-library

‎.github/workflows/reusable_benchmarks.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ jobs:
9898
-DUMF_DEVELOPER_MODE=OFF
9999
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=ON
100100
-DUMF_BUILD_CUDA_PROVIDER=ON
101-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
102101
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
103102
-DUMF_BUILD_EXAMPLES=OFF
104103

‎.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
@@ -92,7 +92,6 @@ jobs:
9292
-DUMF_BUILD_GPU_TESTS=ON
9393
-DUMF_BUILD_GPU_EXAMPLES=ON
9494
-DUMF_DEVELOPER_MODE=ON
95-
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
9695
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
9796
-DUMF_BUILD_CUDA_PROVIDER=OFF
9897
-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

0 commit comments

Comments
 (0)