forked from libprima/prima
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into python_binding
- Loading branch information
Showing
14 changed files
with
166 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2256,3 +2256,6 @@ tcpclient | |
| tomemoryview | ||
| scm | ||
| nuj | ||
| PARKCH | ||
| TESTQUAD | ||
| WAITALL | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,10 @@ jobs: | |
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| fail-fast: false | ||
|
|
||
| # The matrix is essentially the same as that of test_matlab.yml | ||
| matrix: | ||
| os: [macos-11, macos-12, macos-13, ubuntu-20.04, ubuntu-22.04] | ||
| os: [ubuntu-20.04, ubuntu-22.04, macos-11, macos-12, macos-13] | ||
| matlab: [R2020b, R2021a, R2021b, R2022a, R2022b, R2023a, R2023b, R2024a] | ||
|
|
||
| include: | ||
|
|
@@ -89,14 +91,25 @@ jobs: | |
| fi | ||
| bash .github/scripts/link_gfortran "$GFVER" | ||
| - name: Decide the version of oneAPI to use | ||
| shell: bash | ||
| run: | | ||
| ONEAPI_VERSION= | ||
| if [[ "${{ matrix.os }}" = "windows-"* ]] ; then | ||
| if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then | ||
| ONEAPI_VERSION=2023 | ||
| fi | ||
| fi | ||
| echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV | ||
| echo "ONEAPI_VERSION:" $ONEAPI_VERSION | ||
| - name: Install Intel oneAPI on macOS | ||
| if: startsWith(matrix.os, 'macos') | ||
| run: bash .github/scripts/install_oneapi_macos.sh | ||
| run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION | ||
|
|
||
| - name: Install Intel oneAPI on Windows | ||
| if: startsWith(matrix.os, 'windows') | ||
| #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"' # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later. | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"' | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' | ||
|
|
||
| - name: Set up MATLAB | ||
| uses: matlab-actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,14 +71,25 @@ jobs: | |
| if: startsWith(matrix.os, 'ubuntu') | ||
| run: bash .github/scripts/link_gfortran ${{ env.GFORTRAN_VERSION }} | ||
|
|
||
| - name: Decide the version of oneAPI to use | ||
| shell: bash | ||
| run: | | ||
| ONEAPI_VERSION= | ||
| if [[ "${{ matrix.os }}" = "windows-"* ]] ; then | ||
| if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then | ||
| ONEAPI_VERSION=2023 | ||
| fi | ||
| fi | ||
| echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV | ||
| echo "ONEAPI_VERSION:" $ONEAPI_VERSION | ||
| - name: Install Intel oneAPI on macOS | ||
| if: startsWith(matrix.os, 'macos') | ||
| run: bash .github/scripts/install_oneapi_macos.sh | ||
| run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION | ||
|
|
||
| - name: Install Intel oneAPI on Windows | ||
| if: startsWith(matrix.os, 'windows') | ||
| #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"' # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later. | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"' | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' | ||
|
|
||
| - name: Set up MATLAB with optimization toolbox | ||
| uses: matlab-actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,6 +33,8 @@ jobs: | |
| continue-on-error: true | ||
| strategy: | ||
| fail-fast: false | ||
|
|
||
| # The matrix is the same as that of stress_test_matlab.yml. | ||
| matrix: | ||
| os: [ubuntu-20.04, ubuntu-latest, windows-2019, windows-latest, macos-11, macos-12, macos-13] | ||
| matlab: [R2020b, R2021a, R2022a, R2023a, latest] | ||
|
|
@@ -136,14 +138,25 @@ jobs: | |
| fi | ||
| bash .github/scripts/link_gfortran "$GFVER" | ||
| - name: Decide the version of oneAPI to use | ||
| shell: bash | ||
| run: | | ||
| ONEAPI_VERSION= | ||
| if [[ "${{ matrix.os }}" = "windows-"* ]] ; then | ||
| if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then | ||
| ONEAPI_VERSION=2023 | ||
| fi | ||
| fi | ||
| echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV | ||
| echo "ONEAPI_VERSION:" $ONEAPI_VERSION | ||
| - name: Install Intel oneAPI on macOS | ||
| if: startsWith(matrix.os, 'macos') | ||
| run: bash .github/scripts/install_oneapi_macos.sh | ||
| run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION | ||
|
|
||
| - name: Install Intel oneAPI on Windows | ||
| if: startsWith(matrix.os, 'windows') | ||
| #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"' # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later. | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"' | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' | ||
|
|
||
| - name: Set up MATLAB with optimization toolbox | ||
| uses: matlab-actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,12 +115,13 @@ jobs: | |
| cd "$ROOT_DIR"/fortran/tests | ||
| export TESTDIM=${{ matrix.testdim }} | ||
| RK=$((2**($(date +%-d) % 3 + 2))) | ||
| echo "RK = " $RK | ||
| if [[ $RK==16 && dfrv == *${{ matrix.compiler }}* ]] ; then | ||
| echo "r16 test is skipped for compiler " ${{ matrix.compiler }} | ||
| else | ||
| make ${{ matrix.compiler }}test_i2_r${RK}_d1_tst.${{ matrix.solver }} | ||
| echo "Test r8 instead" | ||
| RK=8 | ||
| fi | ||
| echo "RK = " $RK | ||
| make ${{ matrix.compiler }}test_i2_r${RK}_d1_tst.${{ matrix.solver }} | ||
| - name: Store artifacts | ||
| uses: actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,8 @@ jobs: | |
| continue-on-error: true | ||
| strategy: | ||
| fail-fast: false | ||
|
|
||
| # The matrix is the same as that of recursive_test_matlab.yml, except for `test`. | ||
| matrix: | ||
| os: [ubuntu-20.04, ubuntu-latest, windows-2019, windows-latest, macos-11, macos-12, macos-13] | ||
| matlab: [R2020b, R2021a, R2022a, R2023a, latest] | ||
|
|
@@ -134,14 +136,25 @@ jobs: | |
| fi | ||
| bash .github/scripts/link_gfortran "$GFVER" | ||
| - name: Decide the version of oneAPI to use | ||
| shell: bash | ||
| run: | | ||
| ONEAPI_VERSION= | ||
| if [[ "${{ matrix.os }}" = "windows-"* ]] ; then | ||
| if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then | ||
| ONEAPI_VERSION=2023 | ||
| fi | ||
| fi | ||
| echo "ONEAPI_VERSION=$ONEAPI_VERSION" >> $GITHUB_ENV | ||
| echo "ONEAPI_VERSION:" $ONEAPI_VERSION | ||
| - name: Install Intel oneAPI on macOS | ||
| if: startsWith(matrix.os, 'macos') | ||
| run: bash .github/scripts/install_oneapi_macos.sh | ||
| run: bash .github/scripts/install_oneapi_macos.sh $ONEAPI_VERSION | ||
|
|
||
| - name: Install Intel oneAPI on Windows | ||
| if: startsWith(matrix.os, 'windows') | ||
| #run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat"' # As of MATLAB R2023a, oneAPI 2024 does not work. Try again later. | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat 2023"' | ||
| run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' | ||
|
|
||
| - name: Set up MATLAB with optimization toolbox | ||
| uses: matlab-actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.