Skip to content

Commit

Permalink
Merge pull request #1913 from su2code/develop
Browse files Browse the repository at this point in the history
Update master
  • Loading branch information
pcarruscag authored Feb 6, 2023
2 parents 1b08506 + 09ba9e3 commit b80e4ce
Show file tree
Hide file tree
Showing 1,013 changed files with 7,572 additions and 7,895 deletions.
20 changes: 20 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# .github/release.yml

changelog:
exclude:
labels:
- 'changelog:none'
categories:
- title: ':rocket: Experimental Features'
labels:
- 'changelog:feature'
- title: ':pill: Bug Fixes'
labels:
- 'changelog:fix'
- title: ':wrench: Maintenance'
labels:
- 'changelog:chore'
- title: 'Other Changes'
labels:
- "*"

2 changes: 1 addition & 1 deletion .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ staleLabel: stale
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs.
**If this is still a relevant issue please comment on it to restart the discussion.**
**If this is still a relevant issue please comment on it to restart the discussion.**
Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
40 changes: 20 additions & 20 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'develop'
- 'master'
pull_request:
branches:
branches:
- 'develop'
- 'master'
workflow_call:
Expand All @@ -22,7 +22,7 @@ jobs:
name: Build SU2
strategy:
fail-fast: false
matrix:
matrix:
config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP]
include:
- config_set: BaseMPI
Expand All @@ -32,7 +32,7 @@ jobs:
- config_set: ForwardMPI
flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true --warnlevel=3 --werror'
- config_set: BaseNoMPI
flags: '-Denable-pywrapper=true -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror'
- config_set: ReverseNoMPI
flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror'
- config_set: ForwardNoMPI
Expand All @@ -51,24 +51,24 @@ jobs:
path: ccache
key: ${{ matrix.config_set }}-${{ github.sha }}
restore-keys: ${{ matrix.config_set }}
- name: Pre Cleanup
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
- name: Pre Cleanup
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
- name: Build
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
- name: Build
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
with:
args: -b ${{github.ref}} -f "${{matrix.flags}}"
- name: Compress binaries
run: tar -zcvf install_bin.tgz install/bin
- name: Upload Binaries
- name: Upload Binaries
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.config_set }}
path: install_bin.tgz
- name: Post Cleanup
uses: docker://ghcr.io/su2code/su2/build-su2:221027-0442
uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
Expand All @@ -78,7 +78,7 @@ jobs:
needs: build
strategy:
fail-fast: false
matrix:
matrix:
testscript: ['vandv.py', 'tutorials.py', 'parallel_regression.py', 'parallel_regression_AD.py', 'serial_regression.py', 'serial_regression_AD.py', 'hybrid_regression.py', 'hybrid_regression_AD.py']
include:
- testscript: 'vandv.py'
Expand All @@ -99,7 +99,7 @@ jobs:
tag: OMP
steps:
- name: Pre Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
Expand All @@ -119,18 +119,18 @@ jobs:
tar -zxvf install_bin.tgz
ls -lah install/bin/
cp -r install/bin/* $BIN_FOLDER;
popd;
popd;
fi
done
chmod a+x $BIN_FOLDER/*
ls -lahR $BIN_FOLDER
- name: Run Tests in Container
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
# -t <Tutorials-branch> -c <Testcases-branch>
args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}}
- name: Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
Expand All @@ -150,8 +150,8 @@ jobs:
- testdriver: 'test_driver_DD'
tag: MPI
steps:
- name: Pre Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
- name: Pre Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
Expand Down Expand Up @@ -196,8 +196,8 @@ jobs:
branch="${{github.ref}}"
name="SU2"
SRC_FOLDER="$PWD/src"
mkdir -p $SRC_FOLDER
cd $SRC_FOLDER
mkdir -p $SRC_FOLDER
cd $SRC_FOLDER
git clone --recursive --depth=1 --shallow-submodules https://github.com/su2code/SU2 $name
cd $name
git config --add remote.origin.fetch '+refs/pull/*/merge:refs/remotes/origin/refs/pull/*/merge'
Expand All @@ -212,11 +212,11 @@ jobs:
echo $PWD
ls -lahR
- name: Run Unit Tests
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
entrypoint: install/bin/${{matrix.testdriver}}
- name: Post Cleanup
uses: docker://ghcr.io/su2code/su2/test-su2:220614-1237
uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158
with:
entrypoint: /bin/rm
args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }}
4 changes: 2 additions & 2 deletions .github/workflows/release-management.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
key: ${{ matrix.os_bin }}-${{ github.sha }}
restore-keys: ${{ matrix.os_bin }}
- name: Build
uses: docker://ghcr.io/su2code/su2/build-su2-cross:220716-1459
uses: docker://ghcr.io/su2code/su2/build-su2-cross:221224-1158
with:
args: -b ${{ github.sha }} -f "${{matrix.flags}}"
- name: Create Archive
Expand Down Expand Up @@ -65,4 +65,4 @@ jobs:
asset_path: ${{matrix.os_bin}}.zip
asset_name: SU2-${{ steps.update_release.outputs.tagname }}-${{matrix.os_bin}}.zip
asset_content_type: application/zip

4 changes: 4 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ in collaboration with the following main contributors and research teams:
Copyright holders might be the individual person or their respective employer. If no real name is available, the Github user name is listed.

```
Aidan Jungo
Akshay.K.R
Alejandro
Alessandro Gastaldi
Expand Down Expand Up @@ -90,6 +91,7 @@ Jessie Lauzon
João Loureiro
Johannes Blühdorn
JonathanSmith1936
Josy P. Pullockara
Kedar Naik
LaSerpe
Lennaert Tol
Expand Down Expand Up @@ -121,13 +123,15 @@ Scott Imlay
Steffen Schotthöfer
Steven Endres
Sunoh Kang
T. N. Venkatesh
Teus van der Stelt
Thomas D. Economon
Tim Albring
TobiKattmann
Trent Lukaczyk
VivaanKhatri
Wally Maier
Y. Chandukrishna
Zan Xu
aaronyicongfu
aeroamit
Expand Down
Loading

0 comments on commit b80e4ce

Please sign in to comment.