Merge changes from github.

Change: 123342870
This commit is contained in:
Vijay Vasudevan
2016-05-26 11:05:13 -08:00
committed by TensorFlower Gardener
parent 9a69f398e9
commit 8cc567bf97
33 changed files with 282 additions and 323 deletions

View File

@@ -16,11 +16,16 @@
set -e -o errexit
# Prefix expected paths with ./ locally and external/reponame/ for remote repos.
# TODO(kchodorow): remove once runfiles paths are fixed, see
# https://github.com/bazelbuild/bazel/issues/848.
script_path=$(dirname $(dirname $(dirname "$0")))
script_path=${script_path:-.}
if [ -d "../org_tensorflow" ]; then
script_path="../org_tensorflow"
else
# Prefix expected paths with ./ locally and external/reponame/ for remote repos.
# TODO(kchodorow): remove once runfiles paths are fixed, see
# https://github.com/bazelbuild/bazel/issues/848.
script_path=$(dirname $(dirname $(dirname "$0")))
script_path=${script_path:-.}
fi
EXPECTED_PATHS="$script_path/util/python/python_include"\
" $script_path/util/python/python_lib"\
" $script_path/third_party/py/numpy/numpy_include"