Skip to content

Commit 11acf02

Browse files
pcarruscagpcarruscag
authored
don't use werror for ARM (#2799)
1 parent 33acd77 commit 11acf02

2 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎.github/workflows/regression.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,17 @@ jobs:
2424

2525
outputs:
2626
flags: ${{ steps.compute.outputs.flags }}
27+
werror: ${{ steps.compute.outputs.flags }}
2728

2829
steps:
2930
- id: compute
3031
run: |
3132
if [[ "${{ inputs.runner || 'ubuntu-latest' }}" == *arm* ]]; then
3233
echo "flags=" >> $GITHUB_OUTPUT
34+
echo "werror=" >> $GITHUB_OUTPUT
3335
else
3436
echo "flags=-Dcpu-arch=skylake" >> $GITHUB_OUTPUT
37+
echo "werror=--werror" >> $GITHUB_OUTPUT
3538
fi
3639
3740
build:
@@ -45,23 +48,23 @@ jobs:
4548
- config_set: BaseMPI
4649
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'
4750
- config_set: ReverseMPI
48-
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
51+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
4952
- config_set: ForwardMPI
50-
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
53+
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
5154
- config_set: BaseNoMPI
52-
flags: '${{ needs.setup.outputs.flags }} -Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
55+
flags: '${{ needs.setup.outputs.flags }} -Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
5356
- config_set: ReverseNoMPI
54-
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
57+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
5558
- config_set: ForwardNoMPI
56-
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
59+
flags: '${{ needs.setup.outputs.flags }} -Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
5760
- config_set: ReverseTagNoMPI
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'
61+
flags: '${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 ${{ needs.setup.outputs.werror }} -Dcodi-tape=Tag'
5962
- config_set: BaseOMP
60-
flags: '${{ needs.setup.outputs.flags }} -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
63+
flags: '${{ needs.setup.outputs.flags }} -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 ${{ needs.setup.outputs.werror }}'
6164
- config_set: ReverseOMP
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'
65+
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 ${{ needs.setup.outputs.werror }}'
6366
- config_set: ForwardOMP
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'
67+
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 ${{ needs.setup.outputs.werror }}'
6568
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
6669
steps:
6770
- name: Cache Object Files
@@ -105,7 +108,7 @@ jobs:
105108
- config_set: ReverseOMP-tsan
106109
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
107110
#- config_set: ForwardOMP-tsan
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'
111+
# 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 ${{ needs.setup.outputs.werror }}'
109112
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
110113
steps:
111114
- name: Cache Object Files
@@ -144,9 +147,9 @@ jobs:
144147
config_set: [BaseNoMPI-asan, ReverseNoMPI-asan]
145148
include:
146149
- config_set: BaseNoMPI-asan
147-
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror'
150+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 ${{ needs.setup.outputs.werror }}'
148151
- config_set: ReverseNoMPI-asan
149-
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
152+
flags: '--buildtype=debugoptimized ${{ needs.setup.outputs.flags }} --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 ${{ needs.setup.outputs.werror }}'
150153
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
151154
steps:
152155
- name: Cache Object Files

‎SU2_CFD/src/solvers/CEulerSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,7 @@ void CEulerSolver::SetInitialCondition(CGeometry **geometry, CSolver ***solver_c
15151515
Velocity_Cyl[1] = sin(Beta)*Mach_Cyl*Mach2Vel_Cyl;
15161516
Velocity_Cyl[2] = sin(Alpha)*cos(Beta)*Mach_Cyl*Mach2Vel_Cyl;
15171517

1518-
ModVel_Cyl = GeometryToolbox::Norm(nDim, Velocity_Cyl);
1518+
ModVel_Cyl = GeometryToolbox::Norm(3, Velocity_Cyl);
15191519

15201520
if (config->GetViscous()) {
15211521
if (config->GetSystemMeasurements() == SI) { T_ref = 273.15; S = 110.4; Mu_ref = 1.716E-5; }

0 commit comments

Comments
 (0)