Skip to content

Commit 400a221

Browse files
committed
Enable jemalloc pool in CI
Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 8f76186 commit 400a221

File tree

6 files changed

+13
-18
lines changed

6 files changed

+13
-18
lines changed

.github/workflows/basic.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178
windows-build:
179179
name: Windows
180180
env:
181-
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
181+
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
182182
strategy:
183183
matrix:
184184
os: ['windows-2019', 'windows-2022']
@@ -238,6 +238,7 @@ jobs:
238238
-DUMF_DEVELOPER_MODE=ON
239239
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
240240
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
241+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
241242
-DUMF_BUILD_OS_MEMORY_PROVIDER=${{matrix.os_provider}}
242243
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
243244
@@ -273,6 +274,7 @@ jobs:
273274
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
274275
-DUMF_BUILD_OS_MEMORY_PROVIDER=OFF
275276
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=OFF
277+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
276278
277279
- name: Build UMF
278280
run: cmake --build ${{env.BUILD_DIR}} -j $(sysctl -n hw.logicalcpu)

.github/workflows/benchmarks.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,10 @@ jobs:
1111
name: Benchmarks
1212
env:
1313
BUILD_DIR : "${{github.workspace}}/build/"
14-
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
14+
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
1515
strategy:
1616
matrix:
17-
include:
18-
- os: ubuntu-latest
19-
pool_jemalloc: 'ON'
20-
21-
- os: windows-latest
22-
pool_jemalloc: 'OFF'
23-
17+
os: ['ubuntu-latest', 'windows-latest']
2418
runs-on: ${{matrix.os}}
2519

2620
steps:
@@ -60,7 +54,7 @@ jobs:
6054
-DUMF_DEVELOPER_MODE=OFF
6155
-DUMF_BUILD_OS_MEMORY_PROVIDER=ON
6256
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
63-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=${{matrix.pool_jemalloc}}
57+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
6458
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
6559
-DUMF_ENABLE_POOL_TRACKING=OFF
6660
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF

.github/workflows/codeql.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
permissions:
2121
security-events: write
2222
env:
23-
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
23+
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
2424
strategy:
2525
fail-fast: false
2626
matrix:
@@ -73,6 +73,7 @@ jobs:
7373
-DUMF_DEVELOPER_MODE=ON
7474
-DUMF_ENABLE_POOL_TRACKING=ON
7575
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
76+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
7677
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
7778
7879
- name: Build

.github/workflows/pr_push.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,24 @@ jobs:
1414
FastBuild:
1515
name: Fast build
1616
env:
17-
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
17+
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
1818
strategy:
1919
matrix:
2020
include:
2121
- os: windows-latest
2222
disjoint: 'OFF'
23-
jemalloc: 'OFF'
2423
# pure C build (Windows)
2524
- os: windows-latest
2625
disjoint: 'OFF'
27-
jemalloc: 'OFF'
2826
# Tests' building is off for a pure C build
2927
extra_build_options: '-DUMF_BUILD_TESTS=OFF'
3028
- os: ubuntu-latest
3129
disjoint: 'ON'
32-
jemalloc: 'ON'
3330
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
3431
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_BENCHMARKS_MT=ON'
3532
# pure C build (Linux)
3633
- os: ubuntu-latest
3734
disjoint: 'OFF'
38-
jemalloc: 'ON'
3935
# Windows doesn't recognize 'CMAKE_BUILD_TYPE', it uses '--config' param in build command
4036
# Tests' building is off for a pure C build
4137
extra_build_options: '-DCMAKE_BUILD_TYPE=Release -DUMF_BUILD_BENCHMARKS=ON -DUMF_BUILD_TESTS=OFF'
@@ -74,7 +70,7 @@ jobs:
7470
-DUMF_ENABLE_POOL_TRACKING=ON
7571
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=ON
7672
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=${{matrix.disjoint}}
77-
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=${{matrix.jemalloc}}
73+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
7874
-DUMF_BUILD_TESTS=ON
7975
-DUMF_BUILD_EXAMPLES=ON
8076
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
@@ -109,6 +105,7 @@ jobs:
109105
-DUMF_BUILD_TESTS=OFF
110106
-DUMF_BUILD_LEVEL_ZERO_PROVIDER=OFF
111107
-DUMF_BUILD_LIBUMF_POOL_SCALABLE=OFF
108+
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
112109
113110
- name: Check clang-format
114111
run: cmake --build build --target clang-format-check

.github/workflows/sanitizers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
windows-build:
112112
name: cl and clang-cl on Windows
113113
env:
114-
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows"
114+
VCPKG_PATH: "${{github.workspace}}/build/vcpkg/packages/hwloc_x64-windows;${{github.workspace}}/build/vcpkg/packages/tbb_x64-windows;${{github.workspace}}/build/vcpkg/packages/jemalloc_x64-windows"
115115
strategy:
116116
matrix:
117117
compiler: [{c: cl, cxx: cl}, {c: clang-cl, cxx: clang-cl}]

vcpkg.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"version-string": "1.0.0",
44
"dependencies": [
55
"hwloc",
6+
"jemalloc",
67
"tbb"
78
]
89
}

0 commit comments

Comments
 (0)