fix failing macos tests (#6)

* info-on-mac

* set mkl version explicitly

* more debug on mac

* fix variable typo for linux mkl version

* only test on ubuntu

* matrix

* matrix

* fix version selection

* check both classic and new

* verify dmg

* check hpckit

* check hpckit

* restrict basekit versions

* pass install_mkl and test mkl

* set input in main action

* set input in main action

* set input in script

* fix typo

* change linker options

* source env

* export DYLD path for Mac

* include explicit library path in linker

* export mklroot in script

* export mklroot to GH env

* export mklroot to GH env

* export mklroot in script

* correct typo

* another typo

* debug env vars

* debug env vars

* debug env vars

* debug env vars

* debug env vars

* debug env vars

* debug env vars

* debug env vars

* typo and relative reference mklroot

* debug mklroot path

* debug mklroot path

* typo

* find include dir

* find include dir

* debug mac os dyld path

* check all ubuntu

* no mkl for gcc and nvidia-hpc

* mkl lates

* check compiler vars

* mkl dir for macos

* debug

* debug

* adapt test structure

* remove double testing

* conditional in bash

* conditional in bash

* conditional in bash

* conditional in bash

* typo

* pass missing variable

* test them all

* test them all

* check macos mkl path

* set full library path in script

* export DYLD in env

* test them all

* exclude mkl tests on windows

* exclude mkl tests on windows

* check for dyld

* rename mkllib in gh env

* shuffle version mapping for mac

* export DYLD in script

* shuffle mkl version numbers

* find installed mkl version

* try without mkl

* try without mkl

* find installed mkl version

* find installed mkl version

* shuffle mkl vs ifort version

* find mkl for 2021.5

* skip mkl for 2021.5 macos and remove double export of dyld

* less chatty, .5 exception

* last changes?

* test 2021.5 only

* test them all

* export dyld in action

Author: iulusoy

Diff for: .github/actions/test-fc/action.yml

@@ -65,6 +65,22 @@ runs:
         }
         rm hw.exe
 
+    - name: Test compile Fortran (pwsh)
+      working-directory: test
+      if: ${{ (success() || failure()) && runner.os == 'Windows' }}
+      shell: pwsh
+      run: |
+        ${{ env.FC }} -o hw.exe hw.f90 
+        $output=$(& ".\hw.exe")
+        if ($output -match "hello world") {
+            write-output $output
+        } else {
+            write-output "unexpected output: $output"
+            exit 1
+        }
+        rm hw.exe
+
+
     - name: Test compile Fortran (powershell)
       working-directory: test
       if: ${{ (success() || failure()) && runner.os == 'Windows' }}

Diff for: .github/actions/test-mkl/action.yml

@@ -0,0 +1,31 @@
+name: Test mkl
+description: Test installation of mkl libraries
+inputs:
+  compiler:
+    description: "Toolchain or compiler to install"
+    required: true
+  version:
+    description: "Version of toolchain or compiler"
+    required: true
+  install_mkl: 
+    description: "If MKL should be installed along with the compiler"
+    required: false
+    default: "false"
+runs:
+  using: "composite"
+  steps:
+    - name: Test compile and link mkl (bash)
+      working-directory: test
+      shell: bash
+      run: |
+        if [[ "${{ inputs.compiler }}" =~ "intel" ]] && [[ "${{ inputs.install_mkl }}" == "true" ]] && ([[ "${{ inputs.version }}" != "2021.5" ]] && [[ "$runner.os" != "macOS" ]]); then
+         if [ "$RUNNER_OS" == "macOS" ]; then
+           export DYLD_LIBRARY_PATH="${{ env.MKLLIB }}:$DYLD_LIBRARY_PATH"
+         fi
+         linking="-L${{ env.MKLLIB }} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" 
+         # hello world with blas call program
+         ${{ env.FC }} $args $linking -o hw_mkl hw_mkl.f90
+         output=$(./hw_mkl '2>&1')
+         [[ "$output" == *"hello world   9.00000000000000"* ]] && echo "$output" || (echo "Unexpected Fortran program 'hw_mkl' output: $output"; exit 1)
+         rm hw_mkl
+        fi

Diff for: .github/compat/long_compat.csv

@@ -1,4 +1,5 @@
 runner,compiler,version,support
+macos-13,intel-classic,2021.5,✓runner,compiler,version,support
 macos-11,gcc,10,✓
 macos-11,gcc,11,✓
 macos-11,gcc,12,✓

Diff for: .github/workflows/test.yml

@@ -3,9 +3,9 @@ name: Test
 # Push and pull request run in assert mode.
 # Schedule and dispatch run in report mode.
 on:
-  push:
-    paths-ignore:
-      - '**.md'
+  # push:
+  #   paths-ignore:
+  #     - '**.md'
   pull_request:
     branches:
       - main
@@ -71,6 +71,7 @@ jobs:
         with:
           compiler: ${{ matrix.toolchain.compiler }}
           version: ${{ matrix.toolchain.version }}
+          install_mkl: true
 
       - name: Test Fortran compiler
         if: steps.setup-fortran.outcome == 'success'
@@ -79,6 +80,14 @@ jobs:
           compiler: ${{ matrix.toolchain.compiler }}
           version: ${{ matrix.toolchain.version }}
 
+      - name: Test MKL libraries
+        if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows'
+        uses: ./.github/actions/test-mkl
+        with:
+          compiler: ${{ matrix.toolchain.compiler }}
+          version: ${{ matrix.toolchain.version }}
+          install_mkl: true
+
       - name: Test C compiler
         continue-on-error: true
         if: needs.options.outputs.mode == 'report' && steps.setup-fortran.outcome == 'success'

Diff for: README.md

@@ -35,6 +35,7 @@ jobs:
           - {compiler: gcc, version: 13}
           - {compiler: intel, version: '2023.2'}
           - {compiler: intel-classic, version: '2021.10'}
+          - {compiler: intel-classic, version: '2021.10', install_mkl: 'true'}
           - {compiler: nvidia-hpc, version: '23.11'}
         include:
           - os: ubuntu-latest
@@ -68,6 +69,7 @@ jobs:
   - *intel-classic* (for `ifort`)
   - *nvidia-hpc* (for `nvfortran`)
 - *version*: Version of the compiler toolchain. See [runner compatibility](#runner-compatibility) charts below.
+- *install_mkl*: If MKL libraries should be installed alongsider the intel compiler. Defaults to `false`.
 
 
 ## Outputs
@@ -112,6 +114,8 @@ Toolchain support varies across GitHub-hosted runner images.
 
 **Note:** Intel's `ifx` compiler is not supported on macOS, so the `intel` option redirects to `intel-classic` (`ifort`).
 
+**Note:** MKL libraries can only be installed for the Intel Fortran compiler, and only on linux and MacOS operating systems; with the exception of intel-classic 2021.5, for which no compatible library is available.
+
 ## License
 
 Licensed under the Apache License, Version 2.0 (the “License”);

Diff for: action.yml

@@ -8,6 +8,10 @@ inputs:
   version:
     description: "Version of toolchain or compiler"
     required: false
+  install_mkl:
+    description: "If MKL should be installed along with the compiler"
+    required: false
+    default: "false"
 outputs:
   fc:
     description: "Path to Fortran compiler"
@@ -50,6 +54,7 @@ runs:
       env:
         COMPILER: ${{ inputs.compiler }}
         VERSION: ${{ inputs.version }}
+        INSTALL_MKL: ${{ inputs.install_mkl }}
       run: |
         action_path=$(echo '/${{ github.action_path }}' | sed -e 's/\\/\//g' -e 's/://')
         source "$action_path/setup-fortran.sh"
@@ -64,11 +69,11 @@ runs:
             ;;
           intel-classic)
             version=${VERSION:-2023.2.0}
-            install_intel $platform true
+            install_intel $platform true ${{ inputs.install_mkl }}
             ;;
           intel)
             version=${VERSION:-2023.2.0}
-            install_intel $platform false
+            install_intel $platform false ${{ inputs.install_mkl }}
             ;;
           nvidia-hpc)
             version=${VERSION:-23.11}
@@ -133,6 +138,7 @@ runs:
           echo fc=$FC>>$GITHUB_OUTPUT
           echo cc=$CC>>$GITHUB_OUTPUT
           echo cxx=$CXX>>$GITHUB_OUTPUT
+          echo MKLLIB=$MKLLIB>>$GITHUB_OUTPUT
         fi
 
         # intel oneapi flag to indicate env has been activated