@@ -834,7 +834,7 @@ auto_lib= # Deduced lib name, used when $MATHLIB is not set.
834
834
835
835
# Validate the (optionally) provided MATHLIB value.
836
836
case $MATHLIB in
837
- ' ' |ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK) : ;;
837
+ ' ' |ATLAS|CLAPACK|MKL|OPENBLAS|OPENBLAS_CLAPACK|OPENBLAS_NO_F2C ) : ;;
838
838
* ) failure " Unknown --mathlib='${MATHLIB} '. Supported libs: ATLAS CLAPACK MKL OPENBLAS" ;;
839
839
esac
840
840
@@ -1301,7 +1301,7 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
1301
1301
esac >> kaldi.mk
1302
1302
1303
1303
echo " Successfully configured for Linux with OpenBLAS from $OPENBLASROOT "
1304
- elif [ " $MATHLIB " == " OPENBLAS_CLAPACK" ]; then
1304
+ elif [ " $MATHLIB " == " OPENBLAS_CLAPACK" ] || [ " $MATHLIB " == " OPENBLAS_NO_F2C " ] ; then
1305
1305
if [[ ! $OPENBLASROOT ]]; then
1306
1306
# Either the user specified --mathlib=OPENBLAS or we've autodetected the
1307
1307
# system where OpenBLAS is the preferred option (the parser for
@@ -1345,7 +1345,11 @@ or try another math library, e.g. --mathlib=OPENBLAS (Kaldi may be slower)."
1345
1345
OPENBLASINCDIR=" /usr/include"
1346
1346
fi
1347
1347
echo " Your math library seems to be OpenBLAS from $OPENBLASROOT . Configuring appropriately."
1348
- OPENBLASLIBS=" -L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
1348
+ if [ " $MATHLIB " == " OPENBLAS_CLAPACK" ]; then
1349
+ OPENBLASLIBS=" -L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a -l:libf2c.a"
1350
+ else
1351
+ OPENBLASLIBS=" -L$OPENBLASLIBDIR -l:libopenblas.a -l:libblas.a -l:liblapack.a"
1352
+ fi
1349
1353
echo " OPENBLASINC = $OPENBLASINCDIR " >> kaldi.mk
1350
1354
echo " OPENBLASLIBS = $OPENBLASLIBS " >> kaldi.mk
1351
1355
echo >> kaldi.mk
0 commit comments