Merge branch 'fortran-lang:main' into main

ssciwr · Mar 7, 2024 · d712ae0 · d712ae0
2 parents 646b405 + e9da799
commit d712ae0
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 59 deletions.
diff --git a/.github/actions/test-fc/action.yml b/.github/actions/test-fc/action.yml
@@ -33,17 +33,6 @@ runs:
       working-directory: test
       shell: bash
       run: |
-        # macos-13/gfortran 7-9 compatibility workaround
-        args=""
-        if [ "$RUNNER_OS" == "macOS" ]; then
-          if [[ $(sw_vers -productVersion) == 13* ]] && \
-              [[ ${{ inputs.compiler }} == "gcc" ]] && \
-              [[ ${{ inputs.version }} =~ ^(7|8|9)$ ]]
-          then
-            args="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
-          fi
-        fi
-        
         # hello world program
         ${{ env.FC }} $args -o hw hw.f90
         output=$(./hw '2>&1')

diff --git a/.github/compat/compat.csv b/.github/compat/compat.csv
@@ -1,10 +1,11 @@
-compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,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,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
-version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.1,22.11,23.11,23.3,23.5,23.7,23.9
-runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-macos-11,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,,,,,,,,
-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;,&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;
-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;
-windows-2019,&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;,,,,,,,,,
+compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,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,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
+version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
+runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+macos-11,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,&check;,,,,,,,,,,,,,,,,,,,,
+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;,,,,,,,,,,,,,,,,,,,,
+macos-14,,&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;
+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;
+windows-2019,&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;,,,,,,,,
diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv
@@ -45,9 +45,9 @@ macos-13,gcc,11,&check;
 macos-13,gcc,12,&check;
 macos-13,gcc,13,&check;
 macos-13,gcc,6,
-macos-13,gcc,7,&check;
-macos-13,gcc,8,&check;
-macos-13,gcc,9,&check;
+macos-13,gcc,7,
+macos-13,gcc,8,
+macos-13,gcc,9,
 macos-13,intel-classic,2021.1.2,
 macos-13,intel-classic,2021.1,&check;
 macos-13,intel-classic,2021.10,&check;
@@ -68,6 +68,9 @@ ubuntu-20.04,gcc,6,
 ubuntu-20.04,gcc,7,&check;
 ubuntu-20.04,gcc,8,&check;
 ubuntu-20.04,gcc,9,&check;
+macos-14,gcc,11,&check;
+macos-14,gcc,12,&check;
+macos-14,gcc,13,&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;
@@ -96,7 +99,7 @@ ubuntu-20.04,nvidia-hpc,20.7,
 ubuntu-20.04,nvidia-hpc,20.9,
 ubuntu-20.04,nvidia-hpc,21.1,
 ubuntu-20.04,nvidia-hpc,21.11,&check;
-ubuntu-20.04,nvidia-hpc,22.1,&check;
+ubuntu-20.04,nvidia-hpc,22.1,
 ubuntu-20.04,nvidia-hpc,22.11,&check;
 ubuntu-20.04,nvidia-hpc,23.11,&check;
 ubuntu-20.04,nvidia-hpc,23.3,&check;
@@ -139,7 +142,7 @@ ubuntu-22.04,nvidia-hpc,20.7,
 ubuntu-22.04,nvidia-hpc,20.9,
 ubuntu-22.04,nvidia-hpc,21.1,
 ubuntu-22.04,nvidia-hpc,21.11,&check;
-ubuntu-22.04,nvidia-hpc,22.1,&check;
+ubuntu-22.04,nvidia-hpc,22.1,
 ubuntu-22.04,nvidia-hpc,22.11,&check;
 ubuntu-22.04,nvidia-hpc,23.11,&check;
 ubuntu-22.04,nvidia-hpc,23.3,&check;

diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml
@@ -1,9 +1,9 @@
 os:
   - ubuntu-22.04
   - ubuntu-20.04
+  - macos-14
   - macos-13
   - macos-12
-  - macos-11
   - windows-2022
   - windows-2019
 toolchain:
@@ -14,7 +14,6 @@ toolchain:
   - {compiler: gcc, version:  9}
   - {compiler: gcc, version:  8}
   - {compiler: gcc, version:  7}
-  - {compiler: gcc, version:  6}
   - {compiler: intel, version: '2023.2'}
   - {compiler: intel, version: '2023.1'}
   - {compiler: intel, version: '2023.0'}
@@ -63,13 +62,17 @@ toolchain:
   - {compiler: nvidia-hpc, version: '20.7'}
 exclude:
   # ifx not available for mac
+  - os: macos-14
+    toolchain: {compiler: intel}
   - os: macos-13
     toolchain: {compiler: intel}
   - os: macos-12
     toolchain: {compiler: intel}
   - os: macos-11
     toolchain: {compiler: intel}
   # nvidia-hpc not available for mac
+  - os: macos-14
+    toolchain: {compiler: nvidia-hpc}
   - os: macos-13
     toolchain: {compiler: nvidia-hpc}
   - os: macos-12
@@ -80,4 +83,11 @@ exclude:
   - os: windows-2022
     toolchain: {compiler: nvidia-hpc}
   - os: windows-2019
-    toolchain: {compiler: nvidia-hpc}
+    toolchain: {compiler: nvidia-hpc}
+  # gcc<=10 not available for ARM mac
+  - os: macos-14
+    toolchain: {compiler: gcc, version: 8}
+  - os: macos-14
+    toolchain: {compiler: gcc, version: 9}
+  - os: macos-14
+    toolchain: {compiler: gcc, version: 10}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,6 +29,7 @@ jobs:
       - name: Set mode
         id: mode
         run: |
+          trigger=${{ github.event_name }}
           if [[ "$trigger" == "schedule" ]] || [[ "$trigger" == "workflow_dispatch" ]]; then
             echo "mode=report" >> "$GITHUB_OUTPUT"
           else
@@ -73,6 +74,9 @@ jobs:
           version: ${{ matrix.toolchain.version }}
           install_mkl: true
 
+      # - name: Debug with tmate
+      #   uses: mxschmitt/action-tmate@v3
+
       - name: Test Fortran compiler
         if: steps.setup-fortran.outcome == 'success'
         uses: ./.github/actions/test-fc