Skip to content

Commit 68acbf8

Browse files
authored
fix arm builds for CI/CD (#2792)
* fix arm builds * fix * fix
1 parent 3e9bd73 commit 68acbf8

1 file changed

Lines changed: 34 additions & 15 deletions

File tree

.github/workflows/regression.yml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,50 @@ on:
1818
type: string
1919

2020
jobs:
21+
setup:
22+
name: Compute shared flags
23+
runs-on: ubuntu-latest
24+
25+
outputs:
26+
flags: ${{ steps.compute.outputs.flags }}
27+
28+
steps:
29+
- id: compute
30+
run: |
31+
if [[ "${{ inputs.runner || 'ubuntu-latest' }}" == *arm* ]]; then
32+
echo "flags=" >> $GITHUB_OUTPUT
33+
else
34+
echo "flags=-Dcpu-arch=skylake" >> $GITHUB_OUTPUT
35+
fi
36+
2137
build:
2238
name: Build SU2
39+
needs: setup
2340
strategy:
2441
fail-fast: false
2542
matrix:
2643
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, ReverseTagNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
2744
include:
2845
- config_set: BaseMPI
29-
flags: '-Dcpu-arch=skylake -Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2'
46+
flags: '${{ needs.setup.outputs.flags }} -Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2'
3047
- config_set: ReverseMPI
31-
flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
48+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
3249
- config_set: ForwardMPI
33-
flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
50+
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
3451
- config_set: BaseNoMPI
35-
flags: '-Dcpu-arch=skylake -Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
52+
flags: '${{ needs.setup.outputs.flags }} -Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
3653
- config_set: ReverseNoMPI
37-
flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
54+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
3855
- config_set: ForwardNoMPI
39-
flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
56+
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
4057
- config_set: ReverseTagNoMPI
41-
flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror -Dcodi-tape=Tag'
58+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror -Dcodi-tape=Tag'
4259
- config_set: BaseOMP
43-
flags: '-Dcpu-arch=skylake -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
60+
flags: '${{ needs.setup.outputs.flags }} -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4461
- config_set: ReverseOMP
45-
flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
62+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4663
- config_set: ForwardOMP
47-
flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
64+
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4865
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
4966
steps:
5067
- name: Cache Object Files
@@ -76,18 +93,19 @@ jobs:
7693
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
7794
build_tsan:
7895
name: Build SU2 (tsan)
96+
needs: setup
7997
if: ${{ !contains(inputs.runner, 'arm') }}
8098
strategy:
8199
fail-fast: false
82100
matrix:
83101
config_set: [BaseOMP-tsan, ReverseOMP-tsan] #ForwardOMP-tsan
84102
include:
85103
- config_set: BaseOMP-tsan
86-
flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
104+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
87105
- config_set: ReverseOMP-tsan
88-
flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
106+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
89107
#- config_set: ForwardOMP-tsan
90-
# flags: '--buildtype=debug -Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
108+
# flags: '--buildtype=debug ${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
91109
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
92110
steps:
93111
- name: Cache Object Files
@@ -119,15 +137,16 @@ jobs:
119137
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
120138
build_asan:
121139
name: Build SU2 (asan)
140+
needs: setup
122141
strategy:
123142
fail-fast: false
124143
matrix:
125144
config_set: [BaseNoMPI-asan, ReverseNoMPI-asan]
126145
include:
127146
- config_set: BaseNoMPI-asan
128-
flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror'
147+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror'
129148
- config_set: ReverseNoMPI-asan
130-
flags: '--buildtype=debugoptimized -Dcpu-arch=skylake --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
149+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
131150
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
132151
steps:
133152
- name: Cache Object Files

0 commit comments

Comments
 (0)