Skip to content

Commit 6027069

Browse files
pcarruscagpcarruscag
authored
Merge pull request #2121 from su2code/develop
Update master
2 parents b80e4ce + 1fe5981 commit 6027069

File tree

1,150 files changed

+71281
-208783
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,150 files changed

+71281
-208783
lines changed

‎.clang-format‎

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

‎.clang-tidy‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Checks: '-*,modernize-avoid-bind,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-macro-to-enum,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-disallow-copy-and-assign-macro,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-using,readability-const-return-type,readability-avoid-const-params-in-decls,readability-container-data-pointer,readability-container-size-empty,readability-delete-null-pointer,readability-duplicate-include,readability-non-const-parameter,readability-redundant-access-specifiers,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-else-after-return,performance-*'
2+
CheckOptions:
3+
- {key: modernize-use-override.AllowOverrideAndFinal, value: 'true'}
4+
- {key: performance-unnecessary-copy-initialization.AllowedTypes, value: 'su2double'}
5+
- {key: performance-unnecessary-value-param.AllowedTypes, value: 'su2double'}

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@ assignees: ''
2626
- C++ compiler and version: [e.g., g++ (GCC) 4.8.5]
2727
- MPI implementation and version: [e.g., OpenMPI 3.0.0]
2828
- SU2 Version: [e.g., v6.2.0]
29-

‎.github/pull_request_template.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## Proposed Changes
22
*Give a brief overview of your contribution here in a few sentences.*
3-
3+
44

55

66
## Related Work
@@ -14,5 +14,6 @@
1414
- [ ] I am submitting my contribution to the develop branch.
1515
- [ ] My contribution generates no new compiler warnings (try with --warnlevel=3 when using meson).
1616
- [ ] My contribution is commented and consistent with SU2 style (https://su2code.github.io/docs_v7/Style-Guide/).
17+
- [ ] I used the pre-commit hook to prevent dirty commits and used `pre-commit run --all` to format old commits.
1718
- [ ] I have added a test case that demonstrates my contribution, if necessary.
1819
- [ ] I have updated appropriate documentation (Tutorials, Docs Page, config_template.cpp), if necessary.

‎.github/release.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ changelog:
1717
- title: 'Other Changes'
1818
labels:
1919
- "*"
20-

‎.github/workflows/change-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: extract_branch
1717
- name: Change the version number
1818
run: |
19-
SU2_PY/change_version_number.py -v ${GITHUB_REF##*/release_v} -r Blackbird -y
19+
SU2_PY/change_version_number.py -v ${GITHUB_REF##*/release_v} -r Harrier -y
2020
- name: Commit files
2121
run: |
2222
git config --local user.email "[email protected]"

‎.github/workflows/code-style.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Code Style
2+
on:
3+
pull_request:
4+
paths:
5+
- "**.[ch]pp"
6+
- "**.[ch]"
7+
- "**.cfg"
8+
- "**.py"
9+
10+
jobs:
11+
formatting:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v3
16+
- name: Setup python
17+
uses: actions/setup-python@v4
18+
with:
19+
python-version: '3.10'
20+
check-latest: true
21+
- name: Install pre-commit
22+
run: pip install pre-commit
23+
- name: Run checks
24+
run: pre-commit run -a -v
25+
- name: Git status
26+
if: always()
27+
run: git status
28+
- name: Full diff
29+
if: always()
30+
run: git diff

‎.github/workflows/regression.yml‎

Lines changed: 105 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,23 @@ jobs:
2626
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
2727
include:
2828
- config_set: BaseMPI
29-
flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-tests=true --warnlevel=2 --werror'
29+
flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2'
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
3333
flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true --warnlevel=3 --werror'
3434
- config_set: BaseNoMPI
35-
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
35+
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror'
3636
- config_set: ReverseNoMPI
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'
4040
- config_set: BaseOMP
4141
flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4242
- config_set: ReverseOMP
43-
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
43+
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4444
- config_set: ForwardOMP
45-
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3 --werror'
45+
flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
4646
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
4747
steps:
4848
- name: Cache Object Files
@@ -52,23 +52,66 @@ jobs:
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:221224-1158
55+
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
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:221224-1158
60+
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
6161
with:
6262
args: -b ${{github.ref}} -f "${{matrix.flags}}"
6363
- name: Compress binaries
64-
run: tar -zcvf install_bin.tgz install/bin
64+
run: tar -zcvf install_bin.tgz install/*
6565
- name: Upload Binaries
6666
uses: actions/upload-artifact@v3
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:221224-1158
71+
uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103
72+
with:
73+
entrypoint: /bin/rm
74+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
75+
build_tsan:
76+
name: Build SU2 (tsan)
77+
if: inputs.runner != 'ARM64'
78+
strategy:
79+
fail-fast: false
80+
matrix:
81+
config_set: [BaseOMP-tsan, ReverseOMP-tsan] #ForwardOMP-tsan
82+
include:
83+
- config_set: BaseOMP-tsan
84+
flags: '--buildtype=debugoptimized -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
85+
- config_set: ReverseOMP-tsan
86+
flags: '--buildtype=debugoptimized -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3'
87+
#- config_set: ForwardOMP-tsan
88+
# flags: '--buildtype=debug -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror'
89+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
90+
steps:
91+
- name: Cache Object Files
92+
uses: actions/cache@v3
93+
with:
94+
path: ccache
95+
key: ${{ matrix.config_set }}-${{ github.sha }}
96+
restore-keys: ${{ matrix.config_set }}
97+
- name: Pre Cleanup
98+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
99+
with:
100+
entrypoint: /bin/rm
101+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
102+
- name: Build
103+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
104+
with:
105+
args: -b ${{github.ref}} -f "${{matrix.flags}}"
106+
- name: Compress binaries
107+
run: tar -zcvf install_bin.tgz install/*
108+
- name: Upload Binaries
109+
uses: actions/upload-artifact@v3
110+
with:
111+
name: ${{ matrix.config_set }}
112+
path: install_bin.tgz
113+
- name: Post Cleanup
114+
uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103
72115
with:
73116
entrypoint: /bin/rm
74117
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -99,7 +142,7 @@ jobs:
99142
tag: OMP
100143
steps:
101144
- name: Pre Cleanup
102-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
145+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
103146
with:
104147
entrypoint: /bin/rm
105148
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -118,19 +161,65 @@ jobs:
118161
ls -lah
119162
tar -zxvf install_bin.tgz
120163
ls -lah install/bin/
121-
cp -r install/bin/* $BIN_FOLDER;
164+
cp -r install/* $BIN_FOLDER/../
122165
popd;
123166
fi
124167
done
125168
chmod a+x $BIN_FOLDER/*
126169
ls -lahR $BIN_FOLDER
127170
- name: Run Tests in Container
128-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
171+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
129172
with:
130173
# -t <Tutorials-branch> -c <Testcases-branch>
131174
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
132175
- name: Cleanup
133-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
176+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
177+
with:
178+
entrypoint: /bin/rm
179+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
180+
thread_sanitizer_tests:
181+
if: inputs.runner != 'ARM64'
182+
runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
183+
name: Thread Sanitizer Tests
184+
needs: build_tsan
185+
strategy:
186+
fail-fast: false
187+
matrix:
188+
testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py']
189+
steps:
190+
- name: Pre Cleanup
191+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
192+
with:
193+
entrypoint: /bin/rm
194+
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
195+
- name: Download All artifacts
196+
uses: actions/download-artifact@v3
197+
- name: Uncompress and Move Binaries
198+
run: |
199+
BIN_FOLDER="$PWD/install/bin"
200+
mkdir -p $BIN_FOLDER
201+
ls -lah $BIN_FOLDER
202+
for type in Base Reverse Forward; do
203+
TYPE_FOLDER="${type}OMP-tsan"
204+
echo "Processing '$TYPE_FOLDER' ..."
205+
if [ -d $TYPE_FOLDER ]; then
206+
pushd $TYPE_FOLDER
207+
ls -lah
208+
tar -zxvf install_bin.tgz
209+
ls -lah install/bin/
210+
cp -r install/* $BIN_FOLDER/../
211+
popd;
212+
fi
213+
done
214+
chmod a+x $BIN_FOLDER/*
215+
ls -lahR $BIN_FOLDER
216+
- name: Run Tests in Container
217+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
218+
with:
219+
# -t <Tutorials-branch> -c <Testcases-branch>
220+
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan"
221+
- name: Cleanup
222+
uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103
134223
with:
135224
entrypoint: /bin/rm
136225
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -151,7 +240,7 @@ jobs:
151240
tag: MPI
152241
steps:
153242
- name: Pre Cleanup
154-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
243+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
155244
with:
156245
entrypoint: /bin/rm
157246
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
@@ -184,7 +273,7 @@ jobs:
184273
ls -lah
185274
tar -zxvf install_bin.tgz
186275
ls -laH install/bin/
187-
cp -r install/bin/* $BIN_FOLDER;
276+
cp -r install/* $BIN_FOLDER/../
188277
popd;
189278
else
190279
echo "$TYPE_FOLDER does not exist!"
@@ -212,11 +301,11 @@ jobs:
212301
echo $PWD
213302
ls -lahR
214303
- name: Run Unit Tests
215-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
304+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
216305
with:
217306
entrypoint: install/bin/${{matrix.testdriver}}
218307
- name: Post Cleanup
219-
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
308+
uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103
220309
with:
221310
entrypoint: /bin/rm
222311
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}

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

Lines changed: 1 addition & 2 deletions
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:221224-1158
38+
uses: docker://ghcr.io/su2code/su2/build-su2-cross:230813-0103
3939
with:
4040
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
4141
- name: Create Archive
@@ -65,4 +65,3 @@ jobs:
6565
asset_path: ${{matrix.os_bin}}.zip
6666
asset_name: SU2-${{ steps.update_release.outputs.tagname }}-${{matrix.os_bin}}.zip
6767
asset_content_type: application/zip
68-

‎.github/workflows/require-labels.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Pull Request Labels
2+
on:
3+
pull_request:
4+
types: [opened, labeled, unlabeled, synchronize]
5+
jobs:
6+
label:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: mheap/github-action-required-labels@v3
10+
with:
11+
mode: exactly
12+
count: 1
13+
labels: "changelog:feature, changelog:fix, changelog:chore"

0 commit comments

Comments
 (0)