Skip to content

Update configure to handle rpm based openblas #2618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 11 commits into from
Sep 5, 2018
Merged

Update configure to handle rpm based openblas #2618

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e32f3b
Update for rpm based openblas
Aug 13, 2018
e2442fa
Update for rpm based openblas
Aug 13, 2018
c759b16
Update for rpm based openblas
Aug 13, 2018
ef6b11d
Update for rpm based openblas
Aug 13, 2018
3da571a
Merge pull request #1 from kaldi-asr/master
btiplitz Aug 27, 2018
424dac1
incorporate comments
Aug 27, 2018
f920a8e
Merge branch 'master' into openblas-rpm
btiplitz Aug 27, 2018
26d66e1
Merge branch 'master' into openblas-rpm
btiplitz Aug 29, 2018
34fb754
Merge remote-tracking branch 'upstream/master'
Sep 5, 2018
b8632ee
Merge branch 'master' into openblas-rpm
Sep 5, 2018
92d209a
increase warnng verbosity
Sep 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,18 +1309,36 @@ elif [ "`uname`" == "Linux" ]; then
if [ -z "$OPENBLASROOT" ]; then
failure "Must specify the location of OPENBLAS with --openblas-root option (and it must exist)"
fi
if [ ! -f $OPENBLASROOT/lib/libopenblas.so ]; then
if [ -f $OPENBLASROOT/lib/libopenblas.so ]; then
Copy link
Contributor

@galv galv Aug 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you comment that this is the deb-based install path and the second case is the rpm-based install path for clarity to others?

Copy link
Contributor Author

@btiplitz btiplitz Aug 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do

OPENBLASLIBDIR=$OPENBLASROOT/lib
elif [ -f $OPENBLASROOT/lib64/libopenblas.so ]; then
# in REDHAT/CentOS package installs, the library is located here
OPENBLASLIBDIR=$OPENBLASROOT/lib64
else
failure "Expected to find the file $OPENBLASROOT/lib/libopenblas.so"
fi
if [ -f $OPENBLASROOT/include/cblas.h ] ; then
OPENBLASINCDIR=$OPENBLASROOT/include
elif [ -f $OPENBLASROOT/include/openblas/cblas.h ] ; then
# in REDHAT/CentOS/Ubuntu package installs, the includes are located here
OPENBLASINCDIR=$OPENBLASROOT/include/openblas
else
echo "$0: ***** Using OpenBlas from $OPENBLASROOT but cblas.h is not found. "
echo " ****** Assuming openblas is aleady in a default include path, but"
echo " ***** if you get compilation messages about not finding files like cblas.h,"
echo " ***** you should look into this (e.g. make sure to install the 'openblas-dev' package,"
echo " ***** if it is a package-based install)."
OPENBLASINCDIR="/usr/include"
fi
echo "Your math library seems to be OpenBLAS from $OPENBLASROOT. Configuring appropriately."
if $static_math; then
echo "Configuring static OpenBlas since --static-math=yes"
OPENBLASLIBS="$OPENBLASROOT/lib/libopenblas.a -lgfortran"
OPENBLASLIBS="$OPENBLASLIBDIR/libopenblas.a -lgfortran"
else
echo "Configuring dynamically loaded OpenBlas since --static-math=no (the default)"
OPENBLASLIBS="-L$OPENBLASROOT/lib -lopenblas -lgfortran -Wl,-rpath=$OPENBLASROOT/lib"
OPENBLASLIBS="-L$OPENBLASLIBDIR -lopenblas -lgfortran -Wl,-rpath=$OPENBLASLIBDIR"
fi
echo "OPENBLASINC = $OPENBLASROOT/include" >> kaldi.mk
echo "OPENBLASINC = $OPENBLASINCDIR" >> kaldi.mk
echo "OPENBLASLIBS = $OPENBLASLIBS" >> kaldi.mk
echo >> kaldi.mk
if [[ "$TARGET_ARCH" == arm* ]]; then
Expand Down