From c80a2089eca11cedaecd80c0b341334af6816033 Mon Sep 17 00:00:00 2001 From: Alexis Montoison <35051714+amontoison@users.noreply.github.com> Date: Wed, 8 May 2024 11:30:43 -0400 Subject: [PATCH 1/5] Update setup-fortran.sh --- setup-fortran.sh | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 086afa2..ef38319 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -190,6 +190,12 @@ intel_version_map_l() local classic=$2 if $classic; then case $actual_version in + 2021.12.0 | 2021.12) + version=2024.1.0 + ;; + 2021.11.0 | 2021.11) + version=2024.0.1 + ;; 2021.10.0 | 2021.10) version=2023.2.0 ;; @@ -227,9 +233,12 @@ intel_version_map_l() 2022.0.0 | 2022.0) version=2022.0.2 ;; - 2023.2 | 2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.2) + 2024.1 | 2023.2 | 2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.2) version=$actual_version.0 ;; + 2024.0 | 2024.0.0) + version=2024.0.1 + ;; 2021.1) version=2021.1.1 ;; @@ -280,6 +289,12 @@ intel_version_map_w() local classic=$2 if $classic; then case $actual_version in + 2021.12.0 | 2021.12) + version=2024.1.0 + ;; + 2021.11.0 | 2021.11) + version=2024.0.1 + ;; 2021.10.0 | 2021.10) version=2023.2.0 ;; @@ -304,7 +319,7 @@ intel_version_map_w() 2024.1 | 2024.1.0) version=2024.1.0 ;; - 2024.0 | 2024.0.1) + 2024.0 | 2024.0.0) version=2024.0.1 ;; 2023.2 | 2023.1 | 2023.0) @@ -650,4 +665,4 @@ install_lfortran() echo $($CONDA run -n base which lfortran | sed 's/lfortran//') >> $GITHUB_PATH export FC="lfortran" -} \ No newline at end of file +} From c113a34eb242bbd1f3e697c8c4d77166e383ce5d Mon Sep 17 00:00:00 2001 From: Alexis Montoison <35051714+amontoison@users.noreply.github.com> Date: Wed, 8 May 2024 11:40:21 -0400 Subject: [PATCH 2/5] Update matrix.yml --- .github/compat/matrix.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml index 4b7b034..e4addd1 100644 --- a/.github/compat/matrix.yml +++ b/.github/compat/matrix.yml @@ -25,6 +25,8 @@ toolchain: - {compiler: intel, version: '2021.2'} - {compiler: intel, version: '2021.1.2'} - {compiler: intel, version: '2021.1'} + - {compiler: intel-classic, version: '2021.12'} + - {compiler: intel-classic, version: '2021.11'} - {compiler: intel-classic, version: '2021.10'} - {compiler: intel-classic, version: '2021.9'} - {compiler: intel-classic, version: '2021.8'} @@ -64,6 +66,19 @@ toolchain: - {compiler: nvidia-hpc, version: '20.9'} - {compiler: nvidia-hpc, version: '20.7'} exclude: + # intel-classic >= 2021.10.0 not available for mac + - os: macos-14 + toolchain: {compiler: intel-classic, version: 2021.12.0} + - os: macos-13 + toolchain: {compiler: intel-classic, version: 2021.12.0} + - os: macos-12 + toolchain: {compiler: intel-classic, version: 2021.12.0} + - os: macos-14 + toolchain: {compiler: intel-classic, version: 2021.11.0} + - os: macos-13 + toolchain: {compiler: intel-classic, version: 2021.11.0} + - os: macos-12 + toolchain: {compiler: intel-classic, version: 2021.11.0} # ifx not available for mac - os: macos-14 toolchain: {compiler: intel} @@ -89,4 +104,4 @@ exclude: - os: macos-14 toolchain: {compiler: gcc, version: 9} - os: macos-14 - toolchain: {compiler: gcc, version: 10} \ No newline at end of file + toolchain: {compiler: gcc, version: 10} From 172fc718691d799658a63455a1d9d8046dd9e3b7 Mon Sep 17 00:00:00 2001 From: Alexis Montoison <35051714+amontoison@users.noreply.github.com> Date: Wed, 8 May 2024 13:52:21 -0400 Subject: [PATCH 3/5] Update setup-fortran.sh --- setup-fortran.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index ef38319..d0044ff 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -345,7 +345,7 @@ install_intel_apt() intel_version_map_l $version $classic require_fetch - local _KEY="GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB" + local _KEY="GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB" $fetch https://apt.repos.intel.com/intel-gpg-keys/$_KEY > $_KEY sudo apt-key add $_KEY rm $_KEY From f27b54673dc5c93acd663297f459508f77e2460a Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 18 May 2024 10:44:46 -0400 Subject: [PATCH 4/5] update compat tables and README, update windows version map --- .github/compat/compat.csv | 20 ++++++++++---------- .github/compat/long_compat.csv | 8 ++++++++ README.md | 18 +++++++++--------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.github/compat/compat.csv b/.github/compat/compat.csv index 261a277..4825c59 100644 --- a/.github/compat/compat.csv +++ b/.github/compat/compat.csv @@ -1,10 +1,10 @@ -compiler,gcc,gcc,gcc,gcc,gcc,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,lfortran,lfortran,lfortran,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc -version,10,11,12,13,9,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9 -runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -macos-13,✓,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -macos-14,,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, -ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ -ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ -windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, -windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, +compiler,gcc,gcc,gcc,gcc,gcc,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,lfortran,lfortran,lfortran,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc +version,10,11,12,13,9,2021.1,2021.1.2,2021.2,2021.4,2022.0,2022.1,2022.2,2022.2.1,2023.0,2023.1,2023.2,2024.0,2024.1,2021.1,2021.1.2,2021.10,2021.11,2021.12,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7,2021.7.1,2021.8,2021.9,0.31.0,0.32.0,0.33.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9 +runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +macos-12,✓,✓,✓,✓,✓,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, +macos-13,✓,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, +macos-14,,✓,✓,✓,,,,,,,,,,,,,,,✓,,✓,,,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,,,,,,,, +ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ +ubuntu-22.04,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓ +windows-2019,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, +windows-2022,✓,✓,✓,✓,✓,,,,,,✓,✓,,,✓,✓,✓,✓,,,✓,✓,✓,,,,,✓,✓,,,✓,✓,✓,✓,,,,,,,, diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index 3e7d6fa..5770c67 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -64,6 +64,8 @@ ubuntu-20.04,gcc,9,✓ ubuntu-20.04,intel-classic,2021.1.2,✓ ubuntu-20.04,intel-classic,2021.1,✓ ubuntu-20.04,intel-classic,2021.10,✓ +ubuntu-20.04,intel-classic,2021.11,✓ +ubuntu-20.04,intel-classic,2021.12,✓ ubuntu-20.04,intel-classic,2021.2,✓ ubuntu-20.04,intel-classic,2021.3, ubuntu-20.04,intel-classic,2021.4,✓ @@ -119,6 +121,8 @@ ubuntu-22.04,gcc,9,✓ ubuntu-22.04,intel-classic,2021.1.2,✓ ubuntu-22.04,intel-classic,2021.1,✓ ubuntu-22.04,intel-classic,2021.10,✓ +ubuntu-22.04,intel-classic,2021.11,✓ +ubuntu-22.04,intel-classic,2021.12,✓ ubuntu-22.04,intel-classic,2021.2,✓ ubuntu-22.04,intel-classic,2021.3, ubuntu-22.04,intel-classic,2021.4,✓ @@ -169,6 +173,8 @@ windows-2019,gcc,9,✓ windows-2019,intel-classic,2021.1.2, windows-2019,intel-classic,2021.1, windows-2019,intel-classic,2021.10,✓ +windows-2019,intel-classic,2021.11,✓ +windows-2019,intel-classic,2021.12,✓ windows-2019,intel-classic,2021.2, windows-2019,intel-classic,2021.3, windows-2019,intel-classic,2021.4, @@ -202,6 +208,8 @@ windows-2022,gcc,9,✓ windows-2022,intel-classic,2021.1.2, windows-2022,intel-classic,2021.1, windows-2022,intel-classic,2021.10,✓ +windows-2022,intel-classic,2021.11,✓ +windows-2022,intel-classic,2021.12,✓ windows-2022,intel-classic,2021.2, windows-2022,intel-classic,2021.3, windows-2022,intel-classic,2021.4, diff --git a/README.md b/README.md index 91ff77f..7f4b183 100644 --- a/README.md +++ b/README.md @@ -104,15 +104,15 @@ These are made available to subsequent workflow steps via the [`GITHUB_ENV` envi Toolchain support varies across GitHub-hosted runner images. -| runner | gcc 10 | gcc 11 | gcc 12 | gcc 13 | gcc 9 | intel 2021.1 | intel 2021.1.2 | intel 2021.2 | intel 2021.4 | intel 2022.0 | intel 2022.1 | intel 2022.2 | intel 2022.2.1 | intel 2023.0 | intel 2023.1 | intel 2023.2 | intel 2024.0 | intel 2024.1 | intel-classic 2021.1 | intel-classic 2021.1.2 | intel-classic 2021.10 | intel-classic 2021.2 | intel-classic 2021.3 | intel-classic 2021.4 | intel-classic 2021.5 | intel-classic 2021.6 | intel-classic 2021.7 | intel-classic 2021.7.1 | intel-classic 2021.8 | intel-classic 2021.9 | lfortran 0.31.0 | lfortran 0.32.0 | lfortran 0.33.0 | nvidia-hpc 20.11 | nvidia-hpc 21.11 | nvidia-hpc 22.11 | nvidia-hpc 23.11 | nvidia-hpc 23.3 | nvidia-hpc 23.5 | nvidia-hpc 23.7 | nvidia-hpc 23.9 | -|:-------------|:----------------|:----------------|:----------------|:----------------|:---------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------------|:--------------------------------|:-------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|:--------------------------|:--------------------------|:--------------------------|:-------------------------|:-------------------------|:-------------------------|:-------------------------| -| macos-12 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| macos-13 | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| macos-14 | | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| ubuntu-20.04 | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| ubuntu-22.04 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| windows-2019 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | -| windows-2022 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| runner | gcc 10 | gcc 11 | gcc 12 | gcc 13 | gcc 9 | intel 2021.1 | intel 2021.1.2 | intel 2021.2 | intel 2021.4 | intel 2022.0 | intel 2022.1 | intel 2022.2 | intel 2022.2.1 | intel 2023.0 | intel 2023.1 | intel 2023.2 | intel 2024.0 | intel 2024.1 | intel-classic 2021.1 | intel-classic 2021.1.2 | intel-classic 2021.10 | intel-classic 2021.11 | intel-classic 2021.12 | intel-classic 2021.2 | intel-classic 2021.3 | intel-classic 2021.4 | intel-classic 2021.5 | intel-classic 2021.6 | intel-classic 2021.7 | intel-classic 2021.7.1 | intel-classic 2021.8 | intel-classic 2021.9 | lfortran 0.31.0 | lfortran 0.32.0 | lfortran 0.33.0 | nvidia-hpc 20.11 | nvidia-hpc 21.11 | nvidia-hpc 22.11 | nvidia-hpc 23.11 | nvidia-hpc 23.3 | nvidia-hpc 23.5 | nvidia-hpc 23.7 | nvidia-hpc 23.9 | +|:-------------|:----------------|:----------------|:----------------|:----------------|:---------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------|:----------------------|:----------------------|:----------------------|:----------------------|:----------------------|:------------------------------|:--------------------------------|:-------------------------------|:-------------------------------|:-------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:------------------------------|:--------------------------------|:------------------------------|:------------------------------|:-------------------------|:-------------------------|:-------------------------|:--------------------------|:--------------------------|:--------------------------|:--------------------------|:-------------------------|:-------------------------|:-------------------------|:-------------------------| +| macos-12 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| macos-13 | ✓ | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| macos-14 | | ✓ | ✓ | ✓ | | | | | | | | | | | | | | | ✓ | | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| ubuntu-20.04 | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| ubuntu-22.04 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| windows-2019 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | +| windows-2022 | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | | | | | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | | | | | | | | | **Note:** Intel's `ifx` compiler is not supported on macOS, so the `intel` option redirects to `intel-classic` (`ifort`). From 2941fd6dd0b76806bbaa4d6ca23732135081181f Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 18 May 2024 10:51:44 -0400 Subject: [PATCH 5/5] fix linux intel version map --- setup-fortran.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index d0044ff..9d573f1 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -191,10 +191,10 @@ intel_version_map_l() if $classic; then case $actual_version in 2021.12.0 | 2021.12) - version=2024.1.0 + version=2024.1 ;; 2021.11.0 | 2021.11) - version=2024.0.1 + version=2024.0 ;; 2021.10.0 | 2021.10) version=2023.2.0 @@ -233,11 +233,14 @@ intel_version_map_l() 2022.0.0 | 2022.0) version=2022.0.2 ;; - 2024.1 | 2023.2 | 2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.2) + 2023.2 | 2023.1 | 2023.0 | 2022.2 | 2022.1 | 2021.4 | 2021.2) version=$actual_version.0 ;; + 2024.1 | 2024.1.0) + version=2024.1 + ;; 2024.0 | 2024.0.0) - version=2024.0.1 + version=2024.0 ;; 2021.1) version=2021.1.1