From aaa6ce05c046e0dd9553f01cbe7fb51265f90c02 Mon Sep 17 00:00:00 2001 From: Inga Ulusoy Date: Thu, 14 Sep 2023 21:42:15 +0200 Subject: [PATCH] V0 (#4) * add version number to apt mkl install * hpc basekit for macos --- setup-fortran.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/setup-fortran.sh b/setup-fortran.sh index 1dc5c5f..d0712b6 100755 --- a/setup-fortran.sh +++ b/setup-fortran.sh @@ -345,11 +345,11 @@ install_intel_apt() case $version in 2024*) sudo apt-get install \ - intel-oneapi-compiler-{fortran,dpcpp-cpp}-$version + intel-oneapi-compiler-{fortran,dpcpp-cpp}-$version intel-oneapi-mkl-$version ;; *) sudo apt-get install \ - intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version + intel-oneapi-compiler-{fortran,dpcpp-cpp-and-cpp-classic}-$version intel-oneapi-mkl-$version ;; esac @@ -412,6 +412,17 @@ install_intel_dmg() ;; esac + require_fetch + $fetch $MACOS_BASEKIT_URL > 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 + require_fetch $fetch $MACOS_HPCKIT_URL > m_HPCKit.dmg hdiutil attach m_HPCKit.dmg