Skip to content

Commit 2a7a229

Browse files
[CI] Move MultiNuma workflow right after FastBuild
It's running rather quickly and on self hosted runners. Enable also more builds in this workflow.
1 parent d28cb6b commit 2a7a229

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/pr_push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ jobs:
3131
DevDax:
3232
needs: [FastBuild]
3333
uses: ./.github/workflows/reusable_dax.yml
34+
MultiNuma:
35+
needs: [FastBuild]
36+
uses: ./.github/workflows/reusable_multi_numa.yml
3437
Sanitizers:
3538
needs: [FastBuild]
3639
uses: ./.github/workflows/reusable_sanitizers.yml
@@ -49,9 +52,6 @@ jobs:
4952
Valgrind:
5053
needs: [Build]
5154
uses: ./.github/workflows/reusable_valgrind.yml
52-
MultiNuma:
53-
needs: [Build]
54-
uses: ./.github/workflows/reusable_multi_numa.yml
5555
Coverage:
5656
# total coverage (on upstream only)
5757
if: github.repository == 'oneapi-src/unified-memory-framework'

.github/workflows/reusable_multi_numa.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ env:
1313

1414
jobs:
1515
multi_numa:
16-
name: ${{matrix.os}}
16+
name: "${{matrix.os}}, ${{matrix.build_type}}, shared=${{matrix.shared_library}}"
1717
# run only on upstream; forks will not have the HW
1818
if: github.repository == 'oneapi-src/unified-memory-framework'
1919

2020
strategy:
2121
matrix:
2222
os: [ubuntu-22.04, rhel-9.1]
23+
build_type: [Debug, Release]
24+
shared_library: ['ON', 'OFF']
2325
runs-on: ["DSS-MULTI-NUMA", "DSS-${{matrix.os}}"]
2426

2527
steps:
@@ -35,17 +37,17 @@ jobs:
3537
run: >
3638
cmake
3739
-B ${{github.workspace}}/build
38-
-DCMAKE_BUILD_TYPE=Debug
40+
-DCMAKE_BUILD_TYPE=${{matrix.build_type}}
3941
-DCMAKE_C_COMPILER=gcc
4042
-DCMAKE_CXX_COMPILER=g++
41-
-DUMF_BUILD_SHARED_LIBRARY=OFF
43+
-DUMF_BUILD_SHARED_LIBRARY=${{matrix.shared_library}}
4244
-DUMF_BUILD_BENCHMARKS=OFF
4345
-DUMF_BUILD_TESTS=ON
4446
-DUMF_DEVELOPER_MODE=ON
4547
-DUMF_BUILD_LIBUMF_POOL_DISJOINT=ON
4648
-DUMF_BUILD_LIBUMF_POOL_JEMALLOC=ON
4749
-DUMF_TESTS_FAIL_ON_SKIP=ON
48-
${{ matrix.os == 'ubuntu-22.04' && '-DUMF_USE_COVERAGE=ON' || '' }}
50+
${{ matrix.build_type == 'Debug' && matrix.os == 'ubuntu-22.04' && '-DUMF_USE_COVERAGE=ON' || '' }}
4951
5052
- name: Build UMF
5153
run: cmake --build ${{github.workspace}}/build -j $(nproc)
@@ -70,7 +72,7 @@ jobs:
7072
if: matrix.os == 'ubuntu-22.04'
7173
working-directory: ${{env.BUILD_DIR}}
7274
run: |
73-
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-os-${{matrix.os}}
75+
export COVERAGE_FILE_NAME=${{env.COVERAGE_NAME}}-${{matrix.os}}-shared-${{matrix.shared_library}}
7476
echo "COVERAGE_FILE_NAME: $COVERAGE_FILE_NAME"
7577
../scripts/coverage/coverage_capture.sh $COVERAGE_FILE_NAME
7678
mkdir -p ${{env.COVERAGE_DIR}}
@@ -79,5 +81,5 @@ jobs:
7981
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
8082
if: matrix.os == 'ubuntu-22.04'
8183
with:
82-
name: ${{env.COVERAGE_NAME}}-os-${{matrix.os}}
84+
name: ${{env.COVERAGE_NAME}}-${{matrix.os}}-${{matrix.build_type}}-shared-${{matrix.shared_library}}
8385
path: ${{env.COVERAGE_DIR}}

0 commit comments

Comments
 (0)