fix(intel-classic): fix recent ifort versions on linux and windows (#93)

Co-authored-by: wpbonelli <[email protected]>
fortran-lang · May 18, 2024 · 8821f57 · 8821f57
1 parent 0e08b7d
commit 8821f57
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 23 deletions.
diff --git 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,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-macos-13,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-macos-14,,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
-ubuntu-20.04,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
-ubuntu-22.04,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
-windows-2019,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
-windows-2022,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
+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,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
+macos-13,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
+macos-14,,&check;,&check;,&check;,,,,,,,,,,,,,,,&check;,,&check;,,,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,,,,,,,,
+ubuntu-20.04,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
+ubuntu-22.04,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;
+windows-2019,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
+windows-2022,&check;,&check;,&check;,&check;,&check;,,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,&check;,&check;,&check;,,,,,&check;,&check;,,,&check;,&check;,&check;,&check;,,,,,,,,
diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv
@@ -64,6 +64,8 @@ ubuntu-20.04,gcc,9,&check;
 ubuntu-20.04,intel-classic,2021.1.2,&check;
 ubuntu-20.04,intel-classic,2021.1,&check;
 ubuntu-20.04,intel-classic,2021.10,&check;
+ubuntu-20.04,intel-classic,2021.11,&check;
+ubuntu-20.04,intel-classic,2021.12,&check;
 ubuntu-20.04,intel-classic,2021.2,&check;
 ubuntu-20.04,intel-classic,2021.3,
 ubuntu-20.04,intel-classic,2021.4,&check;
@@ -119,6 +121,8 @@ ubuntu-22.04,gcc,9,&check;
 ubuntu-22.04,intel-classic,2021.1.2,&check;
 ubuntu-22.04,intel-classic,2021.1,&check;
 ubuntu-22.04,intel-classic,2021.10,&check;
+ubuntu-22.04,intel-classic,2021.11,&check;
+ubuntu-22.04,intel-classic,2021.12,&check;
 ubuntu-22.04,intel-classic,2021.2,&check;
 ubuntu-22.04,intel-classic,2021.3,
 ubuntu-22.04,intel-classic,2021.4,&check;
@@ -169,6 +173,8 @@ windows-2019,gcc,9,&check;
 windows-2019,intel-classic,2021.1.2,
 windows-2019,intel-classic,2021.1,
 windows-2019,intel-classic,2021.10,&check;
+windows-2019,intel-classic,2021.11,&check;
+windows-2019,intel-classic,2021.12,&check;
 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,&check;
 windows-2022,intel-classic,2021.1.2,
 windows-2022,intel-classic,2021.1,
 windows-2022,intel-classic,2021.10,&check;
+windows-2022,intel-classic,2021.11,&check;
+windows-2022,intel-classic,2021.12,&check;
 windows-2022,intel-classic,2021.2,
 windows-2022,intel-classic,2021.3,
 windows-2022,intel-classic,2021.4,

diff --git 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}
+    toolchain: {compiler: gcc, version: 10}