From 0e8b6215a8250be09654d5c8b830c89f1b4ee296 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 20 Mar 2024 08:34:31 +0100 Subject: [PATCH 01/13] removed source setvars and manipulation of DYLD_LIBRARY_PATH move macos mkl install into separate script move variable export to main calling function set lib env export in action source instead of execute set MKLLIB per case, skip 2021.5 macos mkl --- action.yml | 3 +++ install-mkl-macos.sh | 22 ++++++++++++++++++ setup-fortran.sh | 55 ++++++++------------------------------------ 3 files changed, 34 insertions(+), 46 deletions(-) create mode 100644 install-mkl-macos.sh diff --git a/action.yml b/action.yml index 0a0fb76..b6416bc 100644 --- a/action.yml +++ b/action.yml @@ -92,6 +92,7 @@ runs: echo "FC=${FC}" >> $GITHUB_ENV echo "CC=${CC}" >> $GITHUB_ENV echo "CXX=${CXX}" >> $GITHUB_ENV + echo "MKLLIB=${MKLLIB}" >> $GITHUB_ENV # save oneAPI cache and activate environment - name: Save cache @@ -134,6 +135,7 @@ runs: echo FC=$FC>>$GITHUB_ENV echo CC=$CC>>$GITHUB_ENV echo CXX=$CXX>>$GITHUB_ENV + echo "MKLLIB=$MKLLIB" >> $GITHUB_ENV # set fpm env vars echo FPM_FC=$FC>>$GITHUB_ENV @@ -144,6 +146,7 @@ runs: echo fc=$FC>>$GITHUB_OUTPUT echo cc=$CC>>$GITHUB_OUTPUT echo cxx=$CXX>>$GITHUB_OUTPUT + echo MKLLIB=$MKLLIB>>$GITHUB_OUTPUT # GitHub Actions prepends GNU linker to the PATH before all bash steps, hide it so MSVC linker is found - name: Hide GNU linker (Windows) diff --git a/install-mkl-macos.sh b/install-mkl-macos.sh new file mode 100644 index 0000000..e360b18 --- /dev/null +++ b/install-mkl-macos.sh @@ -0,0 +1,22 @@ +MACOS_BASEKIT_URL=$1 + +if [ "$MACOS_BASEKIT_URL" == "" ]; then + echo "ERROR: MACOS_BASEKIT_URL is empty - please check the version mapping for MKL" + echo "SKIPPING MKL installation..." +elif [ "$MACOS_BASEKIT_URL" == "2021.5" ]; then + echo "ERROR: MKL not available for this intel compiler version" + echo "SKIPPING MKL installation..." +else + require_fetch + $fetch $MACOS_BASEKIT_URL > m_BASEKit.dmg + ls -lh + hdiutil verify m_BASEKit.dmg + hdiutil attach m_BASEKit.dmg + sudo /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s \ + --action install \ + --eula=accept \ + --continue-with-optional-error=yes \ + --log-dir=. + hdiutil detach /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)" -quiet + rm m_BASEKit.dmg +fi \ No newline at end of file diff --git a/setup-fortran.sh b/setup-fortran.sh index bb2f787..c009582 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -171,10 +171,9 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH LIBRARY_PATH=$LIBRARY_PATH INFOPATH=$INFOPATH MANPATH=$MANPATH -MKLLIB=$MKLLIB MKLROOT=$MKLROOT -DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH ONEAPI_ROOT=$ONEAPI_ROOT +MKLLIB=$MKLLIB CLASSPATH=$CLASSPATH CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH OCL_ICD_FILENAMES=$OCL_ICD_FILENAMES @@ -397,21 +396,6 @@ install_intel_apt() fi source /opt/intel/oneapi/setvars.sh - # these exports have been removed in later versions of the action? - if $classic; then - export FC="ifort" - export CC="icc" - export CXX="icpc" - else - export FC="ifx" - export CC="icx" - export CXX="icpx" - fi - if $install_mkl; then - export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64" - export MKLROOT="$ONEAPI_ROOT/mkl/latest" - fi - export_intel_vars } @@ -480,23 +464,7 @@ install_intel_dmg() esac if $install_mkl; then - if [ "$MACOS_BASEKIT_URL" == "" ]; then - echo "ERROR: MACOS_BASEKIT_URL is empty - please check the version mapping for MKL" - echo "SKIPPING MKL installation..." - else - require_fetch - $fetch $MACOS_BASEKIT_URL > m_BASEKit.dmg - ls -lh - hdiutil verify m_BASEKit.dmg - hdiutil attach m_BASEKit.dmg - sudo /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s \ - --action install \ - --eula=accept \ - --continue-with-optional-error=yes \ - --log-dir=. - hdiutil detach /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)" -quiet - rm m_BASEKit.dmg - fi + source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_BASEKIT_URL fi require_fetch @@ -512,18 +480,6 @@ install_intel_dmg() rm m_HPCKit.dmg source /opt/intel/oneapi/setvars.sh - - # these exports have been removed in later versions of the action? - export FC="ifort" - export CC="icc" - export CXX="icpc" - - if $install_mkl; then - export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib" - export MKLROOT="$ONEAPI_ROOT/mkl/latest" - export DYLD_LIBRARY_PATH="$MKLLIB":$DYLD_LIBRARY_PATH - fi - export_intel_vars } @@ -579,9 +535,11 @@ install_intel() local platform=$1 local classic=$2 local install_mkl=$3 + mkl_subdir="" case $platform in linux*) install_intel_apt $version $classic $install_mkl + mkl_subdir="intel64" ;; darwin*) install_intel_dmg $version $install_mkl @@ -610,6 +568,11 @@ install_intel() export CC="icx" export CXX="icpx" fi + + if $install_mkl; then + export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/$mkl_subdir" + export MKLROOT="$ONEAPI_ROOT/mkl/latest" + fi } export_nvidiahpc_vars() From 2e936a9514ba2a2f4700fc86725cb8ddc039e499 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 08:43:07 +0100 Subject: [PATCH 02/13] use macos install script for both dmgs, answer y in apt install for act compatibility --- install-mkl-macos.sh | 25 ++++++++++++------------- setup-fortran.sh | 20 +++++--------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/install-mkl-macos.sh b/install-mkl-macos.sh index e360b18..256a9bd 100644 --- a/install-mkl-macos.sh +++ b/install-mkl-macos.sh @@ -1,22 +1,21 @@ -MACOS_BASEKIT_URL=$1 - -if [ "$MACOS_BASEKIT_URL" == "" ]; then - echo "ERROR: MACOS_BASEKIT_URL is empty - please check the version mapping for MKL" - echo "SKIPPING MKL installation..." -elif [ "$MACOS_BASEKIT_URL" == "2021.5" ]; then +MACOS_URL=$1 +install_mkl=$2 +if [ "$MACOS_URL" == "" ]; then + echo "ERROR: MACOS URL is empty - please check the version mapping for mkl/intel compiler" + echo "SKIPPING MKL/intel installation..." +elif [ "$MACOS_URL" == "2021.5" ] and $install_mkl; then echo "ERROR: MKL not available for this intel compiler version" echo "SKIPPING MKL installation..." else require_fetch - $fetch $MACOS_BASEKIT_URL > m_BASEKit.dmg - ls -lh - hdiutil verify m_BASEKit.dmg - hdiutil attach m_BASEKit.dmg - sudo /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s \ + $fetch $MACOS_URL > m_BASE_HPC_Kit.dmg + hdiutil verify m_BASE_HPC_Kit.dmg + hdiutil attach m_BASE_HPC_Kit.dmg + sudo /Volumes/"$(basename "$MACOS_URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s \ --action install \ --eula=accept \ --continue-with-optional-error=yes \ --log-dir=. - hdiutil detach /Volumes/"$(basename "$MACOS_BASEKIT_URL" .dmg)" -quiet - rm m_BASEKit.dmg + hdiutil detach /Volumes/"$(basename "$MACOS_URL" .dmg)" -quiet + rm m_BASE_HPC_Kit.dmg fi \ No newline at end of file diff --git a/setup-fortran.sh b/setup-fortran.sh index c009582..ef31b13 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -369,7 +369,7 @@ install_intel_apt() require_fetch local _KEY="GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB" - $fetch https://apt.repos.intel.com/intel-gpg-keys/$_KEY > $_KEY + $fetch https://apt.repos.intsource /opt/intel/oneapi/setvars.shel.com/intel-gpg-keys/$_KEY > $_KEY sudo apt-key add $_KEY rm $_KEY echo "deb https://apt.repos.intel.com/oneapi all main" \ @@ -387,11 +387,11 @@ install_intel_apt() esac if $install_mkl; then - sudo apt-get install \ + sudo apt-get install -y \ intel-oneapi-compiler-{fortran,"$cpp_name"}-$version \ intel-oneapi-mkl-$mkl_version else - sudo apt-get install \ + sudo apt-get install -y \ intel-oneapi-compiler-{fortran,"$cpp_name"}-$version fi @@ -464,20 +464,10 @@ install_intel_dmg() esac if $install_mkl; then - source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_BASEKIT_URL + source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_BASEKIT_URL true fi - require_fetch - $fetch $MACOS_HPCKIT_URL > m_HPCKit.dmg - hdiutil verify m_HPCKit.dmg - hdiutil attach m_HPCKit.dmg - sudo /Volumes/"$(basename "$MACOS_HPCKIT_URL" .dmg)"/bootstrapper.app/Contents/MacOS/bootstrapper -s \ - --action install \ - --eula=accept \ - --continue-with-optional-error=yes \ - --log-dir=. - hdiutil detach /Volumes/"$(basename "$MACOS_HPCKIT_URL" .dmg)" -quiet - rm m_HPCKit.dmg + source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_HPCKIT_URL false source /opt/intel/oneapi/setvars.sh export_intel_vars From 940e8cb264db095f40a7fec6d8625830a65b2379 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 08:47:06 +0100 Subject: [PATCH 03/13] remove accidental duplication --- .github/actions/test-fc/action.yml | 16 ---------------- .github/compat/long_compat.csv | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/actions/test-fc/action.yml b/.github/actions/test-fc/action.yml index dac2ee4..bca4e9e 100644 --- a/.github/actions/test-fc/action.yml +++ b/.github/actions/test-fc/action.yml @@ -58,22 +58,6 @@ 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 --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index fc29968..453c843 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,5 +1,5 @@ runner,compiler,version,support -macos-13,intel-classic,2021.5,✓runner,compiler,version,support +macos-13,intel-classic,2021.5,✓ macos-11,gcc,10,✓ macos-11,gcc,11,✓ macos-11,gcc,12,✓ From 847d4474f0867cf4735693302f1d0bf278fe1421 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 08:50:34 +0100 Subject: [PATCH 04/13] reverse order of passed variables in case string is empty --- install-mkl-macos.sh => install-intel-macos.sh | 4 ++-- setup-fortran.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename install-mkl-macos.sh => install-intel-macos.sh (96%) diff --git a/install-mkl-macos.sh b/install-intel-macos.sh similarity index 96% rename from install-mkl-macos.sh rename to install-intel-macos.sh index 256a9bd..4a16bd2 100644 --- a/install-mkl-macos.sh +++ b/install-intel-macos.sh @@ -1,5 +1,5 @@ -MACOS_URL=$1 -install_mkl=$2 +install_mkl=$1 +MACOS_URL=$2 if [ "$MACOS_URL" == "" ]; then echo "ERROR: MACOS URL is empty - please check the version mapping for mkl/intel compiler" echo "SKIPPING MKL/intel installation..." diff --git a/setup-fortran.sh b/setup-fortran.sh index ef31b13..6ac481d 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -464,10 +464,10 @@ install_intel_dmg() esac if $install_mkl; then - source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_BASEKIT_URL true + source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" true $MACOS_BASEKIT_URL fi - source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" $MACOS_HPCKIT_URL false + source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" false $MACOS_HPCKIT_URL source /opt/intel/oneapi/setvars.sh export_intel_vars From c5942663e2c2251c40a374e72da6ad423778c4bc Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 08:55:42 +0100 Subject: [PATCH 05/13] remove pasted garbage in link --- setup-fortran.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 6ac481d..6cb8b78 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -369,7 +369,7 @@ install_intel_apt() require_fetch local _KEY="GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB" - $fetch https://apt.repos.intsource /opt/intel/oneapi/setvars.shel.com/intel-gpg-keys/$_KEY > $_KEY + $fetch https://apt.repos.intel.com/intel-gpg-keys/$_KEY > $_KEY sudo apt-key add $_KEY rm $_KEY echo "deb https://apt.repos.intel.com/oneapi all main" \ From dc2ccc7131c2d6201b6db4ba63acb98da9595be5 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 11:55:26 +0100 Subject: [PATCH 06/13] rename macos install script --- setup-fortran.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 6cb8b78..11e32bb 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -464,10 +464,10 @@ install_intel_dmg() esac if $install_mkl; then - source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" true $MACOS_BASEKIT_URL + source "$GITHUB_ACTION_PATH/install-intel-macos.sh" true $MACOS_BASEKIT_URL fi - source "$GITHUB_ACTION_PATH/install-mkl-macos.sh" false $MACOS_HPCKIT_URL + source "$GITHUB_ACTION_PATH/install-intel-macos.sh" false $MACOS_HPCKIT_URL source /opt/intel/oneapi/setvars.sh export_intel_vars From 0bcfd2f761cb665d127461ebd0e9ce257b693a9e Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 13:02:57 +0100 Subject: [PATCH 07/13] try wo another export of MKLLIB in the action.yml --- action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/action.yml b/action.yml index b6416bc..af29328 100644 --- a/action.yml +++ b/action.yml @@ -92,7 +92,6 @@ runs: echo "FC=${FC}" >> $GITHUB_ENV echo "CC=${CC}" >> $GITHUB_ENV echo "CXX=${CXX}" >> $GITHUB_ENV - echo "MKLLIB=${MKLLIB}" >> $GITHUB_ENV # save oneAPI cache and activate environment - name: Save cache From 67c914874c1a7816c7dbafda5119d997f5dda7c7 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 13:15:52 +0100 Subject: [PATCH 08/13] export mkllib in test --- .github/actions/test-mkl/action.yml | 8 ++++++-- setup-fortran.sh | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/test-mkl/action.yml b/.github/actions/test-mkl/action.yml index 7b25e50..45c82b0 100644 --- a/.github/actions/test-mkl/action.yml +++ b/.github/actions/test-mkl/action.yml @@ -23,9 +23,13 @@ runs: # required for macOS 11, intel-classic 2021.1-2021.10 # required for macOS 12, intel-classic 2021.1, 2021.4, 2021.6, 2021.10 # for all others, setting DYLD path through environment works correctly - export DYLD_LIBRARY_PATH="${{ env.MKLLIB }}:$DYLD_LIBRARY_PATH" + MKLLIB="$MKLROOT/latest/lib" + export DYLD_LIBRARY_PATH="$MKLLIB:$DYLD_LIBRARY_PATH" + elif [ "$RUNNER_OS" == "Linux" ]; then + MKLLIB="$MKLROOT/latest/lib/intel64" + export LD_LIBRARY_PATH="$MKLLIB:$LD_LIBRARY_PATH" fi - linking="-L${{ env.MKLLIB }} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" + linking="-L$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') diff --git a/setup-fortran.sh b/setup-fortran.sh index 50bd8db..38d88ab 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -173,7 +173,6 @@ INFOPATH=$INFOPATH MANPATH=$MANPATH MKLROOT=$MKLROOT ONEAPI_ROOT=$ONEAPI_ROOT -MKLLIB=$MKLLIB CLASSPATH=$CLASSPATH CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH OCL_ICD_FILENAMES=$OCL_ICD_FILENAMES From 9a69df560ec5bc4c596dcc0c356de4389b295b1e Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Wed, 27 Mar 2024 13:25:46 +0100 Subject: [PATCH 09/13] no latest when using MKLROOT for macos --- .github/actions/test-mkl/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test-mkl/action.yml b/.github/actions/test-mkl/action.yml index 45c82b0..147d975 100644 --- a/.github/actions/test-mkl/action.yml +++ b/.github/actions/test-mkl/action.yml @@ -23,7 +23,7 @@ runs: # required for macOS 11, intel-classic 2021.1-2021.10 # required for macOS 12, intel-classic 2021.1, 2021.4, 2021.6, 2021.10 # for all others, setting DYLD path through environment works correctly - MKLLIB="$MKLROOT/latest/lib" + MKLLIB="$MKLROOT/lib" export DYLD_LIBRARY_PATH="$MKLLIB:$DYLD_LIBRARY_PATH" elif [ "$RUNNER_OS" == "Linux" ]; then MKLLIB="$MKLROOT/latest/lib/intel64" From be008ef57b168531092741ce4c8c0b0db974f9b7 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 28 Mar 2024 10:27:36 +0100 Subject: [PATCH 10/13] test for macos 14 with latest basekit for all intel comp versions --- .github/compat/long_compat.csv | 229 +-------------------------------- setup-fortran.sh | 8 ++ 2 files changed, 9 insertions(+), 228 deletions(-) diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index c58a541..d7e8580 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,51 +1,4 @@ runner,compiler,version,support -macos-12,gcc,10,✓ -macos-12,gcc,11,✓ -macos-12,gcc,12,✓ -macos-12,gcc,13,✓ -macos-12,gcc,7,✓ -macos-12,gcc,8,✓ -macos-12,gcc,9,✓ -macos-12,intel-classic,2021.1.2, -macos-12,intel-classic,2021.1,✓ -macos-12,intel-classic,2021.10,✓ -macos-12,intel-classic,2021.2,✓ -macos-12,intel-classic,2021.3,✓ -macos-12,intel-classic,2021.4,✓ -macos-12,intel-classic,2021.5,✓ -macos-12,intel-classic,2021.6,✓ -macos-12,intel-classic,2021.7.1,✓ -macos-12,intel-classic,2021.7,✓ -macos-12,intel-classic,2021.8,✓ -macos-12,intel-classic,2021.9,✓ -macos-12,lfortran,0.31.0,✓ -macos-12,lfortran,0.32.0,✓ -macos-12,lfortran,0.33.0,✓ -macos-13,gcc,10,✓ -macos-13,gcc,11,✓ -macos-13,gcc,12,✓ -macos-13,gcc,13,✓ -macos-13,gcc,7, -macos-13,gcc,8, -macos-13,intel-classic,2021.1.2, -macos-13,intel-classic,2021.1,✓ -macos-13,intel-classic,2021.10,✓ -macos-13,intel-classic,2021.2,✓ -macos-13,intel-classic,2021.3,✓ -macos-13,intel-classic,2021.4,✓ -macos-13,intel-classic,2021.5,✓ -macos-13,intel-classic,2021.6,✓ -macos-13,intel-classic,2021.7.1,✓ -macos-13,intel-classic,2021.7,✓ -macos-13,intel-classic,2021.8,✓ -macos-13,intel-classic,2021.9,✓ -macos-13,lfortran,0.31.0,✓ -macos-13,lfortran,0.32.0,✓ -macos-13,lfortran,0.33.0,✓ -macos-14,gcc,11,✓ -macos-14,gcc,12,✓ -macos-14,gcc,13,✓ -macos-14,gcc,7, macos-14,intel-classic,2021.1.2, macos-14,intel-classic,2021.1,✓ macos-14,intel-classic,2021.10,✓ @@ -57,184 +10,4 @@ macos-14,intel-classic,2021.6,✓ macos-14,intel-classic,2021.7.1,✓ macos-14,intel-classic,2021.7,✓ macos-14,intel-classic,2021.8,✓ -macos-14,intel-classic,2021.9,✓ -macos-14,lfortran,0.31.0,✓ -macos-14,lfortran,0.32.0,✓ -macos-14,lfortran,0.33.0,✓ -ubuntu-20.04,gcc,10,✓ -ubuntu-20.04,gcc,11,✓ -ubuntu-20.04,gcc,12, -ubuntu-20.04,gcc,13,✓ -ubuntu-20.04,gcc,7,✓ -ubuntu-20.04,gcc,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.2,✓ -ubuntu-20.04,intel-classic,2021.3, -ubuntu-20.04,intel-classic,2021.4,✓ -ubuntu-20.04,intel-classic,2021.5,✓ -ubuntu-20.04,intel-classic,2021.6,✓ -ubuntu-20.04,intel-classic,2021.7.1,✓ -ubuntu-20.04,intel-classic,2021.7,✓ -ubuntu-20.04,intel-classic,2021.8,✓ -ubuntu-20.04,intel-classic,2021.9,✓ -ubuntu-20.04,intel,2021.1.2,✓ -ubuntu-20.04,intel,2021.1,✓ -ubuntu-20.04,intel,2021.2,✓ -ubuntu-20.04,intel,2021.4,✓ -ubuntu-20.04,intel,2022.0,✓ -ubuntu-20.04,intel,2022.1,✓ -ubuntu-20.04,intel,2022.2.1,✓ -ubuntu-20.04,intel,2022.2,✓ -ubuntu-20.04,intel,2023.0,✓ -ubuntu-20.04,intel,2023.1,✓ -ubuntu-20.04,intel,2023.2,✓ -ubuntu-20.04,intel,2024.0,✓ -ubuntu-20.04,lfortran,0.31.0,✓ -ubuntu-20.04,lfortran,0.32.0,✓ -ubuntu-20.04,lfortran,0.33.0,✓ -ubuntu-20.04,nvidia-hpc,20.11,✓ -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,✓ -ubuntu-20.04,nvidia-hpc,21.3, -ubuntu-20.04,nvidia-hpc,21.5, -ubuntu-20.04,nvidia-hpc,21.7, -ubuntu-20.04,nvidia-hpc,21.9, -ubuntu-20.04,nvidia-hpc,22.1, -ubuntu-20.04,nvidia-hpc,22.11,✓ -ubuntu-20.04,nvidia-hpc,22.2, -ubuntu-20.04,nvidia-hpc,22.3, -ubuntu-20.04,nvidia-hpc,22.5, -ubuntu-20.04,nvidia-hpc,22.7, -ubuntu-20.04,nvidia-hpc,22.9, -ubuntu-20.04,nvidia-hpc,23.1, -ubuntu-20.04,nvidia-hpc,23.11,✓ -ubuntu-20.04,nvidia-hpc,23.3,✓ -ubuntu-20.04,nvidia-hpc,23.5,✓ -ubuntu-20.04,nvidia-hpc,23.7,✓ -ubuntu-20.04,nvidia-hpc,23.9,✓ -ubuntu-22.04,gcc,10,✓ -ubuntu-22.04,gcc,11,✓ -ubuntu-22.04,gcc,12,✓ -ubuntu-22.04,gcc,13,✓ -ubuntu-22.04,gcc,7, -ubuntu-22.04,gcc,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.2,✓ -ubuntu-22.04,intel-classic,2021.3, -ubuntu-22.04,intel-classic,2021.4,✓ -ubuntu-22.04,intel-classic,2021.5,✓ -ubuntu-22.04,intel-classic,2021.6,✓ -ubuntu-22.04,intel-classic,2021.7.1,✓ -ubuntu-22.04,intel-classic,2021.7,✓ -ubuntu-22.04,intel-classic,2021.8,✓ -ubuntu-22.04,intel-classic,2021.9,✓ -ubuntu-22.04,intel,2021.1.2,✓ -ubuntu-22.04,intel,2021.1,✓ -ubuntu-22.04,intel,2021.2,✓ -ubuntu-22.04,intel,2021.4,✓ -ubuntu-22.04,intel,2022.0,✓ -ubuntu-22.04,intel,2022.1,✓ -ubuntu-22.04,intel,2022.2.1,✓ -ubuntu-22.04,intel,2022.2,✓ -ubuntu-22.04,intel,2023.0,✓ -ubuntu-22.04,intel,2023.1,✓ -ubuntu-22.04,intel,2023.2,✓ -ubuntu-22.04,intel,2024.0,✓ -ubuntu-22.04,lfortran,0.31.0,✓ -ubuntu-22.04,lfortran,0.32.0,✓ -ubuntu-22.04,lfortran,0.33.0,✓ -ubuntu-22.04,nvidia-hpc,20.11,✓ -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,✓ -ubuntu-22.04,nvidia-hpc,21.7, -ubuntu-22.04,nvidia-hpc,22.1, -ubuntu-22.04,nvidia-hpc,22.11,✓ -ubuntu-22.04,nvidia-hpc,22.2, -ubuntu-22.04,nvidia-hpc,22.3, -ubuntu-22.04,nvidia-hpc,22.5, -ubuntu-22.04,nvidia-hpc,22.7, -ubuntu-22.04,nvidia-hpc,22.9, -ubuntu-22.04,nvidia-hpc,23.1, -ubuntu-22.04,nvidia-hpc,23.11,✓ -ubuntu-22.04,nvidia-hpc,23.3,✓ -ubuntu-22.04,nvidia-hpc,23.5,✓ -ubuntu-22.04,nvidia-hpc,23.7,✓ -ubuntu-22.04,nvidia-hpc,23.9,✓ -windows-2019,gcc,10,✓ -windows-2019,gcc,11,✓ -windows-2019,gcc,12,✓ -windows-2019,gcc,13,✓ -windows-2019,gcc,7, -windows-2019,gcc,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.2, -windows-2019,intel-classic,2021.3, -windows-2019,intel-classic,2021.4, -windows-2019,intel-classic,2021.5, -windows-2019,intel-classic,2021.6,✓ -windows-2019,intel-classic,2021.7.1, -windows-2019,intel-classic,2021.7,✓ -windows-2019,intel-classic,2021.8,✓ -windows-2019,intel-classic,2021.9,✓ -windows-2019,intel,2021.1.2, -windows-2019,intel,2021.1, -windows-2019,intel,2021.2, -windows-2019,intel,2021.4, -windows-2019,intel,2022.0, -windows-2019,intel,2022.1,✓ -windows-2019,intel,2022.2.1, -windows-2019,intel,2022.2,✓ -windows-2019,intel,2023.0,✓ -windows-2019,intel,2023.1,✓ -windows-2019,intel,2023.2,✓ -windows-2019,intel,2024.0,✓ -windows-2019,lfortran,0.31.0,✓ -windows-2019,lfortran,0.32.0,✓ -windows-2019,lfortran,0.33.0,✓ -windows-2022,gcc,10,✓ -windows-2022,gcc,11,✓ -windows-2022,gcc,12,✓ -windows-2022,gcc,13,✓ -windows-2022,gcc,7, -windows-2022,gcc,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.2, -windows-2022,intel-classic,2021.3, -windows-2022,intel-classic,2021.4, -windows-2022,intel-classic,2021.5, -windows-2022,intel-classic,2021.6,✓ -windows-2022,intel-classic,2021.7.1, -windows-2022,intel-classic,2021.7,✓ -windows-2022,intel-classic,2021.8,✓ -windows-2022,intel-classic,2021.9,✓ -windows-2022,intel,2021.1.2, -windows-2022,intel,2021.1, -windows-2022,intel,2021.2, -windows-2022,intel,2021.4, -windows-2022,intel,2022.0, -windows-2022,intel,2022.1,✓ -windows-2022,intel,2022.2.1, -windows-2022,intel,2022.2,✓ -windows-2022,intel,2023.0,✓ -windows-2022,intel,2023.1,✓ -windows-2022,intel,2023.2,✓ -windows-2022,intel,2024.0,✓ -windows-2022,lfortran,0.31.0,✓ -windows-2022,lfortran,0.32.0,✓ -windows-2022,lfortran,0.33.0,✓ +macos-14,intel-classic,2021.9,✓ \ No newline at end of file diff --git a/setup-fortran.sh b/setup-fortran.sh index 4afc5b7..a2db6eb 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -445,6 +445,14 @@ install_intel_dmg() ;; esac + # for mac-os 14, use only the latest basekit + macos_version = $(sw_vers) + echo "Found macos version $macos_version" + if [[ $macos_version == *"14"* ]]; then + echo "setting latest basekit for macos 14" + mkl_version="2023.2.0" + fi + case $mkl_version in 2022.2.0) MACOS_BASEKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18675/m_BaseKit_p_2022.2.0.226_offline.dmg From 99c8b3b3b43b17c2cfe200ca142800fb6099255b Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 28 Mar 2024 15:08:47 +0100 Subject: [PATCH 11/13] set conditions to run mkl test in mkl action file --- .github/actions/test-mkl/action.yml | 24 ++++++++++--- .github/compat/long_compat.csv | 13 +------ .github/workflows/test.yml | 5 ++- setup-fortran.sh | 55 +++++++++++++++++------------ 4 files changed, 58 insertions(+), 39 deletions(-) diff --git a/.github/actions/test-mkl/action.yml b/.github/actions/test-mkl/action.yml index 147d975..67b9b83 100644 --- a/.github/actions/test-mkl/action.yml +++ b/.github/actions/test-mkl/action.yml @@ -18,11 +18,25 @@ runs: working-directory: test shell: bash run: | - if [[ "${{ inputs.compiler }}" =~ "intel" ]] && [[ "${{ inputs.install_mkl }}" == "true" ]] && ([[ "${{ inputs.version }}" != "2021.5" ]] && [[ "$runner.os" != "macOS" ]]); then + # check settings if mkl tests should be run + # mkl cannot be installed for 2021.5 on macos; + # and for macos-14 also not 2021.6-2021.9 + mkl_tests=true + echo "$RUNNER_OS" + if [[ "${{ inputs.compiler }}" =~ "gcc" ]]; then mkl_tests=false; fi + if [[ "${{ inputs.install_mkl }}" == "false" ]]; then mkl_tests=false; fi + if [[ "${{ inputs.version }}" == "2021.5" ]] && [[ "$RUNNER_OS" == "macOS" ]]; then mkl_tests=false; fi + if [[ "$RUNNER_OS" == "macOS" ]]; then + macos_version=$(sw_vers | grep "ProductVersion") + echo "$macos_version" + if [[ "$macos_version" =~ "14." ]] && [[ "${{ inputs.version }}" == '2021.6' || "${{ inputs.version }}" == '2021.7' || "${{ inputs.version }}" == '2021.7.1' || "${{ inputs.version }}" == '2021.8' ]]; then + mkl_tests=false + fi + fi + + # # now we know if we should, run the tests + if $mkl_tests; then if [ "$RUNNER_OS" == "macOS" ]; then - # required for macOS 11, intel-classic 2021.1-2021.10 - # required for macOS 12, intel-classic 2021.1, 2021.4, 2021.6, 2021.10 - # for all others, setting DYLD path through environment works correctly MKLLIB="$MKLROOT/lib" export DYLD_LIBRARY_PATH="$MKLLIB:$DYLD_LIBRARY_PATH" elif [ "$RUNNER_OS" == "Linux" ]; then @@ -35,4 +49,6 @@ runs: 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 + else + echo "Skipping MKL tests" fi \ No newline at end of file diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index d7e8580..adf6c4f 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,13 +1,2 @@ runner,compiler,version,support -macos-14,intel-classic,2021.1.2, -macos-14,intel-classic,2021.1,✓ -macos-14,intel-classic,2021.10,✓ -macos-14,intel-classic,2021.2,✓ -macos-14,intel-classic,2021.3,✓ -macos-14,intel-classic,2021.4,✓ -macos-14,intel-classic,2021.5,✓ -macos-14,intel-classic,2021.6,✓ -macos-14,intel-classic,2021.7.1,✓ -macos-14,intel-classic,2021.7,✓ -macos-14,intel-classic,2021.8,✓ -macos-14,intel-classic,2021.9,✓ \ No newline at end of file +macos-14,intel-classic,2021.10,✓ \ No newline at end of file diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e669aa..7905235 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -87,7 +87,10 @@ jobs: version: ${{ matrix.toolchain.version }} - name: Test MKL libraries - if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' + # we could also exclude 2021.5 for all macos versions here + # this needs refactoring at some point - should the install + # fail if no mkl version exists? + if: steps.setup-fortran.outcome == 'success' && runner.os != 'windows' uses: ./.github/actions/test-mkl with: compiler: ${{ matrix.toolchain.compiler }} diff --git a/setup-fortran.sh b/setup-fortran.sh index a2db6eb..ae26419 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -295,20 +295,39 @@ intel_version_map_m() mkl_version_map_m() { local intel_version=$1 - case $intel_version in - 2021.1.0 | 2021.2.0 | 2021.3.0 | 2021.4.0 | 2022.2.0 | 2022.3.0 | 2022.3.1 | 2023.0.0 ) - mkl_version=2022.2.0 - ;; - 2022.1.0) - mkl_version="" - ;; - 2023.1.0) - mkl_version=2023.1.0 - ;; - *) - mkl_version=2023.2.0 - ;; - esac + macos_version=$(sw_vers | grep "ProductVersion") + echo "Found macos version $macos_version" + if [[ "$macos_version" == *"14"* ]]; then + echo "MacOS 14 requires different basekit versions to work" + case $intel_version in + # compiler versions 2021.1, 2021.2, 2021.3, 2021.4, 2021.10 work with latest basekit + 2021.1.0 | 2021.2.0 | 2021.3.0 | 2021.4.0 | 2023.2.0) + mkl_version=2023.2.0 + ;; + # compiler versions 2021.5, 2021.6, 2021.7, 2021.7.1, 2021.8, 2021.9 work with other basekits + 2023.1.0) + mkl_version=2022.2.0 + ;; + *) + mkl_version="" + ;; + esac + else + case $intel_version in + 2021.1.0 | 2021.2.0 | 2021.3.0 | 2021.4.0 | 2022.2.0 | 2022.3.0 | 2022.3.1 | 2023.0.0 ) + mkl_version=2022.2.0 + ;; + 2022.1.0) + mkl_version="" + ;; + 2023.1.0) + mkl_version=2023.1.0 + ;; + *) + mkl_version=2023.2.0 + ;; + esac + fi } intel_version_map_w() @@ -445,14 +464,6 @@ install_intel_dmg() ;; esac - # for mac-os 14, use only the latest basekit - macos_version = $(sw_vers) - echo "Found macos version $macos_version" - if [[ $macos_version == *"14"* ]]; then - echo "setting latest basekit for macos 14" - mkl_version="2023.2.0" - fi - case $mkl_version in 2022.2.0) MACOS_BASEKIT_URL=https://registrationcenter-download.intel.com/akdlm/IRC_NAS/18675/m_BaseKit_p_2022.2.0.226_offline.dmg From 5550ad6ccc54745fb67a783ad928355679e1b536 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 28 Mar 2024 15:14:16 +0100 Subject: [PATCH 12/13] run all tests --- .github/compat/long_compat.csv | 240 ++++++++++++++++++++++++++++++++- 1 file changed, 239 insertions(+), 1 deletion(-) diff --git a/.github/compat/long_compat.csv b/.github/compat/long_compat.csv index adf6c4f..b60d489 100644 --- a/.github/compat/long_compat.csv +++ b/.github/compat/long_compat.csv @@ -1,2 +1,240 @@ runner,compiler,version,support -macos-14,intel-classic,2021.10,✓ \ No newline at end of file +macos-12,gcc,10,✓ +macos-12,gcc,11,✓ +macos-12,gcc,12,✓ +macos-12,gcc,13,✓ +macos-12,gcc,7,✓ +macos-12,gcc,8,✓ +macos-12,gcc,9,✓ +macos-12,intel-classic,2021.1.2, +macos-12,intel-classic,2021.1,✓ +macos-12,intel-classic,2021.10,✓ +macos-12,intel-classic,2021.2,✓ +macos-12,intel-classic,2021.3,✓ +macos-12,intel-classic,2021.4,✓ +macos-12,intel-classic,2021.5,✓ +macos-12,intel-classic,2021.6,✓ +macos-12,intel-classic,2021.7.1,✓ +macos-12,intel-classic,2021.7,✓ +macos-12,intel-classic,2021.8,✓ +macos-12,intel-classic,2021.9,✓ +macos-12,lfortran,0.31.0,✓ +macos-12,lfortran,0.32.0,✓ +macos-12,lfortran,0.33.0,✓ +macos-13,gcc,10,✓ +macos-13,gcc,11,✓ +macos-13,gcc,12,✓ +macos-13,gcc,13,✓ +macos-13,gcc,7, +macos-13,gcc,8, +macos-13,intel-classic,2021.1.2, +macos-13,intel-classic,2021.1,✓ +macos-13,intel-classic,2021.10,✓ +macos-13,intel-classic,2021.2,✓ +macos-13,intel-classic,2021.3,✓ +macos-13,intel-classic,2021.4,✓ +macos-13,intel-classic,2021.5,✓ +macos-13,intel-classic,2021.6,✓ +macos-13,intel-classic,2021.7.1,✓ +macos-13,intel-classic,2021.7,✓ +macos-13,intel-classic,2021.8,✓ +macos-13,intel-classic,2021.9,✓ +macos-13,lfortran,0.31.0,✓ +macos-13,lfortran,0.32.0,✓ +macos-13,lfortran,0.33.0,✓ +macos-14,gcc,11,✓ +macos-14,gcc,12,✓ +macos-14,gcc,13,✓ +macos-14,gcc,7, +macos-14,intel-classic,2021.1.2, +macos-14,intel-classic,2021.1,✓ +macos-14,intel-classic,2021.10,✓ +macos-14,intel-classic,2021.2,✓ +macos-14,intel-classic,2021.3,✓ +macos-14,intel-classic,2021.4,✓ +macos-14,intel-classic,2021.5,✓ +macos-14,intel-classic,2021.6,✓ +macos-14,intel-classic,2021.7.1,✓ +macos-14,intel-classic,2021.7,✓ +macos-14,intel-classic,2021.8,✓ +macos-14,intel-classic,2021.9,✓ +macos-14,lfortran,0.31.0,✓ +macos-14,lfortran,0.32.0,✓ +macos-14,lfortran,0.33.0,✓ +ubuntu-20.04,gcc,10,✓ +ubuntu-20.04,gcc,11,✓ +ubuntu-20.04,gcc,12, +ubuntu-20.04,gcc,13,✓ +ubuntu-20.04,gcc,7,✓ +ubuntu-20.04,gcc,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.2,✓ +ubuntu-20.04,intel-classic,2021.3, +ubuntu-20.04,intel-classic,2021.4,✓ +ubuntu-20.04,intel-classic,2021.5,✓ +ubuntu-20.04,intel-classic,2021.6,✓ +ubuntu-20.04,intel-classic,2021.7.1,✓ +ubuntu-20.04,intel-classic,2021.7,✓ +ubuntu-20.04,intel-classic,2021.8,✓ +ubuntu-20.04,intel-classic,2021.9,✓ +ubuntu-20.04,intel,2021.1.2,✓ +ubuntu-20.04,intel,2021.1,✓ +ubuntu-20.04,intel,2021.2,✓ +ubuntu-20.04,intel,2021.4,✓ +ubuntu-20.04,intel,2022.0,✓ +ubuntu-20.04,intel,2022.1,✓ +ubuntu-20.04,intel,2022.2.1,✓ +ubuntu-20.04,intel,2022.2,✓ +ubuntu-20.04,intel,2023.0,✓ +ubuntu-20.04,intel,2023.1,✓ +ubuntu-20.04,intel,2023.2,✓ +ubuntu-20.04,intel,2024.0,✓ +ubuntu-20.04,lfortran,0.31.0,✓ +ubuntu-20.04,lfortran,0.32.0,✓ +ubuntu-20.04,lfortran,0.33.0,✓ +ubuntu-20.04,nvidia-hpc,20.11,✓ +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,✓ +ubuntu-20.04,nvidia-hpc,21.3, +ubuntu-20.04,nvidia-hpc,21.5, +ubuntu-20.04,nvidia-hpc,21.7, +ubuntu-20.04,nvidia-hpc,21.9, +ubuntu-20.04,nvidia-hpc,22.1, +ubuntu-20.04,nvidia-hpc,22.11,✓ +ubuntu-20.04,nvidia-hpc,22.2, +ubuntu-20.04,nvidia-hpc,22.3, +ubuntu-20.04,nvidia-hpc,22.5, +ubuntu-20.04,nvidia-hpc,22.7, +ubuntu-20.04,nvidia-hpc,22.9, +ubuntu-20.04,nvidia-hpc,23.1, +ubuntu-20.04,nvidia-hpc,23.11,✓ +ubuntu-20.04,nvidia-hpc,23.3,✓ +ubuntu-20.04,nvidia-hpc,23.5,✓ +ubuntu-20.04,nvidia-hpc,23.7,✓ +ubuntu-20.04,nvidia-hpc,23.9,✓ +ubuntu-22.04,gcc,10,✓ +ubuntu-22.04,gcc,11,✓ +ubuntu-22.04,gcc,12,✓ +ubuntu-22.04,gcc,13,✓ +ubuntu-22.04,gcc,7, +ubuntu-22.04,gcc,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.2,✓ +ubuntu-22.04,intel-classic,2021.3, +ubuntu-22.04,intel-classic,2021.4,✓ +ubuntu-22.04,intel-classic,2021.5,✓ +ubuntu-22.04,intel-classic,2021.6,✓ +ubuntu-22.04,intel-classic,2021.7.1,✓ +ubuntu-22.04,intel-classic,2021.7,✓ +ubuntu-22.04,intel-classic,2021.8,✓ +ubuntu-22.04,intel-classic,2021.9,✓ +ubuntu-22.04,intel,2021.1.2,✓ +ubuntu-22.04,intel,2021.1,✓ +ubuntu-22.04,intel,2021.2,✓ +ubuntu-22.04,intel,2021.4,✓ +ubuntu-22.04,intel,2022.0,✓ +ubuntu-22.04,intel,2022.1,✓ +ubuntu-22.04,intel,2022.2.1,✓ +ubuntu-22.04,intel,2022.2,✓ +ubuntu-22.04,intel,2023.0,✓ +ubuntu-22.04,intel,2023.1,✓ +ubuntu-22.04,intel,2023.2,✓ +ubuntu-22.04,intel,2024.0,✓ +ubuntu-22.04,lfortran,0.31.0,✓ +ubuntu-22.04,lfortran,0.32.0,✓ +ubuntu-22.04,lfortran,0.33.0,✓ +ubuntu-22.04,nvidia-hpc,20.11,✓ +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,✓ +ubuntu-22.04,nvidia-hpc,21.7, +ubuntu-22.04,nvidia-hpc,22.1, +ubuntu-22.04,nvidia-hpc,22.11,✓ +ubuntu-22.04,nvidia-hpc,22.2, +ubuntu-22.04,nvidia-hpc,22.3, +ubuntu-22.04,nvidia-hpc,22.5, +ubuntu-22.04,nvidia-hpc,22.7, +ubuntu-22.04,nvidia-hpc,22.9, +ubuntu-22.04,nvidia-hpc,23.1, +ubuntu-22.04,nvidia-hpc,23.11,✓ +ubuntu-22.04,nvidia-hpc,23.3,✓ +ubuntu-22.04,nvidia-hpc,23.5,✓ +ubuntu-22.04,nvidia-hpc,23.7,✓ +ubuntu-22.04,nvidia-hpc,23.9,✓ +windows-2019,gcc,10,✓ +windows-2019,gcc,11,✓ +windows-2019,gcc,12,✓ +windows-2019,gcc,13,✓ +windows-2019,gcc,7, +windows-2019,gcc,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.2, +windows-2019,intel-classic,2021.3, +windows-2019,intel-classic,2021.4, +windows-2019,intel-classic,2021.5, +windows-2019,intel-classic,2021.6,✓ +windows-2019,intel-classic,2021.7.1, +windows-2019,intel-classic,2021.7,✓ +windows-2019,intel-classic,2021.8,✓ +windows-2019,intel-classic,2021.9,✓ +windows-2019,intel,2021.1.2, +windows-2019,intel,2021.1, +windows-2019,intel,2021.2, +windows-2019,intel,2021.4, +windows-2019,intel,2022.0, +windows-2019,intel,2022.1,✓ +windows-2019,intel,2022.2.1, +windows-2019,intel,2022.2,✓ +windows-2019,intel,2023.0,✓ +windows-2019,intel,2023.1,✓ +windows-2019,intel,2023.2,✓ +windows-2019,intel,2024.0,✓ +windows-2019,lfortran,0.31.0,✓ +windows-2019,lfortran,0.32.0,✓ +windows-2019,lfortran,0.33.0,✓ +windows-2022,gcc,10,✓ +windows-2022,gcc,11,✓ +windows-2022,gcc,12,✓ +windows-2022,gcc,13,✓ +windows-2022,gcc,7, +windows-2022,gcc,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.2, +windows-2022,intel-classic,2021.3, +windows-2022,intel-classic,2021.4, +windows-2022,intel-classic,2021.5, +windows-2022,intel-classic,2021.6,✓ +windows-2022,intel-classic,2021.7.1, +windows-2022,intel-classic,2021.7,✓ +windows-2022,intel-classic,2021.8,✓ +windows-2022,intel-classic,2021.9,✓ +windows-2022,intel,2021.1.2, +windows-2022,intel,2021.1, +windows-2022,intel,2021.2, +windows-2022,intel,2021.4, +windows-2022,intel,2022.0, +windows-2022,intel,2022.1,✓ +windows-2022,intel,2022.2.1, +windows-2022,intel,2022.2,✓ +windows-2022,intel,2023.0,✓ +windows-2022,intel,2023.1,✓ +windows-2022,intel,2023.2,✓ +windows-2022,intel,2024.0,✓ +windows-2022,lfortran,0.31.0,✓ +windows-2022,lfortran,0.32.0,✓ +windows-2022,lfortran,0.33.0,✓ \ No newline at end of file From f1d11ff30994434edb6e3b8fa802268874001762 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 28 Mar 2024 20:33:42 +0100 Subject: [PATCH 13/13] exclude lfortran and nvidia from mkl test --- .github/actions/test-mkl/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/test-mkl/action.yml b/.github/actions/test-mkl/action.yml index 67b9b83..a586838 100644 --- a/.github/actions/test-mkl/action.yml +++ b/.github/actions/test-mkl/action.yml @@ -24,6 +24,8 @@ runs: mkl_tests=true echo "$RUNNER_OS" if [[ "${{ inputs.compiler }}" =~ "gcc" ]]; then mkl_tests=false; fi + if [[ "${{ inputs.compiler }}" =~ "lfortran" ]]; then mkl_tests=false; fi + if [[ "${{ inputs.compiler }}" =~ "nvidia" ]]; then mkl_tests=false; fi if [[ "${{ inputs.install_mkl }}" == "false" ]]; then mkl_tests=false; fi if [[ "${{ inputs.version }}" == "2021.5" ]] && [[ "$RUNNER_OS" == "macOS" ]]; then mkl_tests=false; fi if [[ "$RUNNER_OS" == "macOS" ]]; then