Skip to content

Commit 85cfe1e

Browse files
authored
Merge branch 'develop' into myTempSu2Rep
2 parents ded2514 + b49318e commit 85cfe1e

File tree

1,123 files changed

+25881
-13483
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,123 files changed

+25881
-13483
lines changed

.clang-format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ BasedOnStyle: Google
22
PointerAlignment: Left
33
DerivePointerAlignment: false
44
ColumnLimit: 120
5-
SortIncludes: Never
5+
SortIncludes: false

.github/workflows/code-style.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Setup python
17-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1818
with:
1919
python-version: '3.10'
2020
check-latest: true

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
- name: Install Packages (cpp)
3030
if: ${{ matrix.language == 'cpp' }}
@@ -37,20 +37,20 @@ jobs:
3737
run: ./meson.py build --optimization=1
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@v2
40+
uses: github/codeql-action/init@v3
4141
with:
4242
languages: ${{ matrix.language }}
4343
queries: +security-and-quality
4444

4545
- name: Autobuild
46-
uses: github/codeql-action/autobuild@v2
46+
uses: github/codeql-action/autobuild@v3
4747
if: ${{ matrix.language == 'python' }}
4848

4949
- name: Build cpp
5050
if: ${{ matrix.language == 'cpp' }}
5151
run: ./ninja -C build
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@v2
54+
uses: github/codeql-action/analyze@v3
5555
with:
5656
category: "/language:${{ matrix.language }}"

.github/workflows/regression.yml

Lines changed: 108 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- config_set: ReverseMPI
3131
flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
3232
- config_set: ForwardMPI
33-
flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true --warnlevel=3 --werror'
33+
flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror'
3434
- config_set: BaseNoMPI
3535
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
3636
- config_set: ReverseNoMPI
@@ -46,29 +46,29 @@ jobs:
4646
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
4747
steps:
4848
- name: Cache Object Files
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
with:
5151
path: ccache
5252
key: ${{ matrix.config_set }}-${{ github.sha }}
5353
restore-keys: ${{ matrix.config_set }}
5454
- name: Pre Cleanup
55-
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
55+
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
5656
with:
5757
entrypoint: /bin/rm
5858
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
5959
- name: Build
60-
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
60+
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
6161
with:
6262
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6363
- name: Compress binaries
6464
run: tar -zcvf install_bin.tgz install/*
6565
- name: Upload Binaries
66-
uses: actions/upload-artifact@v3
66+
uses: actions/upload-artifact@v4
6767
with:
6868
name: ${{ matrix.config_set }}
6969
path: install_bin.tgz
7070
- name: Post Cleanup
71-
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
71+
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
7272
with:
7373
entrypoint: /bin/rm
7474
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -89,29 +89,67 @@ jobs:
8989
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
9090
steps:
9191
- name: Cache Object Files
92-
uses: actions/cache@v3
92+
uses: actions/cache@v4
9393
with:
9494
path: ccache
9595
key: ${{ matrix.config_set }}-${{ github.sha }}
9696
restore-keys: ${{ matrix.config_set }}
9797
- name: Pre Cleanup
98-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
98+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
9999
with:
100100
entrypoint: /bin/rm
101101
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
102102
- name: Build
103-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
103+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
104104
with:
105105
args: -b ${{github.ref}} -f "${{matrix.flags}}"
106106
- name: Compress binaries
107107
run: tar -zcvf install_bin.tgz install/*
108108
- name: Upload Binaries
109-
uses: actions/upload-artifact@v3
109+
uses: actions/upload-artifact@v4
110110
with:
111111
name: ${{ matrix.config_set }}
112112
path: install_bin.tgz
113113
- name: Post Cleanup
114-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
114+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
115+
with:
116+
entrypoint: /bin/rm
117+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
118+
build_asan:
119+
name: Build SU2 (asan)
120+
strategy:
121+
fail-fast: false
122+
matrix:
123+
config_set: [BaseNoMPI-asan, ReverseNoMPI-asan]
124+
include:
125+
- config_set: BaseNoMPI-asan
126+
flags: '--buildtype=debugoptimized -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror'
127+
- config_set: ReverseNoMPI-asan
128+
flags: '--buildtype=debugoptimized -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror'
129+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
130+
steps:
131+
- name: Cache Object Files
132+
uses: actions/cache@v4
133+
with:
134+
path: ccache
135+
key: ${{ matrix.config_set }}-${{ github.sha }}
136+
restore-keys: ${{ matrix.config_set }}
137+
- name: Pre Cleanup
138+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
139+
with:
140+
entrypoint: /bin/rm
141+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
142+
- name: Build
143+
run: docker run --rm --cap-add SYS_PTRACE -v $(pwd):${{ github.workspace }} -w ${{ github.workspace }} ghcr.io/su2code/su2/build-su2-asan:240320-1536 -b ${{github.ref}} -f "${{matrix.flags}}"
144+
- name: Compress binaries
145+
run: tar -zcvf install_bin.tgz install/*
146+
- name: Upload Binaries
147+
uses: actions/upload-artifact@v4
148+
with:
149+
name: ${{ matrix.config_set }}
150+
path: install_bin.tgz
151+
- name: Post Cleanup
152+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
115153
with:
116154
entrypoint: /bin/rm
117155
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -142,12 +180,12 @@ jobs:
142180
tag: OMP
143181
steps:
144182
- name: Pre Cleanup
145-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
183+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
146184
with:
147185
entrypoint: /bin/rm
148186
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
149187
- name: Download All artifacts
150-
uses: actions/download-artifact@v3
188+
uses: actions/download-artifact@v4
151189
- name: Uncompress and Move Binaries
152190
run: |
153191
BIN_FOLDER="$PWD/install/bin"
@@ -168,12 +206,12 @@ jobs:
168206
chmod a+x $BIN_FOLDER/*
169207
ls -lahR $BIN_FOLDER
170208
- name: Run Tests in Container
171-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
209+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
172210
with:
173211
# -t <Tutorials-branch> -c <Testcases-branch>
174212
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
175213
- name: Cleanup
176-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
214+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
177215
with:
178216
entrypoint: /bin/rm
179217
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -188,12 +226,12 @@ jobs:
188226
testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
189227
steps:
190228
- name: Pre Cleanup
191-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
229+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
192230
with:
193231
entrypoint: /bin/rm
194232
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
195233
- name: Download All artifacts
196-
uses: actions/download-artifact@v3
234+
uses: actions/download-artifact@v4
197235
- name: Uncompress and Move Binaries
198236
run: |
199237
BIN_FOLDER="$PWD/install/bin"
@@ -214,12 +252,57 @@ jobs:
214252
chmod a+x $BIN_FOLDER/*
215253
ls -lahR $BIN_FOLDER
216254
- name: Run Tests in Container
217-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
255+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
218256
with:
219257
# -t <Tutorials-branch> -c <Testcases-branch>
220258
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
221259
- name: Cleanup
222-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
260+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
261+
with:
262+
entrypoint: /bin/rm
263+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
264+
address_sanitizer_tests:
265+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
266+
name: Address Sanitizer Tests
267+
needs: build_asan
268+
strategy:
269+
fail-fast: false
270+
matrix:
271+
testscript: ['serial_regression.py', 'serial_regression_AD.py']
272+
steps:
273+
- name: Pre Cleanup
274+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
275+
with:
276+
entrypoint: /bin/rm
277+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
278+
- name: Download All artifacts
279+
uses: actions/download-artifact@v4
280+
- name: Uncompress and Move Binaries
281+
run: |
282+
BIN_FOLDER="$PWD/install/bin"
283+
mkdir -p $BIN_FOLDER
284+
ls -lah $BIN_FOLDER
285+
for type in Base Reverse Forward; do
286+
TYPE_FOLDER="${type}NoMPI-asan"
287+
echo "Processing '$TYPE_FOLDER' ..."
288+
if [ -d $TYPE_FOLDER ]; then
289+
pushd $TYPE_FOLDER
290+
ls -lah
291+
tar -zxvf install_bin.tgz
292+
ls -lah install/bin/
293+
cp -r install/* $BIN_FOLDER/../
294+
popd;
295+
fi
296+
done
297+
chmod a+x $BIN_FOLDER/*
298+
ls -lahR $BIN_FOLDER
299+
- name: Run Tests in Container
300+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
301+
with:
302+
# -t <Tutorials-branch> -c <Testcases-branch>
303+
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
304+
- name: Cleanup
305+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
223306
with:
224307
entrypoint: /bin/rm
225308
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -240,22 +323,22 @@ jobs:
240323
tag: MPI
241324
steps:
242325
- name: Pre Cleanup
243-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
326+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
244327
with:
245328
entrypoint: /bin/rm
246329
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
247330
- name: Download Base
248-
uses: actions/download-artifact@v3
331+
uses: actions/download-artifact@v4
249332
with:
250333
name: ${{format('Base{0}', matrix.tag)}}
251334
path: ${{format('Base{0}', matrix.tag)}}
252335
- name: Download Reverse
253-
uses: actions/download-artifact@v3
336+
uses: actions/download-artifact@v4
254337
with:
255338
name: ${{format('Reverse{0}', matrix.tag)}}
256339
path: ${{format('Reverse{0}', matrix.tag)}}
257340
- name: Download Forward
258-
uses: actions/download-artifact@v3
341+
uses: actions/download-artifact@v4
259342
with:
260343
name: ${{format('Forward{0}', matrix.tag)}}
261344
path: ${{format('Forward{0}', matrix.tag)}}
@@ -301,11 +384,11 @@ jobs:
301384
echo $PWD
302385
ls -lahR
303386
- name: Run Unit Tests
304-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
387+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
305388
with:
306389
entrypoint: install/bin/${{matrix.testdriver}}
307390
- name: Post Cleanup
308-
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
391+
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
309392
with:
310393
entrypoint: /bin/rm
311394
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

.github/workflows/release-management.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- name: Cache Object Files
32-
uses: actions/cache@v3
32+
uses: actions/cache@v4
3333
with:
3434
path: ccache
3535
key: ${{ matrix.os_bin }}-${{ github.sha }}
@@ -44,7 +44,7 @@ jobs:
4444
zip -r ../${{matrix.os_bin}}.zip bin/*
4545
# Uploads binaries as artifacts (just as a backup)
4646
- name: Upload Binaries
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
with:
4949
name: ${{matrix.os_bin}}
5050
path: ${{matrix.os_bin}}.zip

.github/workflows/require-labels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
label:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: mheap/github-action-required-labels@v3
9+
- uses: mheap/github-action-required-labels@v5
1010
with:
1111
mode: exactly
1212
count: 1

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,6 @@
2727
[submodule "subprojects/MLPCpp"]
2828
path = subprojects/MLPCpp
2929
url = https://github.com/EvertBunschoten/MLPCpp.git
30+
[submodule "externals/FADO"]
31+
path = externals/FADO
32+
url = https://github.com/pcarruscag/FADO.git

AUTHORS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ Daumantas Kavolis
6969
Dave Taflin
7070
Eduardo Molina
7171
Edwin van der Weide
72+
Eitan Aberman
7273
Ethan Alan Hereth
7374
Florian Dittmann
75+
Filip Hahs
7476
Francesco Poli
7577
Francisco D. Palacios
7678
Gaurav Bansal
@@ -98,6 +100,7 @@ Kedar Naik
98100
Kürşat Yurt
99101
LaSerpe
100102
Lennaert Tol
103+
Liang Cheng
101104
Lisa Kusch
102105
Matteo Pini
103106
Max Aehle
@@ -106,6 +109,7 @@ Max Sagebaum
106109
Michele Gaffuri
107110
Mickael Philit
108111
Mladen Banovic
112+
Mor
109113
Nat-1
110114
Nicola Fonzi
111115
Nijso Beishuizen
@@ -132,11 +136,14 @@ Thomas D. Economon
132136
Tim Albring
133137
TobiKattmann
134138
Trent Lukaczyk
139+
Vikram Bharadwaj
135140
Vinzenz Götz
136141
VivaanKhatri
137142
Wally Maier
143+
Yair Mor-Yossef
138144
Y. Chandukrishna
139145
Zan Xu
146+
Zcaic
140147
aaronyicongfu
141148
aeroamit
142149
anilvar

0 commit comments

Comments
 (0)