Skip to content

Commit 1552b3c

Browse files
bigfootedbigfooted
authored
Merge branch 'develop' into dependabot/github_actions/actions/checkout-5
2 parents 1b59331 + 8f0e9b9 commit 1552b3c

File tree

131 files changed

+16634
-5286
lines changed

Some content is hidden

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

131 files changed

+16634
-5286
lines changed

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
3535
- name: Configure (cpp)
3636
if: ${{ matrix.language == 'cpp' }}
37-
run: ./meson.py build --optimization=1
37+
run: ./meson.py setup build --optimization=1
3838

3939
- name: Initialize CodeQL
4040
uses: github/codeql-action/init@v3

‎.github/workflows/regression.yml‎

Lines changed: 73 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
26+
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, ReverseTagNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
2727
include:
2828
- config_set: BaseMPI
2929
flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2'
@@ -37,6 +37,8 @@ jobs:
3737
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
3838
- config_set: ForwardNoMPI
3939
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
40+
- config_set: ReverseTagNoMPI
41+
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror -Dcodi-tape=Tag'
4042
- config_set: BaseOMP
4143
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4244
- config_set: ReverseOMP
@@ -52,12 +54,12 @@ jobs:
5254
key: ${{ matrix.config_set }}-${{ github.sha }}
5355
restore-keys: ${{ matrix.config_set }}
5456
- name: Pre Cleanup
55-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
57+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
5658
with:
5759
entrypoint: /bin/rm
5860
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
5961
- name: Build
60-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
62+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
6163
with:
6264
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6365
- name: Compress binaries
@@ -68,7 +70,7 @@ jobs:
6870
name: ${{ matrix.config_set }}
6971
path: install_bin.tgz
7072
- name: Post Cleanup
71-
uses: docker://ghcr.io/su2code/su2/build-su2:240320-1536
73+
uses: docker://ghcr.io/su2code/su2/build-su2:250717-1402
7274
with:
7375
entrypoint: /bin/rm
7476
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -95,12 +97,12 @@ jobs:
9597
key: ${{ matrix.config_set }}-${{ github.sha }}
9698
restore-keys: ${{ matrix.config_set }}
9799
- name: Pre Cleanup
98-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
100+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
99101
with:
100102
entrypoint: /bin/rm
101103
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
102104
- name: Build
103-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
105+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
104106
with:
105107
args: -b ${{github.ref}} -f "${{matrix.flags}}"
106108
- name: Compress binaries
@@ -111,7 +113,7 @@ jobs:
111113
name: ${{ matrix.config_set }}
112114
path: install_bin.tgz
113115
- name: Post Cleanup
114-
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:240320-1536
116+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:250717-1402
115117
with:
116118
entrypoint: /bin/rm
117119
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -135,12 +137,12 @@ jobs:
135137
key: ${{ matrix.config_set }}-${{ github.sha }}
136138
restore-keys: ${{ matrix.config_set }}
137139
- name: Pre Cleanup
138-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
140+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
139141
with:
140142
entrypoint: /bin/rm
141143
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
142144
- 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}}"
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}}"
144146
- name: Compress binaries
145147
run: tar -zcvf install_bin.tgz install/*
146148
- name: Upload Binaries
@@ -149,7 +151,7 @@ jobs:
149151
name: ${{ matrix.config_set }}
150152
path: install_bin.tgz
151153
- name: Post Cleanup
152-
uses: docker://ghcr.io/su2code/su2/build-su2-asan:240320-1536
154+
uses: docker://ghcr.io/su2code/su2/build-su2-asan:250717-1402
153155
with:
154156
entrypoint: /bin/rm
155157
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -180,7 +182,7 @@ jobs:
180182
tag: OMP
181183
steps:
182184
- name: Pre Cleanup
183-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
185+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
184186
with:
185187
entrypoint: /bin/rm
186188
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -206,12 +208,61 @@ jobs:
206208
chmod a+x $BIN_FOLDER/*
207209
ls -lahR $BIN_FOLDER
208210
- name: Run Tests in Container
209-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
211+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
210212
with:
211213
# -t <Tutorials-branch> -c <Testcases-branch>
212214
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
213215
- name: Cleanup
214-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
216+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
217+
with:
218+
entrypoint: /bin/rm
219+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
220+
discadj_tape_tests:
221+
if: inputs.runner != 'ARM64'
222+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
223+
name: Tape Tests
224+
needs: build
225+
strategy:
226+
fail-fast: false
227+
matrix:
228+
testscript: ['serial_regression_AD.py']
229+
include:
230+
- testscript: 'serial_regression_AD.py'
231+
tag: TagNoMPI
232+
steps:
233+
- name: Pre Cleanup
234+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
235+
with:
236+
entrypoint: /bin/rm
237+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
238+
- name: Download All artifacts
239+
uses: actions/download-artifact@v4
240+
- name: Uncompress and Move Binaries
241+
run: |
242+
BIN_FOLDER="$PWD/install/bin"
243+
mkdir -p $BIN_FOLDER
244+
ls -lah $BIN_FOLDER
245+
for type in Base Reverse Forward; do
246+
TYPE_FOLDER="${type}${{matrix.tag}}"
247+
echo "Processing '$TYPE_FOLDER' ..."
248+
if [ -d $TYPE_FOLDER ]; then
249+
pushd $TYPE_FOLDER
250+
ls -lah
251+
tar -zxvf install_bin.tgz
252+
ls -lah install/bin/
253+
cp -r install/* $BIN_FOLDER/../
254+
popd;
255+
fi
256+
done
257+
chmod a+x $BIN_FOLDER/*
258+
ls -lahR $BIN_FOLDER
259+
- name: Run Tests in Container
260+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
261+
with:
262+
# -t <Tutorials-branch> -c <Testcases-branch>
263+
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tapetests"
264+
- name: Cleanup
265+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
215266
with:
216267
entrypoint: /bin/rm
217268
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -226,7 +277,7 @@ jobs:
226277
testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
227278
steps:
228279
- name: Pre Cleanup
229-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
280+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
230281
with:
231282
entrypoint: /bin/rm
232283
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -252,12 +303,12 @@ jobs:
252303
chmod a+x $BIN_FOLDER/*
253304
ls -lahR $BIN_FOLDER
254305
- name: Run Tests in Container
255-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
306+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
256307
with:
257308
# -t <Tutorials-branch> -c <Testcases-branch>
258309
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
259310
- name: Cleanup
260-
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:240320-1536
311+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:250717-1402
261312
with:
262313
entrypoint: /bin/rm
263314
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -271,7 +322,7 @@ jobs:
271322
testscript: ['serial_regression.py', 'serial_regression_AD.py']
272323
steps:
273324
- name: Pre Cleanup
274-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
325+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
275326
with:
276327
entrypoint: /bin/rm
277328
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -297,12 +348,12 @@ jobs:
297348
chmod a+x $BIN_FOLDER/*
298349
ls -lahR $BIN_FOLDER
299350
- name: Run Tests in Container
300-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
351+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
301352
with:
302353
# -t <Tutorials-branch> -c <Testcases-branch>
303354
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--asan"
304355
- name: Cleanup
305-
uses: docker://ghcr.io/su2code/su2/test-su2-asan:240320-1536
356+
uses: docker://ghcr.io/su2code/su2/test-su2-asan:250717-1402
306357
with:
307358
entrypoint: /bin/rm
308359
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -323,7 +374,7 @@ jobs:
323374
tag: MPI
324375
steps:
325376
- name: Pre Cleanup
326-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
377+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
327378
with:
328379
entrypoint: /bin/rm
329380
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -384,11 +435,11 @@ jobs:
384435
echo $PWD
385436
ls -lahR
386437
- name: Run Unit Tests
387-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
438+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
388439
with:
389440
entrypoint: install/bin/${{matrix.testdriver}}
390441
- name: Post Cleanup
391-
uses: docker://ghcr.io/su2code/su2/test-su2:240320-1536
442+
uses: docker://ghcr.io/su2code/su2/test-su2:250717-1402
392443
with:
393444
entrypoint: /bin/rm
394445
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:230813-0103
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:250717-1402
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive

‎.gitignore‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,10 @@ su2preconfig.timestamp
103103

104104
# Clangd server files
105105
.cache
106+
107+
108+
109+
ninja-win.zip
110+
ninja.exe
111+
.gitignore
112+
Docs/html

0 commit comments

Comments
 (0)