aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/tools/dist_test
diff options
context:
space:
mode:
authorGravatar Yifei Feng <yifeif@google.com>2018-05-18 14:25:59 -0700
committerGravatar Yifei Feng <yifeif@google.com>2018-05-18 14:25:59 -0700
commit24410f3a2b5454d1ea48bb14459efc93d2a0a6af (patch)
tree705fd13a34cb1925d1e9e8b14f64ae3e6a5161df /tensorflow/tools/dist_test
parented48c1dffcccf6c547e6355562f7bcca64967200 (diff)
Make distributed_test use tf-nightly by default.
Diffstat (limited to 'tensorflow/tools/dist_test')
-rwxr-xr-xtensorflow/tools/dist_test/local_test.sh12
-rwxr-xr-xtensorflow/tools/dist_test/remote_test.sh11
2 files changed, 14 insertions, 9 deletions
diff --git a/tensorflow/tools/dist_test/local_test.sh b/tensorflow/tools/dist_test/local_test.sh
index caae7fd530..99e09502be 100755
--- a/tensorflow/tools/dist_test/local_test.sh
+++ b/tensorflow/tools/dist_test/local_test.sh
@@ -64,9 +64,6 @@ die() {
# Configurations
DOCKER_IMG_NAME="tensorflow/tf-dist-test-local-cluster"
-# Use TensorFlow v1.5.0 for Python 2.7 and CPU only as we set num_gpus to 0 in the below
-DEFAULT_WHL_FILE_LOCATION="https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.5.0-cp27-none-linux_x86_64.whl"
-
# Parse input arguments
LEAVE_CONTAINER_RUNNING=0
MODEL_NAME=""
@@ -77,8 +74,7 @@ SYNC_REPLICAS_FLAG=""
WHL_FILE_LOCATION=${1}
if [[ -z "${WHL_FILE_LOCATION}" ]]; then
- WHL_FILE_LOCATION=${DEFAULT_WHL_FILE_LOCATION}
- echo "use default whl file location"
+ echo "WARNING: No wheel url passed. Will use latest tf-nightly cpu p2 wheel."
fi
while true; do
@@ -131,7 +127,11 @@ echo "Building in temporary directory: ${BUILD_DIR}"
cp -r ${DIR}/* "${BUILD_DIR}"/ || \
die "Failed to copy files to ${BUILD_DIR}"
-if [[ $WHL_FILE_LOCATION =~ 'http://' || $WHL_FILE_LOCATION =~ 'https://' ]]; then
+# Download whl file into the build context directory.
+if [[ -z "${WHL_FILE_LOCATION}" ]]; then
+ pip2 download --no-deps tf-nightly
+ cp tf-nightly-*.whl "${BUILD_DIR}"/tensorflow-none-any.whl
+elif [[ $WHL_FILE_LOCATION =~ 'http://' || $WHL_FILE_LOCATION =~ 'https://' ]]; then
# Download whl file into the build context directory.
wget -P "${BUILD_DIR}" "${WHL_FILE_LOCATION}" || \
die "Failed to download tensorflow whl file from URL: ${WHL_FILE_LOCATION}"
diff --git a/tensorflow/tools/dist_test/remote_test.sh b/tensorflow/tools/dist_test/remote_test.sh
index 935535312d..e188c88c8f 100755
--- a/tensorflow/tools/dist_test/remote_test.sh
+++ b/tensorflow/tools/dist_test/remote_test.sh
@@ -108,7 +108,7 @@ fi
# Parse command-line arguments.
WHL_URL=${1}
if [[ -z "${WHL_URL}" ]]; then
- die "whl URL is not specified"
+ echo "WARNING: No wheel url passed. Will use latest tf-nightly cpu p2 wheel."
fi
# Create docker build context directory.
@@ -121,8 +121,13 @@ cp -r ${DIR}/* ${BUILD_DIR}/ || \
die "Failed to copy files to ${BUILD_DIR}"
# Download whl file into the build context directory.
-wget -P "${BUILD_DIR}" ${WHL_URL} || \
- die "Failed to download tensorflow whl file from URL: ${WHL_URL}"
+if [[ -z "${WHL_URL}" ]]; then
+ pip2 download --no-deps tf-nightly
+ cp tf-nightly-*.whl "${BUILD_DIR}"/tensorflow-none-any.whl
+else
+ wget -P "${BUILD_DIR}" ${WHL_URL} || \
+ die "Failed to download tensorflow whl file from URL: ${WHL_URL}"
+fi
# Build docker image for test.
docker build ${NO_CACHE_FLAG} \