From f87faf9c5f5ab9bf408edbf835951ef13a5049d2 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 05:58:46 +0800 Subject: [PATCH 01/23] 240422.055846.HKT update test_flang.yml to set `maxtr = 6000` for both `ikind = i4` and `ikind = i8` in order to investigate the error "GitHub Actions xx lost communication with the server" --- .github/workflows/test_flang.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_flang.yml b/.github/workflows/test_flang.yml index 13337559d1..5259419659 100644 --- a/.github/workflows/test_flang.yml +++ b/.github/workflows/test_flang.yml @@ -57,8 +57,10 @@ jobs: - name: Revise maxtr # This is to see whether "GitHub Actions xx lost communication with the server" was caused # by maxtr = huge(maxtr) - 1_IK. We suspect this because the error occurs with ikind = i8 - # but not ikind = i2. - if: ${{ matrix.ikind == 'i8' }} + # and ikind = i4 for all solvers when testdim = small, but not with ikind = i2 at all. + # Update 20240422: The error does not occur any more after the update. WHY? Does this imply + # INFINITE CYCLING in the code? + if: ${{ matrix.ikind != 'i2' }} run: | cd fortran/${{ matrix.solver }} $SEDI 's|maxtr = huge(maxtr) - 1_IK|maxtr = 60000|' *.f90 From 7ec049ce282ccf2f29104e2a3f3e0d73b101c67e Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 06:09:33 +0800 Subject: [PATCH 02/23] 240422.060933.HKT [skip ci] revise profile_npt.yml --- .github/workflows/profile_npt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/profile_npt.yml b/.github/workflows/profile_npt.yml index 1178075ccd..217607e3e2 100644 --- a/.github/workflows/profile_npt.yml +++ b/.github/workflows/profile_npt.yml @@ -156,9 +156,9 @@ jobs: options.blacklist = {'CHEBYQAD', 'HOLMES', 'LEVYMONT', 'BQPGASIM', 'DECONVU', 'DECONVB', '3PK'}; end prof('${{ matrix.solver }}', '${{ matrix.dim }}', 'b', '${{ matrix.competitor }}', options); - else + else % newuoa if ismember('${{ matrix.npt }}', {'n*sqrt(n)', '0.25*n*n', '0.5*(n+1)*(n+2)', '3*n', '4*n'}) - options.blacklist = {'ARGLINA', 'ARGLINB', 'ARGLINC', 'BA-L1LS', 'BA-L1SPLS', 'CHNROSNB', 'CHNRSNBM', 'ERRINROS', 'FBRAIN3LS', 'LUKSAN11LS', 'LUKSAN13LS', 'LUKSAN15LS', 'LUKSAN16LS', 'QING', 'SENSORS', 'SPIN2LS', 'TOINTPSP', 'TOINTQOR', 'METHANB8LS', 'TOINTGOR'}; + options.blacklist = {'ARGLINA', 'ARGLINB', 'ARGLINC', 'BA-L1LS', 'BA-L1SPLS', 'CHNROSNB', 'CHNRSNBM', 'ERRINROS', 'FBRAIN3LS', 'LUKSAN11LS', 'LUKSAN13LS', 'LUKSAN15LS', 'LUKSAN16LS', 'QING', 'SENSORS', 'SPIN2LS', 'TOINTPSP', 'TOINTQOR', 'METHANB8LS', 'TOINTGOR', 'HYDCAR6LS', 'METHANL8LS', 'PARKCH'}; end prof('${{ matrix.solver }}', '${{ matrix.dim }}', '${{ matrix.competitor }}', options); end From 26c75dbec682ff4688cc281598982f704fa8f423 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 06:19:32 +0800 Subject: [PATCH 03/23] 240422.061932.HKT [skip ci] revise comments for the matrices in matlab test ymls --- .github/workflows/compile_mex.yml | 4 +++- .github/workflows/recursive_test_matlab.yml | 2 ++ .github/workflows/stress_test_matlab.yml | 2 ++ .github/workflows/test_matlab.yml | 2 ++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/compile_mex.yml b/.github/workflows/compile_mex.yml index 66b4ee0903..56f3f3cfea 100644 --- a/.github/workflows/compile_mex.yml +++ b/.github/workflows/compile_mex.yml @@ -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: diff --git a/.github/workflows/recursive_test_matlab.yml b/.github/workflows/recursive_test_matlab.yml index 922be72f76..e7e3e9ebd1 100644 --- a/.github/workflows/recursive_test_matlab.yml +++ b/.github/workflows/recursive_test_matlab.yml @@ -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] diff --git a/.github/workflows/stress_test_matlab.yml b/.github/workflows/stress_test_matlab.yml index 3cceb8abd5..1cb8af9c29 100644 --- a/.github/workflows/stress_test_matlab.yml +++ b/.github/workflows/stress_test_matlab.yml @@ -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] diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml index 98aa844a86..6cab6e4827 100644 --- a/.github/workflows/test_matlab.yml +++ b/.github/workflows/test_matlab.yml @@ -24,6 +24,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false + + # The matrix is essentially the same as that of compile_mex.yml matrix: os: [ubuntu-20.04, ubuntu-latest, macos-11, macos-12, macos-13] matlab: [R2020b, R2021a, R2021b, R2022a, R2022b, R2023a, R2023b, R2024a, latest] From 3856a228e54dbb84b698538353574c0acf554a4f Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 11:14:36 +0800 Subject: [PATCH 04/23] 240422.111436.HKT revise test_flang.yml regarding maxtr --- .github/workflows/test_flang.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_flang.yml b/.github/workflows/test_flang.yml index 5259419659..5fd1ec22c3 100644 --- a/.github/workflows/test_flang.yml +++ b/.github/workflows/test_flang.yml @@ -13,9 +13,12 @@ on: git-ref: description: Git Ref (Optional) required: false + maxtr: + description: Maximum number of trust-region iterations + required: false # Show the git ref in the workflow name if it is invoked manually. -run-name: ${{ github.event_name == 'workflow_dispatch' && format('Manual run {0}', inputs.git-ref) || '' }} +run-name: ${{ github.event_name == 'workflow_dispatch' && format('Manual run {0}, maxtr {1}', inputs.git-ref, inputs.maxtr) || '' }} jobs: @@ -60,10 +63,10 @@ jobs: # and ikind = i4 for all solvers when testdim = small, but not with ikind = i2 at all. # Update 20240422: The error does not occur any more after the update. WHY? Does this imply # INFINITE CYCLING in the code? - if: ${{ matrix.ikind != 'i2' }} + if: ${{ matrix.ikind != 'i2' && github.event.inputs.maxtr != '' }} run: | cd fortran/${{ matrix.solver }} - $SEDI 's|maxtr = huge(maxtr) - 1_IK|maxtr = 60000|' *.f90 + $SEDI 's|maxtr = huge(maxtr) - 1_IK|maxtr = ${{ github.event.inputs.maxtr }}|' *.f90 grep 'maxtr = ' *.f90 - name: Conduct the test From a0ea91b6cb6f57cdf1b1c5a30a437222aa33c38a Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 11:32:29 +0800 Subject: [PATCH 05/23] 240422.113229.HKT [skip ci] revise allow.txt --- .github/actions/spelling/allow.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index 4bf46c316e..b0b778bb49 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -2190,3 +2190,4 @@ nosplash noopengl ogfile nend +PARKCH From 01432153ef64248b2d05655381c640be56729227 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 11:34:14 +0800 Subject: [PATCH 06/23] 240422.113414.HKT [skip ci] revise allow.txt --- .github/actions/spelling/allow.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt index b0b778bb49..2ddc64471f 100644 --- a/.github/actions/spelling/allow.txt +++ b/.github/actions/spelling/allow.txt @@ -2191,3 +2191,5 @@ noopengl ogfile nend PARKCH +TESTQUAD +WAITALL From 5366ab6e3f9c782bc4faf8cc029175903849db09 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 21:58:57 +0800 Subject: [PATCH 07/23] 240422.215857.HKT revise stress_test_fortran.yml --- .github/workflows/stress_test_fortran.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stress_test_fortran.yml b/.github/workflows/stress_test_fortran.yml index a5313df5dc..4503a6fc8a 100644 --- a/.github/workflows/stress_test_fortran.yml +++ b/.github/workflows/stress_test_fortran.yml @@ -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/upload-artifact@v4.3.1 From d1a75f46ff3250f1a7aea7e4c4587fa1c9787611 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Mon, 22 Apr 2024 23:47:52 +0800 Subject: [PATCH 08/23] 240422.234752.HKT more strict cflags in cmake.yml --- .github/workflows/cmake.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c2f5d16e30..0cc594f0b2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -37,18 +37,18 @@ jobs: - {compiler: gcc, version: 11, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - {compiler: gcc, version: 12, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - - {compiler: intel-classic, version: '2021.8', cflags: '-diag-disable=10441', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - - {compiler: intel-classic, version: '2021.9', cflags: '-diag-disable=10441', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - - {compiler: intel-classic, version: '2021.10', cflags: '-diag-disable=10441', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.8', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.9', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.10', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} include: # intel compiler (ifx) does not support macOS. So they are not included above but below. - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} # What follows contains the toolchains for Windows, including gcc, intel classic, and intel. - os: windows-latest @@ -58,21 +58,21 @@ jobs: - os: windows-latest toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - os: windows-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} steps: @@ -158,9 +158,9 @@ jobs: toolchain: # Classic Flang family with -Mchkptr would fail. See https://forums.developer.nvidia.com/t/bug-in-nvfortran-with-mchkptr-for-unallocated-optional-arguments/223220 # As of 20240220, aflang with -Mbounds would fail due to the bug at https://github.com/flang-compiler/flang/issues/1238 - - {compiler: nvfortran, cflags: '-Wall', fflags: '-C -Wall -Wextra -Minform=warn -Mstandard -Mrecursive -Mbounds -Mchkstk'} - - {compiler: flang, cflags: '-Werror', fflags: '-std=f2018 -pedantic -fno-stack-arrays -mmlir -fdynamic-heap-array'} - - {compiler: aflang, cflags: '-Wall', fflags: '-pedantic -Weverything -Wall -Wextra -Minform=warn -Mstandard -Mrecursive'} + - {compiler: nvfortran, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-C -Wall -Wextra -Minform=warn -Mstandard -Mrecursive -Mbounds -Mchkstk'} + - {compiler: flang, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-std=f2018 -pedantic -fimplicit-none -Werror -fno-stack-arrays -mmlir -fdynamic-heap-array'} + - {compiler: aflang, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-pedantic -Weverything -Wall -Wextra -Minform=warn -Mstandard -Mrecursive'} steps: From 46860fc9f08cfcc834b675ce8907f323da85f093 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 00:00:14 +0800 Subject: [PATCH 09/23] 240423.000014.HKT revise cflags in cmake.yml --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 0cc594f0b2..484a4860aa 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -64,7 +64,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest @@ -72,7 +72,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} steps: From 62c53834641288410055a1c4aa7978436e628fd1 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 03:20:18 +0800 Subject: [PATCH 10/23] 240423.032018.HKT revise cflags for cl in cmake.yml --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 484a4860aa..263025bd34 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -64,7 +64,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /W4 /WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest @@ -72,7 +72,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Wall /W4 /WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} steps: From 272151a78dc6a2476e8d14e669144a3308ea435e Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 03:34:40 +0800 Subject: [PATCH 11/23] 240423.033440.HKT [skip ci] revise clags for cl in cmake.yml --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 263025bd34..1cdb866efc 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -64,7 +64,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /W4 /WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest @@ -72,7 +72,7 @@ jobs: - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Wall /W4 /WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} steps: From f33867183e8c0ea06c4a38b91f85870e64e9708f Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 03:48:33 +0800 Subject: [PATCH 12/23] 240423.034833.HKT [skip ci] revise clags in cmake.yml, using `-Wall` instead of `/Wall`, and similar for others --- .github/workflows/cmake.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 1cdb866efc..212edbb508 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,19 +58,19 @@ jobs: - os: windows-latest toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - os: windows-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '/Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '/Qdiag-disable:10441 /Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} From 706f2a93b5396086606d0544713818f81bfb0789 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 04:01:44 +0800 Subject: [PATCH 13/23] 240423.040144.HKT [skip ci] revise clags in cmake.yml, using `/Werror-all /W5` instead of `-Werror-all -W5` --- .github/workflows/cmake.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 212edbb508..cb2144816c 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,11 +58,11 @@ jobs: - os: windows-latest toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - os: windows-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic From c4e20abd906c37a1f82451e25f98339e948a9618 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 04:13:21 +0800 Subject: [PATCH 14/23] 240423.041321.HKT [skip ci] revise clags in cmake.yml, using `-Werror` instead of `-Werror-all -W5` --- .github/workflows/cmake.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cb2144816c..8cc722fc3f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -58,11 +58,11 @@ jobs: - os: windows-latest toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - os: windows-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall /Werror-all /W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic From c4b495e29baaa199b939ef13540750786cfb9eae Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 04:21:13 +0800 Subject: [PATCH 15/23] 240423.042113.HKT [skip ci] revise clags in cmake.yml, try removing an option to make sure that it was taking effect --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8cc722fc3f..c87f962bb2 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -68,9 +68,9 @@ jobs: # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} From 870f47272caa3d596f8aae75fafa151ad4ea55dd Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 04:24:43 +0800 Subject: [PATCH 16/23] 240423.042443.HKT [skip ci] revoke c4b495e --- .github/workflows/cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index c87f962bb2..8cc722fc3f 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -68,9 +68,9 @@ jobs: # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} From f9f3e2600c11e401f8dfd7f103e77e409ce8a42a Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 04:34:22 +0800 Subject: [PATCH 17/23] 240423.043422.HKT revise comments and cflags in cmake.yml --- .github/workflows/cmake.yml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 8cc722fc3f..127cf773ad 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -37,18 +37,18 @@ jobs: - {compiler: gcc, version: 11, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - {compiler: gcc, version: 12, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - - {compiler: intel-classic, version: '2021.8', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - - {compiler: intel-classic, version: '2021.9', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - - {compiler: intel-classic, version: '2021.10', cflags: '-diag-disable=10441 -Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.8', cflags: '-diag-disable=10441 -Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.9', cflags: '-diag-disable=10441 -Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + - {compiler: intel-classic, version: '2021.10', cflags: '-diag-disable=10441 -Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} include: # intel compiler (ifx) does not support macOS. So they are not included above but below. - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror-all -w3', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} # What follows contains the toolchains for Windows, including gcc, intel classic, and intel. - os: windows-latest @@ -57,6 +57,12 @@ jobs: toolchain: {compiler: gcc, version: 12, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} - os: windows-latest toolchain: {compiler: gcc, version: 13, cflags: '-Wall -Wextra -Wpedantic -Werror', fflags: '-Wall -Wextra -Wpedantic -Werror -fimplicit-none -frecursive -fcheck=all -fstack-check -Wno-function-elimination'} + # Zaikun 20240423: + # 1. On windows-latest, the cflags will not be recognized correctly if we start them with `/` instead + # of `-`, even though the former aligns with the official documentation of the compilers. Why? + # 2. On windows-latest, we want to use '-Wall -W5 -Werror-all' as what we do for the intel-classic + # compiler, but the (new) intel c compiler does not recognize '-W5 -Werror-all', even though the + # official documentation of the compiler mentions them. Why? - os: windows-latest toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest @@ -68,9 +74,9 @@ jobs: # N.B.: As of 20240401, setup-fortran fails constantly with windows-latest and intel-classic # 2021.8. Thus this combination is not included. - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.9', cflags: '-Qdiag-disable:10441 -Wall -W5 -Werror-all', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest - toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Qdiag-disable:10441 -Wall -Werror-all -W5', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} + toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Qdiag-disable:10441 -Wall -W5 -Werror-all', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion'} - os: windows-latest toolchain: {compiler: intel-classic, version: '2021.10', cflags: '-Wall -W4 -WX', fflags: '/warn:all /debug:extended /Z7 /fimplicit-none /standard-semantics /assume:recursion', cc: cl} From ea93390b20922a208024a4a16f0381ab3b6cff38 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Tue, 23 Apr 2024 05:03:36 +0800 Subject: [PATCH 18/23] 240423.050336.HKT cmake.yml: remove unknown flags from cflags --- .github/workflows/cmake.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 127cf773ad..1a405bdc0b 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -43,12 +43,16 @@ jobs: include: # intel compiler (ifx) does not support macOS. So they are not included above but below. + # Zaikun 20240423 + # On ubuntu-latest, we want to use '-Wall -w3 -Werror-all' as what we do for the intel-classic + # compiler, but the (new) intel c compiler does not recognize '-W3 -Werror-all', even though the + # official documentation of the compiler mentions them. Why? - os: ubuntu-latest - toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2023.2', cflags: '-Wall -Werror', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.0', cflags: '-Wall -Werror', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} - os: ubuntu-latest - toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -w3 -Werror-all', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} + toolchain: {compiler: intel, version: '2024.1', cflags: '-Wall -Werror', fflags: '-warn all -debug extended -fimplicit-none -standard-semantics -assume recursion'} # What follows contains the toolchains for Windows, including gcc, intel classic, and intel. - os: windows-latest From 791cf28b3a5dc9827f697edce0f89b8333275eec Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Sat, 27 Apr 2024 13:33:50 +0800 Subject: [PATCH 19/23] 240427.133350.HKT update version of oneAPI --- .github/workflows/test_matlab.yml | 16 +++++++++++++--- .github/workflows/test_matlab_windows.yml | 16 +++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml index 6cab6e4827..fb6605d915 100644 --- a/.github/workflows/test_matlab.yml +++ b/.github/workflows/test_matlab.yml @@ -131,14 +131,24 @@ jobs: fi bash .github/scripts/link_gfortran "$GFVER" + - name: Decide the version of oneAPI to use + run: | + ONEAPI_VER= + if [[ "${{ matrix.os }}" = "windows-*" ]] ; then + if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + ONEAPI_VER=2024 + fi + fi + echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV + echo "ONEAPI_VER:" $ONEAPI_VER + - 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_VER - 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_VER%"' - name: Set up MATLAB uses: matlab-actions/setup-matlab@v2.1.2 diff --git a/.github/workflows/test_matlab_windows.yml b/.github/workflows/test_matlab_windows.yml index abf44492b5..912b19e55d 100644 --- a/.github/workflows/test_matlab_windows.yml +++ b/.github/workflows/test_matlab_windows.yml @@ -76,14 +76,24 @@ jobs: fi bash .github/scripts/link_gfortran "$GFVER" + - name: Decide the version of oneAPI to use + run: | + ONEAPI_VER= + if [[ "${{ matrix.os }}" = "windows-*" ]] ; then + if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + ONEAPI_VER=2024 + fi + fi + echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV + echo "ONEAPI_VER:" $ONEAPI_VER + - 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_VER - 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_VER%"' - name: Set up MATLAB uses: matlab-actions/setup-matlab@v2.1.2 From d7b73b30dbdc85882ee74d86ecef0e52c513cf24 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Sat, 27 Apr 2024 13:35:44 +0800 Subject: [PATCH 20/23] 240427.133544.HKT try oneAPI 2024 in test_matlab --- .github/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts b/.github/scripts index 8c1baeeb49..1e5d9f3714 160000 --- a/.github/scripts +++ b/.github/scripts @@ -1 +1 @@ -Subproject commit 8c1baeeb497d021b9db072bb675fdf3304ba03d7 +Subproject commit 1e5d9f371444565c32e882efa71cb33e4d2560ea From 74575868c4d86d44cc40ec3e8487eb0e0955765f Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Sat, 27 Apr 2024 13:38:12 +0800 Subject: [PATCH 21/23] 240427.133812.HKT revise test_matlab --- .github/workflows/test_matlab.yml | 1 + .github/workflows/test_matlab_windows.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml index fb6605d915..d817aa691d 100644 --- a/.github/workflows/test_matlab.yml +++ b/.github/workflows/test_matlab.yml @@ -132,6 +132,7 @@ jobs: bash .github/scripts/link_gfortran "$GFVER" - name: Decide the version of oneAPI to use + shell: bash run: | ONEAPI_VER= if [[ "${{ matrix.os }}" = "windows-*" ]] ; then diff --git a/.github/workflows/test_matlab_windows.yml b/.github/workflows/test_matlab_windows.yml index 912b19e55d..e78a32fd0a 100644 --- a/.github/workflows/test_matlab_windows.yml +++ b/.github/workflows/test_matlab_windows.yml @@ -77,6 +77,7 @@ jobs: bash .github/scripts/link_gfortran "$GFVER" - name: Decide the version of oneAPI to use + shell: bash run: | ONEAPI_VER= if [[ "${{ matrix.os }}" = "windows-*" ]] ; then From 92115499a1be6fcf51de0325f5b6d2f3b4e70a65 Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Sat, 27 Apr 2024 13:59:18 +0800 Subject: [PATCH 22/23] 240427.135918.HKT introduce `ONEAPI_VERSION` to the matlab tests --- .github/workflows/compile_mex.yml | 17 ++++++++++++++--- .github/workflows/parallel_test_matlab.yml | 17 ++++++++++++++--- .github/workflows/recursive_test_matlab.yml | 17 ++++++++++++++--- .github/workflows/stress_test_matlab.yml | 17 ++++++++++++++--- .github/workflows/test_matlab.yml | 12 ++++++------ .github/workflows/test_matlab_linux.yml | 17 ++++++++++++++--- .github/workflows/test_matlab_mac_intel.yml | 17 ++++++++++++++--- .github/workflows/test_matlab_windows.yml | 12 ++++++------ 8 files changed, 96 insertions(+), 30 deletions(-) diff --git a/.github/workflows/compile_mex.yml b/.github/workflows/compile_mex.yml index 56f3f3cfea..de3b28b782 100644 --- a/.github/workflows/compile_mex.yml +++ b/.github/workflows/compile_mex.yml @@ -91,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/setup-matlab@v2.1.2 diff --git a/.github/workflows/parallel_test_matlab.yml b/.github/workflows/parallel_test_matlab.yml index 8cc07b3401..c2b2806376 100644 --- a/.github/workflows/parallel_test_matlab.yml +++ b/.github/workflows/parallel_test_matlab.yml @@ -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/setup-matlab@v2.1.2 diff --git a/.github/workflows/recursive_test_matlab.yml b/.github/workflows/recursive_test_matlab.yml index e7e3e9ebd1..3adb124ade 100644 --- a/.github/workflows/recursive_test_matlab.yml +++ b/.github/workflows/recursive_test_matlab.yml @@ -138,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/setup-matlab@v2.1.2 diff --git a/.github/workflows/stress_test_matlab.yml b/.github/workflows/stress_test_matlab.yml index 1cb8af9c29..f1a77b3956 100644 --- a/.github/workflows/stress_test_matlab.yml +++ b/.github/workflows/stress_test_matlab.yml @@ -136,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/setup-matlab@v2.1.2 diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml index d817aa691d..5abb42d6f3 100644 --- a/.github/workflows/test_matlab.yml +++ b/.github/workflows/test_matlab.yml @@ -134,22 +134,22 @@ jobs: - name: Decide the version of oneAPI to use shell: bash run: | - ONEAPI_VER= + ONEAPI_VERSION= if [[ "${{ matrix.os }}" = "windows-*" ]] ; then if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then - ONEAPI_VER=2024 + ONEAPI_VERSION=2023 fi fi - echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV - echo "ONEAPI_VER:" $ONEAPI_VER + 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 $ONEAPI_VER + 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 %ONEAPI_VER%"' + run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' - name: Set up MATLAB uses: matlab-actions/setup-matlab@v2.1.2 diff --git a/.github/workflows/test_matlab_linux.yml b/.github/workflows/test_matlab_linux.yml index db304e610d..1a683646d2 100644 --- a/.github/workflows/test_matlab_linux.yml +++ b/.github/workflows/test_matlab_linux.yml @@ -76,14 +76,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/setup-matlab@v2.1.2 diff --git a/.github/workflows/test_matlab_mac_intel.yml b/.github/workflows/test_matlab_mac_intel.yml index b7e8302f7d..8b3cf5d73f 100644 --- a/.github/workflows/test_matlab_mac_intel.yml +++ b/.github/workflows/test_matlab_mac_intel.yml @@ -76,14 +76,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/setup-matlab@v2.1.2 diff --git a/.github/workflows/test_matlab_windows.yml b/.github/workflows/test_matlab_windows.yml index e78a32fd0a..e643ed0030 100644 --- a/.github/workflows/test_matlab_windows.yml +++ b/.github/workflows/test_matlab_windows.yml @@ -79,22 +79,22 @@ jobs: - name: Decide the version of oneAPI to use shell: bash run: | - ONEAPI_VER= + ONEAPI_VERSION= if [[ "${{ matrix.os }}" = "windows-*" ]] ; then if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then - ONEAPI_VER=2024 + ONEAPI_VERSION=2023 fi fi - echo "ONEAPI_VER=$ONEAPI_VER" >> $GITHUB_ENV - echo "ONEAPI_VER:" $ONEAPI_VER + 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 $ONEAPI_VER + 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 %ONEAPI_VER%"' + run: cmd.exe "/K" '".github\scripts\install_oneapi_windows.bat %ONEAPI_VERSION%"' - name: Set up MATLAB uses: matlab-actions/setup-matlab@v2.1.2 From 50703804959f84dabd521edb6c0ee3142c629b1d Mon Sep 17 00:00:00 2001 From: zaikunzhang Date: Sat, 27 Apr 2024 14:52:10 +0800 Subject: [PATCH 23/23] 240427.145210.HKT correct `ONEAPI_VERSION` --- .github/workflows/compile_mex.yml | 4 ++-- .github/workflows/parallel_test_matlab.yml | 4 ++-- .github/workflows/recursive_test_matlab.yml | 4 ++-- .github/workflows/stress_test_matlab.yml | 4 ++-- .github/workflows/test_matlab.yml | 4 ++-- .github/workflows/test_matlab_linux.yml | 4 ++-- .github/workflows/test_matlab_mac_intel.yml | 4 ++-- .github/workflows/test_matlab_windows.yml | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/compile_mex.yml b/.github/workflows/compile_mex.yml index de3b28b782..6e4763ddb2 100644 --- a/.github/workflows/compile_mex.yml +++ b/.github/workflows/compile_mex.yml @@ -95,8 +95,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/parallel_test_matlab.yml b/.github/workflows/parallel_test_matlab.yml index c2b2806376..c8269ac0a4 100644 --- a/.github/workflows/parallel_test_matlab.yml +++ b/.github/workflows/parallel_test_matlab.yml @@ -75,8 +75,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/recursive_test_matlab.yml b/.github/workflows/recursive_test_matlab.yml index 3adb124ade..8ff30abb9c 100644 --- a/.github/workflows/recursive_test_matlab.yml +++ b/.github/workflows/recursive_test_matlab.yml @@ -142,8 +142,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/stress_test_matlab.yml b/.github/workflows/stress_test_matlab.yml index f1a77b3956..33935ff77b 100644 --- a/.github/workflows/stress_test_matlab.yml +++ b/.github/workflows/stress_test_matlab.yml @@ -140,8 +140,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/test_matlab.yml b/.github/workflows/test_matlab.yml index 5abb42d6f3..941711c8fe 100644 --- a/.github/workflows/test_matlab.yml +++ b/.github/workflows/test_matlab.yml @@ -135,8 +135,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/test_matlab_linux.yml b/.github/workflows/test_matlab_linux.yml index 1a683646d2..45f01a3dd9 100644 --- a/.github/workflows/test_matlab_linux.yml +++ b/.github/workflows/test_matlab_linux.yml @@ -80,8 +80,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/test_matlab_mac_intel.yml b/.github/workflows/test_matlab_mac_intel.yml index 8b3cf5d73f..8f10a0a76d 100644 --- a/.github/workflows/test_matlab_mac_intel.yml +++ b/.github/workflows/test_matlab_mac_intel.yml @@ -80,8 +80,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi diff --git a/.github/workflows/test_matlab_windows.yml b/.github/workflows/test_matlab_windows.yml index e643ed0030..b350405467 100644 --- a/.github/workflows/test_matlab_windows.yml +++ b/.github/workflows/test_matlab_windows.yml @@ -80,8 +80,8 @@ jobs: shell: bash run: | ONEAPI_VERSION= - if [[ "${{ matrix.os }}" = "windows-*" ]] ; then - if [[ "${{ matrix.matlab }}" == "R2020*" || "${{ matrix.matlab }}" == "R2021*" || "${{ matrix.matlab }}" == "R2022*" || "${{ matrix.matlab }}" == "R2023*" ]] ; then + if [[ "${{ matrix.os }}" = "windows-"* ]] ; then + if [[ "${{ matrix.matlab }}" = "R2020"* || "${{ matrix.matlab }}" = "R2021"* || "${{ matrix.matlab }}" = "R2022"* || "${{ matrix.matlab }}" = "R2023"* ]] ; then ONEAPI_VERSION=2023 fi fi