Skip to content

Commit e96304b

Browse files
committed
set MKLLIB per case, skip 2021.5 macos mkl
1 parent 92bfae5 commit e96304b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

install-mkl-macos.sh

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ MACOS_BASEKIT_URL=$1
33
if [ "$MACOS_BASEKIT_URL" == "" ]; then
44
echo "ERROR: MACOS_BASEKIT_URL is empty - please check the version mapping for MKL"
55
echo "SKIPPING MKL installation..."
6+
else if [ "$MACOS_BASEKIT_URL" == "" ]; then
7+
echo "ERROR: MKL not available for this intel compiler version"
8+
echo "SKIPPING MKL installation..."
69
else
710
require_fetch
811
$fetch $MACOS_BASEKIT_URL > m_BASEKit.dmg

setup-fortran.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ LD_LIBRARY_PATH=$LD_LIBRARY_PATH
171171
LIBRARY_PATH=$LIBRARY_PATH
172172
INFOPATH=$INFOPATH
173173
MANPATH=$MANPATH
174-
MKLLIB=$MKLLIB
175174
MKLROOT=$MKLROOT
176175
ONEAPI_ROOT=$ONEAPI_ROOT
176+
MKLLIB=$MKLLIB
177177
CLASSPATH=$CLASSPATH
178178
CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH
179179
OCL_ICD_FILENAMES=$OCL_ICD_FILENAMES
@@ -538,6 +538,7 @@ install_intel()
538538
case $platform in
539539
linux*)
540540
install_intel_apt $version $classic $install_mkl
541+
mkl_subdir="intel64"
541542
;;
542543
darwin*)
543544
install_intel_dmg $version $install_mkl
@@ -567,8 +568,10 @@ install_intel()
567568
export CXX="icpx"
568569
fi
569570

571+
if
572+
570573
if $install_mkl; then
571-
export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/intel64"
574+
export MKLLIB="$ONEAPI_ROOT/mkl/latest/lib/$mkl_subdir"
572575
export MKLROOT="$ONEAPI_ROOT/mkl/latest"
573576
fi
574577
}

0 commit comments

Comments
 (0)