Skip to content

[build] Clarify instructions if cub is not found #2858

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 1 commit into from
Nov 20, 2018
Merged

[build] Clarify instructions if cub is not found #2858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 11 additions & 8 deletions src/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,13 +1096,6 @@ if $double_precision; then
else
echo "DOUBLE_PRECISION = 0" >> kaldi.mk
fi
$use_cuda && echo "Checking cub library in $CUBROOT ..."
if [[ "$use_cuda" = true && ! -f $CUBROOT/cub/cub.cuh ]]; then
failure "Could not find file $CUBROOT/cub/cub.cuh:
you may not have installed cub. See ../tools/INSTALL"
else
echo "CUBROOT = $CUBROOT" >> kaldi.mk
fi
echo "Checking OpenFst library in $FSTROOT ..."
if [ ! -f $FSTROOT/include/fst/fst.h ]; then
failure "Could not find file $FSTROOT/include/fst/fst.h:
Expand Down Expand Up @@ -1135,6 +1128,16 @@ echo "OPENFSTLIBS = $OPENFSTLIBS" >> kaldi.mk
echo "OPENFSTLDFLAGS = $OPENFSTLDFLAGS" >> kaldi.mk
echo >> kaldi.mk

$use_cuda && echo "Checking cub library in $CUBROOT ..."
if [[ "$use_cuda" = true && ! -f $CUBROOT/cub/cub.cuh ]]; then
failure "Could not find file $CUBROOT/cub/cub.cuh:
you may not have installed cub. Go to ../tools/ and type
e.g. 'make cub'; cub is a new requirement."
else
echo "CUBROOT = $CUBROOT" >> kaldi.mk
fi


# OS-specific steps given below append to kaldi.mk
echo "Doing OS specific configurations ..."

Expand Down Expand Up @@ -1347,7 +1350,7 @@ elif [ "`uname`" == "Linux" ]; then
elif [ -f $OPENBLASROOT/include/openblas/cblas.h ] ; then
# in REDHAT/CentOS/Ubuntu package installs, the includes are located here
OPENBLASINCDIR=$OPENBLASROOT/include/openblas
else
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,"
Expand Down