Merge changes from github.
Change: 151046259
diff --git a/configure b/configure
index 05daa23..081db20 100755
--- a/configure
+++ b/configure
@@ -8,6 +8,9 @@
SOURCE_BASE_DIR=`pwd -P`
popd > /dev/null
+# This file contains customized config settings.
+touch .bazelrc
+
PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
function is_linux() {
@@ -36,15 +39,11 @@
}
function bazel_clean_and_fetch() {
- # bazel clean --expunge currently doesn't work on Windows
- # TODO(pcloudy): Re-enable it after bazel clean --expunge is fixed.
- if ! is_windows; then
- bazel clean --expunge
- fi
if [ -z "$TF_BAZEL_TARGETS" ]; then
- TF_BAZEL_TARGETS="//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
+ bazel fetch "//tensorflow/... -//tensorflow/contrib/nccl/... -//tensorflow/examples/android/..."
+ else
+ bazel fetch $TF_BAZEL_TARGETS
fi
- bazel fetch "$TF_BAZEL_TARGETS"
}
function sed_hyphen_i() {
@@ -102,8 +101,8 @@
if [ "$TF_NEED_MKL" == "1" ]; then # TF_NEED_MKL
DST=`dirname $0`
- ARCHIVE_BASENAME=mklml_lnx_2017.0.2.20170110.tgz
- GITHUB_RELEASE_TAG=v0.3
+ ARCHIVE_BASENAME=mklml_lnx_2017.0.2.20170209.tgz
+ GITHUB_RELEASE_TAG=v0.5
MKLURL="https://github.com/01org/mkl-dnn/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
if ! [ -e "$DST/third_party/mkl/$ARCHIVE_BASENAME" ]; then
wget --no-check-certificate -P $DST/third_party/mkl/ $MKLURL
@@ -182,13 +181,12 @@
TF_NEED_JEMALLOC=0
fi
-if [ "$TF_NEED_JEMALLOC" == "1" ]; then
- sed_hyphen_i -e "s/WITH_JEMALLOC = False/WITH_JEMALLOC = True/" tensorflow/core/platform/default/build_config.bzl
-else
- sed_hyphen_i -e "s/WITH_JEMALLOC = True/WITH_JEMALLOC = False/" tensorflow/core/platform/default/build_config.bzl
+sed_hyphen_i -e "/with_jemalloc/d" .bazelrc
+if [[ "$TF_NEED_JEMALLOC" == "1" ]]; then
+ echo 'build --define with_jemalloc=true' >>.bazelrc
fi
-while [ "$TF_NEED_GCP" == "" ]; do
+while [[ "$TF_NEED_GCP" == "" ]]; do
read -p "Do you wish to build TensorFlow with "\
"Google Cloud Platform support? [y/N] " INPUT
case $INPUT in
@@ -202,23 +200,12 @@
esac
done
-if [ "$TF_NEED_GCP" == "1" ]; then
- ## Verify that libcurl header files are available.
- # Only check Linux, since on MacOS the header files are installed with XCode.
- if is_linux && [[ ! -f "/usr/include/curl/curl.h" ]]; then
- echo "ERROR: It appears that the development version of libcurl is not "\
-"available. Please install the libcurl3-dev package."
- exit 1
- fi
-
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/WITH_GCP_SUPPORT = False/WITH_GCP_SUPPORT = True/" tensorflow/core/platform/default/build_config.bzl
-else
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/WITH_GCP_SUPPORT = True/WITH_GCP_SUPPORT = False/" tensorflow/core/platform/default/build_config.bzl
+sed_hyphen_i -e "/with_gcp_support/d" .bazelrc
+if [[ "$TF_NEED_GCP" == "1" ]]; then
+ echo 'build --define with_gcp_support=true' >>.bazelrc
fi
-while [ "$TF_NEED_HDFS" == "" ]; do
+while [[ "$TF_NEED_HDFS" == "" ]]; do
read -p "Do you wish to build TensorFlow with "\
"Hadoop File System support? [y/N] " INPUT
case $INPUT in
@@ -232,16 +219,13 @@
esac
done
-if [ "$TF_NEED_HDFS" == "1" ]; then
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/WITH_HDFS_SUPPORT = False/WITH_HDFS_SUPPORT = True/" tensorflow/core/platform/default/build_config.bzl
-else
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/WITH_HDFS_SUPPORT = True/WITH_HDFS_SUPPORT = False/" tensorflow/core/platform/default/build_config.bzl
+sed_hyphen_i -e "/with_hdfs_support/d" .bazelrc
+if [[ "$TF_NEED_HDFS" == "1" ]]; then
+ echo 'build --define with_hdfs_support=true' >>.bazelrc
fi
## Enable XLA.
-while [ "$TF_ENABLE_XLA" == "" ]; do
+while [[ "$TF_ENABLE_XLA" == "" ]]; do
read -p "Do you wish to build TensorFlow with the XLA just-in-time compiler (experimental)? [y/N] " INPUT
case $INPUT in
[Yy]* ) echo "XLA JIT support will be enabled for TensorFlow"; TF_ENABLE_XLA=1;;
@@ -251,12 +235,9 @@
esac
done
-if [ "$TF_ENABLE_XLA" == "1" ]; then
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/^WITH_XLA_SUPPORT = [FT].*/WITH_XLA_SUPPORT = True/" tensorflow/core/platform/default/build_config_root.bzl
-else
- # Update Bazel build configuration.
- sed_hyphen_i -e "s/^WITH_XLA_SUPPORT = [FT].*/WITH_XLA_SUPPORT = False/" tensorflow/core/platform/default/build_config_root.bzl
+sed_hyphen_i -e "/with_xla_support/d" .bazelrc
+if [[ "$TF_ENABLE_XLA" == "1" ]]; then
+ echo 'build --define with_xla_support=true' >>.bazelrc
fi