diff --git a/.github/actions/test-mkl/action.yml b/.github/actions/test-mkl/action.yml index 6016979c..7b25e500 100644 --- a/.github/actions/test-mkl/action.yml +++ b/.github/actions/test-mkl/action.yml @@ -20,6 +20,9 @@ runs: run: | if [[ "${{ inputs.compiler }}" =~ "intel" ]] && [[ "${{ inputs.install_mkl }}" == "true" ]] && ([[ "${{ inputs.version }}" != "2021.5" ]] && [[ "$runner.os" != "macOS" ]]); 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 export DYLD_LIBRARY_PATH="${{ env.MKLLIB }}:$DYLD_LIBRARY_PATH" fi linking="-L${{ env.MKLLIB }} -lmkl_intel_lp64 -lmkl_sequential -lmkl_core" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 778457f1..e7e1e21a 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/README.md b/README.md index 685a4324..61535780 100644 --- a/README.md +++ b/README.md @@ -35,7 +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: intel-classic, version: '2021.10'} - {compiler: nvidia-hpc, version: '23.11'} include: - os: ubuntu-latest @@ -49,11 +49,13 @@ jobs: toolchain: {compiler: nvidia-hpc, version: '23.11'} steps: - - uses: fortran-lang/setup-fortran@v1 + - uses: ssciwr/setup-fortran@v0.1 id: setup-fortran with: compiler: ${{ matrix.toolchain.compiler }} version: ${{ matrix.toolchain.version }} + install_mkl: "true" + - run: | ${{ env.FC }} ... # environment vars FC, CC, and CXX are set diff --git a/setup-fortran.sh b/setup-fortran.sh index dbf5fc94..4e290c11 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -183,6 +183,7 @@ LIBRARY_PATH=$LIBRARY_PATH INFOPATH=$INFOPATH MANPATH=$MANPATH MKLLIB=$MKLLIB +MKLROOT=$MKLROOT DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH ONEAPI_ROOT=$ONEAPI_ROOT CLASSPATH=$CLASSPATH @@ -402,6 +403,7 @@ install_intel_apt() fi if $install_mkl; then export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64" + export MKLROOT="$ONEAPI_ROOT/mkl/latest" fi export_intel_vars } @@ -510,6 +512,7 @@ install_intel_dmg() 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 @@ -684,4 +687,4 @@ install_nvidiahpc() exit 1 ;; esac -} \ No newline at end of file +}