experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9732 from jhjin/master

Browse Source 
better handling of MKL check in configure
This commit is contained in:
Shanqing Cai 2017-05-06 23:52:47 -04:00 committed by GitHub
commit 196f63b0fd
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -195,6 +195,7 @@ done
OSNAME=`uname -s` OSNAME=`uname -s`
if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
while [ "$TF_DOWNLOAD_MKL" == "" ]; do
fromuser="" fromuser=""
read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT read -p "Do you wish to download MKL LIB from the web? [Y/n] " INPUT
fromuser="1" fromuser="1"
@ -204,6 +205,7 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
"" ) TF_DOWNLOAD_MKL=1;; "" ) TF_DOWNLOAD_MKL=1;;
* ) echo "Invalid selection: " $INPUT; exit 1;; * ) echo "Invalid selection: " $INPUT; exit 1;;
esac esac
done
if [[ "$TF_DOWNLOAD_MKL" == "1" ]]; then if [[ "$TF_DOWNLOAD_MKL" == "1" ]]; then
DST=`dirname $0` DST=`dirname $0`
@ -263,10 +265,6 @@ if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
exit 1 exit 1
fi fi
if [ -z "$fromuser" ]; then
exit 1
fi
cat > third_party/mkl/mkl.config <<EOF cat > third_party/mkl/mkl.config <<EOF
# MKL_INSTALL_PATH refers to the location of MKL root folder. The MKL header and library # MKL_INSTALL_PATH refers to the location of MKL root folder. The MKL header and library
# files can be either in this directory, or under include/ and lib64/ # files can be either in this directory, or under include/ and lib64/