Skip to content

Commit 8dc22dd

Browse files
pcarruscagpcarruscag
authored
Merge pull request #2773 from su2code/pedro/upgrade_containers
upgrade ubuntu in docker containers
2 parents 3836766 + d0ce773 commit 8dc22dd

17 files changed

Lines changed: 88 additions & 52 deletions

File tree

‎.github/workflows/regression.yml‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ jobs:
5454
key: ${{ matrix.config_set }}-${{ github.sha }}
5555
restore-keys: ${{ matrix.config_set }}
5656
- name: Pre Cleanup
57-
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
57+
uses: docker://ghcr.io/su2code/su2/build-su2:260404-0039
5858
with:
5959
entrypoint: /bin/rm
6060
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
6161
- name: Build
62-
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
62+
uses: docker://ghcr.io/su2code/su2/build-su2:260404-0039
6363
with:
6464
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6565
- name: Compress binaries
@@ -70,7 +70,7 @@ jobs:
7070
name: ${{ matrix.config_set }}
7171
path: install_bin.tgz
7272
- name: Post Cleanup
73-
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
73+
uses: docker://ghcr.io/su2code/su2/build-su2:260404-0039
7474
with:
7575
entrypoint: /bin/rm
7676
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -97,12 +97,12 @@ jobs:
9797
key: ${{ matrix.config_set }}-${{ github.sha }}
9898
restore-keys: ${{ matrix.config_set }}
9999
- name: Pre Cleanup
100-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
100+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:260404-0039
101101
with:
102102
entrypoint: /bin/rm
103103
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
104104
- name: Build
105-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
105+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:260404-0039
106106
with:
107107
args: -b ${{github.ref}} -f "${{matrix.flags}}"
108108
- name: Compress binaries
@@ -113,7 +113,7 @@ jobs:
113113
name: ${{ matrix.config_set }}
114114
path: install_bin.tgz
115115
- name: Post Cleanup
116-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
116+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:260404-0039
117117
with:
118118
entrypoint: /bin/rm
119119
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -137,12 +137,12 @@ jobs:
137137
key: ${{ matrix.config_set }}-${{ github.sha }}
138138
restore-keys: ${{ matrix.config_set }}
139139
- name: Pre Cleanup
140-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
140+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:260404-0039
141141
with:
142142
entrypoint: /bin/rm
143143
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
144144
- name: Build
145-
run: docker run --rm --cap-add SYS_PTRACE -v $(pwd):${{ github.workspace }} -w ${{ github.workspace }} ghcr.io/su2code/su2/build-su2-asan:250717-1402 -b ${{github.ref}} -f "${{matrix.flags}}"
145+
run: docker run --rm --cap-add SYS_PTRACE -v $(pwd):${{ github.workspace }} -w ${{ github.workspace }} ghcr.io/su2code/su2/build-su2-asan:260404-0039 -b ${{github.ref}} -f "${{matrix.flags}}"
146146
- name: Compress binaries
147147
run: tar -zcvf install_bin.tgz install/*
148148
- name: Upload Binaries
@@ -151,7 +151,7 @@ jobs:
151151
name: ${{ matrix.config_set }}
152152
path: install_bin.tgz
153153
- name: Post Cleanup
154-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
154+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:260404-0039
155155
with:
156156
entrypoint: /bin/rm
157157
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -182,7 +182,7 @@ jobs:
182182
tag: OMP
183183
steps:
184184
- name: Pre Cleanup
185-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
185+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
186186
with:
187187
entrypoint: /bin/rm
188188
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -208,12 +208,12 @@ jobs:
208208
chmod a+x $BIN_FOLDER/*
209209
ls -lahR $BIN_FOLDER
210210
- name: Run Tests in Container
211-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
211+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
212212
with:
213213
# -t <Tutorials-branch> -c <Testcases-branch>
214214
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
215215
- name: Cleanup
216-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
216+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
217217
with:
218218
entrypoint: /bin/rm
219219
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -231,7 +231,7 @@ jobs:
231231
tag: TagNoMPI
232232
steps:
233233
- name: Pre Cleanup
234-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
234+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
235235
with:
236236
entrypoint: /bin/rm
237237
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -257,12 +257,12 @@ jobs:
257257
chmod a+x $BIN_FOLDER/*
258258
ls -lahR $BIN_FOLDER
259259
- name: Run Tests in Container
260-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
260+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
261261
with:
262262
# -t <Tutorials-branch> -c <Testcases-branch>
263263
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tapetests"
264264
- name: Cleanup
265-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
265+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
266266
with:
267267
entrypoint: /bin/rm
268268
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -277,7 +277,7 @@ jobs:
277277
testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
278278
steps:
279279
- name: Pre Cleanup
280-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
280+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:260404-0039
281281
with:
282282
entrypoint: /bin/rm
283283
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -303,12 +303,14 @@ jobs:
303303
chmod a+x $BIN_FOLDER/*
304304
ls -lahR $BIN_FOLDER
305305
- name: Run Tests in Container
306-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
306+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:260404-0039
307+
env:
308+
PMIX_MCA_gds: hash
307309
with:
308310
# -t <Tutorials-branch> -c <Testcases-branch>
309311
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
310312
- name: Cleanup
311-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
313+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:260404-0039
312314
with:
313315
entrypoint: /bin/rm
314316
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -322,7 +324,7 @@ jobs:
322324
testscript: ['serial_regression.py', 'serial_regression_AD.py']
323325
steps:
324326
- name: Pre Cleanup
325-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
327+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:260404-0039
326328
with:
327329
entrypoint: /bin/rm
328330
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -348,12 +350,12 @@ jobs:
348350
chmod a+x $BIN_FOLDER/*
349351
ls -lahR $BIN_FOLDER
350352
- name: Run Tests in Container
351-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
353+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:260404-0039
352354
with:
353355
# -t <Tutorials-branch> -c <Testcases-branch>
354356
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
355357
- name: Cleanup
356-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
358+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:260404-0039
357359
with:
358360
entrypoint: /bin/rm
359361
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -374,7 +376,7 @@ jobs:
374376
tag: MPI
375377
steps:
376378
- name: Pre Cleanup
377-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
379+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
378380
with:
379381
entrypoint: /bin/rm
380382
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -435,11 +437,13 @@ jobs:
435437
echo $PWD
436438
ls -lahR
437439
- name: Run Unit Tests
438-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
440+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
441+
env:
442+
OMPI_MCA_osc: pt2pt
439443
with:
440444
entrypoint: install/bin/${{matrix.testdriver}}
441445
- name: Post Cleanup
442-
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
446+
uses: docker://ghcr.io/su2code/su2/test-su2:260404-0039
443447
with:
444448
entrypoint: /bin/rm
445449
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

‎.github/workflows/release-management.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
key: ${{ matrix.os_bin }}-${{ github.sha }}
3636
restore-keys: ${{ matrix.os_bin }}
3737
- name: Build
38-
uses: docker://ghcr.io/su2code/su2/build-su2-cross:250717-1402
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:260404-0039
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive

‎Common/include/code_config.hpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828

2929
#include <type_traits>
3030

31+
#if defined(_MSC_VER)
32+
#define PRAGMIZE(X) __pragma(X)
33+
#else
34+
#define PRAGMIZE(X) _Pragma(#X)
35+
#endif
36+
3137
#if defined(_MSC_VER)
3238
#define FORCEINLINE __forceinline
3339
#elif defined(__GNUC__) || defined(__clang__) || defined(__INTEL_COMPILER)
@@ -151,3 +157,13 @@ using su2mixedfloat = passivedouble;
151157
#define HAVE_OMPT
152158
#endif
153159
#endif
160+
161+
#ifdef __GNUC__
162+
#define SU2_IGNORE_WARNING(WARNING) \
163+
PRAGMIZE(GCC diagnostic push) \
164+
PRAGMIZE(GCC diagnostic ignored WARNING)
165+
#define SU2_RESTORE_WARNING PRAGMIZE(GCC diagnostic pop)
166+
#else
167+
#define SU2_IGNORE_WARNING(WARNING)
168+
#define SU2_RESTORE_WARNING
169+
#endif

‎Common/include/containers/C2DContainer.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,10 @@ class C2DContainer
545545
* \brief Set value of all entries to "value".
546546
*/
547547
void setConstant(const Scalar_t& value) noexcept {
548+
// GCC 13 has a false-positive about overflow of memcpy due to size being uint64_t, and its memcpy just int64_t.
549+
SU2_IGNORE_WARNING("-Wstringop-overflow")
548550
for (size_t i = 0; i < size(); ++i) m_data[i] = value;
551+
SU2_RESTORE_WARNING
549552
}
550553

551554
/*!

‎Common/include/parallelization/omp_structure.hpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@
4343

4444
#include "../code_config.hpp"
4545

46-
#if defined(_MSC_VER)
47-
#define PRAGMIZE(X) __pragma(X)
48-
#else
49-
#define PRAGMIZE(X) _Pragma(#X)
50-
#endif
51-
5246
#if defined(HAVE_OMP)
5347
#include <omp.h>
5448

‎Common/src/linear_algebra/CSysSolve.cpp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
* License along with SU2. If not, see <http://www.gnu.org/licenses/>.
2626
*/
2727

28-
#include "Eigen/Core"
29-
#include "Eigen/Dense"
30-
#include "Eigen/Eigenvalues"
31-
3228
#include "../../include/linear_algebra/CSysSolve.hpp"
3329
#include "../../include/linear_algebra/CSysSolve_b.hpp"
3430
#include "../../include/parallelization/omp_structure.hpp"
@@ -38,6 +34,12 @@
3834
#include "../../include/linear_algebra/CMatrixVectorProduct.hpp"
3935
#include "../../include/linear_algebra/CPreconditioner.hpp"
4036

37+
SU2_IGNORE_WARNING("-Wmaybe-uninitialized")
38+
#include "Eigen/Core"
39+
#include "Eigen/Dense"
40+
#include "Eigen/Eigenvalues"
41+
SU2_RESTORE_WARNING
42+
4143
#include <complex>
4244
#include <iostream>
4345
#include <limits>

‎SU2_CFD/include/numerics/CNumerics.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ class CNumerics {
563563
NEVERINLINE static void ComputePerturbedRSM(size_t nDim, size_t uq_eigval_comp, bool uq_permute, su2double uq_delta_b,
564564
su2double uq_urlx, const Mat1& velgrad, Scalar density,
565565
Scalar viscosity, Scalar turb_ke, Mat2& MeanPerturbedRSM) {
566-
Scalar MeanReynoldsStress[3][3];
566+
Scalar MeanReynoldsStress[3][3] = {{}};
567567
ComputeStressTensor(nDim, MeanReynoldsStress, velgrad, viscosity, density, turb_ke, true);
568568
for (size_t iDim = 0; iDim < 3; iDim++)
569569
for (size_t jDim = 0; jDim < 3; jDim++)

‎SU2_CFD/src/solvers/CSolver.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4045,7 +4045,7 @@ void CSolver::ComputeVertexTractions(CGeometry *geometry, const CConfig *config)
40454045
// Calculate tn in the fluid nodes for the viscous term
40464046
if (viscous_flow) {
40474047
const su2double Viscosity = base_nodes->GetLaminarViscosity(iPoint);
4048-
su2double Tau[3][3];
4048+
su2double Tau[3][3] = {{}};
40494049
CNumerics::ComputeStressTensor(nDim, Tau, base_nodes->GetVelocityGradient(iPoint), Viscosity);
40504050
for (unsigned short iDim = 0; iDim < nDim; iDim++) {
40514051
auxForce[iDim] += GeometryToolbox::DotProduct(nDim, Tau[iDim], Normal);

‎TestCases/hybrid_regression.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ def main():
215215
turb_naca0012_sst_sust.cfg_dir = "rans/naca0012"
216216
turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg"
217217
turb_naca0012_sst_sust.test_iter = 10
218-
turb_naca0012_sst_sust.test_vals = [-12.080740, -14.837176, -5.732917, 1.000893, 0.019109, -2.120257]
218+
turb_naca0012_sst_sust.test_vals = [-12.080804, -14.837176, -5.732917, 1.000893, 0.019109, -2.120148]
219219
turb_naca0012_sst_sust.test_vals_aarch64 = [-12.073210, -14.836724, -5.732627, 1.000050, 0.019144, -2.629689]
220220
test_list.append(turb_naca0012_sst_sust)
221221

@@ -252,7 +252,7 @@ def main():
252252
axi_rans_air_nozzle_restart.cfg_dir = "axisymmetric_rans/air_nozzle"
253253
axi_rans_air_nozzle_restart.cfg_file = "air_nozzle_restart.cfg"
254254
axi_rans_air_nozzle_restart.test_iter = 10
255-
axi_rans_air_nozzle_restart.test_vals = [-12.066676, -7.446616, -8.813770, -3.730662, 0]
255+
axi_rans_air_nozzle_restart.test_vals = [-12.066674, -7.446485, -8.813457, -3.730648, 0]
256256
axi_rans_air_nozzle_restart.test_vals_aarch64 = [-14.140441, -9.154674, -10.886121, -5.806594, 0.000000]
257257
test_list.append(axi_rans_air_nozzle_restart)
258258

‎TestCases/parallel_regression.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def main():
491491
turb_naca0012_sst.cfg_dir = "rans/naca0012"
492492
turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
493493
turb_naca0012_sst.test_iter = 10
494-
turb_naca0012_sst.test_vals = [-12.094699, -15.251093, -5.906365, 1.070413, 0.015775, -2.376178, 0.000000]
494+
turb_naca0012_sst.test_vals = [-12.094710, -15.251093, -5.906365, 1.070413, 0.015775, -2.376172, 0.000000]
495495
turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000]
496496
turb_naca0012_sst.timeout = 3200
497497
test_list.append(turb_naca0012_sst)
@@ -1457,7 +1457,7 @@ def main():
14571457
pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012"
14581458
pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg"
14591459
pywrapper_turb_naca0012_sst.test_iter = 10
1460-
pywrapper_turb_naca0012_sst.test_vals = [-12.094699, -15.251093, -5.906365, 1.070413, 0.015775, -2.376178, 0.000000]
1460+
pywrapper_turb_naca0012_sst.test_vals = [-12.094710, -15.251093, -5.906365, 1.070413, 0.015775, -2.376172, 0]
14611461
pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000]
14621462
pywrapper_turb_naca0012_sst.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f")
14631463
pywrapper_turb_naca0012_sst.timeout = 3200

0 commit comments

Comments
 (0)