diff options
| author |  Jonathan Hseu <jhseu@google.com> | 2016-12-22 15:38:30 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-22 15:48:41 -0800 |
| commit | bed8383c27a0a7225e6fc7ff59a2cd6388fb4d09 (patch) | |
| tree | b70cfc88f95f318195f8610ffb960e98604348d1 /configure | |
| parent | 1e5bd8cdd62033d1f7ea928fcbec521bb48bb1f5 (diff) | |
Merge changes from github.
Change: 142805270
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -23,9 +23,13 @@ function bazel_clean_and_fetch() { # TODO(pcloudy): Re-enable it after bazel clean --expunge is fixed. if ! is_windows; then bazel clean --expunge + # TODO(https://github.com/bazelbuild/bazel/issues/2220) Remove the nested `bazel query`. + bazel fetch $(bazel query "//tensorflow/... -//tensorflow/examples/android/...") + else + # TODO(pcloudy): Also filter out //tensorflow/examples/android/... on Windows after + # https://github.com/bazelbuild/bazel/issues/2248 is fixed. + bazel fetch //tensorflow/... fi - # TODO(https://github.com/bazelbuild/bazel/issues/2220) Remove the nested `bazel query`. - bazel fetch $(bazel query "//tensorflow/... -//tensorflow/examples/android/...") } ## Set up python-related environment settings @@ -280,7 +284,7 @@ while true; do TF_CUDNN_VERSION=${BASH_REMATCH[1]} echo "libcudnn.so resolves to libcudnn${TF_CUDNN_EXT}" elif [[ "$REALVAL" =~ ([0-9]*).dylib ]]; then - TF_CUDNN_EXT="."${BASH_REMATCH[1]}".dylib" + TF_CUDNN_EXT=${BASH_REMATCH[1]}".dylib" TF_CUDNN_VERSION=${BASH_REMATCH[1]} echo "libcudnn.dylib resolves to libcudnn${TF_CUDNN_EXT}" fi @@ -387,7 +391,7 @@ if [ "$TF_NEED_OPENCL" == "1" ]; then while true; do fromuser="" if [ -z "$HOST_CXX_COMPILER" ]; then - default_cxx_host_compiler=$(which g++|| true) + default_cxx_host_compiler=$(which clang++-3.6 || true) read -p "Please specify which C++ compiler should be used as the host C++ compiler. [Default is $default_cxx_host_compiler]: " HOST_CXX_COMPILER fromuser="1" if [ -z "$HOST_CXX_COMPILER" ]; then @@ -410,7 +414,7 @@ done while true; do fromuser="" if [ -z "$HOST_C_COMPILER" ]; then - default_c_host_compiler=$(which gcc|| true) + default_c_host_compiler=$(which clang-3.6 || true) read -p "Please specify which C compiler should be used as the host C compiler. [Default is $default_c_host_compiler]: " HOST_C_COMPILER fromuser="1" if [ -z "$HOST_C_COMPILER" ]; then |