Updates for code review comments

9 files changed, 14 insertions, 136 deletions

diff --git a/tensorflow/tools/ci_build/Dockerfile.gpu.ppc64le b/tensorflow/tools/ci_build/Dockerfile.gpu.ppc64le
index a99d2c1af2..e026edb6bb 100644
--- a/tensorflow/tools/ci_build/Dockerfile.gpu.ppc64le
+++ b/tensorflow/tools/ci_build/Dockerfile.gpu.ppc64le
@@ -27,5 +27,5 @@ ENV LD_LIBRARY_PATH /usr/local/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH
 ENV TF_NEED_CUDA 1
 ENV TF_CUDA_COMPUTE_CAPABILITIES 3.0
 
-#TODO get NCCL 2 in the docker image
+# TODO get NCCL 2 in the docker image
 ENV TF_NCCL_VERSION 1
diff --git a/tensorflow/tools/ci_build/install/install_hdf5_ppc64le.sh b/tensorflow/tools/ci_build/install/install_hdf5_ppc64le.sh
index 2fc3012b64..4989d986b8 100755
--- a/tensorflow/tools/ci_build/install/install_hdf5_ppc64le.sh
+++ b/tensorflow/tools/ci_build/install/install_hdf5_ppc64le.sh
@@ -24,10 +24,7 @@ apt-get install -y libhdf5-dev
 ln -s /usr/lib/powerpc64le-linux-gnu/libhdf5_serial.so /usr/lib/powerpc64le-linux-gnu/libhdf5.so
 ln -s /usr/lib/powerpc64le-linux-gnu/libhdf5_serial_hl.so /usr/lib/powerpc64le-linux-gnu/libhdf5_hl.so
 
-#Install pip here because h5py seg faults with python3 when installed via easy_install
-easy_install -U pip==9.0.3
-easy_install3 -U pip==9.0.3
-
+#pip is not installed yet, so use easy_install
 #CPATH is the location of hdf5.h
-CPATH=/usr/include/hdf5/serial/ pip2 install --upgrade h5py
-CPATH=/usr/include/hdf5/serial/ pip3 install --upgrade h5py
+CPATH=/usr/include/hdf5/serial/ easy_install -U h5py
+CPATH=/usr/include/hdf5/serial/ easy_install3 -U h5py
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_cc_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_cc_core.sh
deleted file mode 100755
index 945f072a51..0000000000
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_cc_core.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ==============================================================================
-
-set -e
-set -x
-
-N_JOBS=$(grep -c ^processor /proc/cpuinfo)
-
-echo ""
-echo "Bazel will use ${N_JOBS} concurrent job(s)."
-echo ""
-
-# Run configure.
-export TF_NEED_CUDA=0
-export CC_OPT_FLAGS='-mcpu=power8 -mtune=power8'
-# Only running cc tests, python version does not matter.
-export PYTHON_BIN_PATH=`which python`
-yes "" | $PYTHON_BIN_PATH configure.py
-
-# Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-gpu,-benchmark-test --test_lang_filters=cc,java -k \
-    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --config=opt \
-    --test_output=errors --test_size_filters=small,medium -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh
index aeb8c2ba99..e13de35061 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2_core.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py2.sh
@@ -31,7 +31,7 @@ export PYTHON_BIN_PATH=`which python2`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-benchmark-test --test_lang_filters=py -k \
+bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
+    //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh
index c2916bc2b8..a04ac158f5 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3_core.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3.sh
@@ -31,7 +31,7 @@ export PYTHON_BIN_PATH=`which python3`
 yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-benchmark-test --test_lang_filters=py -k \
+bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-benchmark-test -k \
     --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --build_tests_only --config=opt \
     --test_output=errors --test_size_filters=small,medium -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
+    //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3_contrib.sh b/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3_contrib.sh
deleted file mode 100755
index 9983f6a7c7..0000000000
--- a/tensorflow/tools/ci_build/linux/ppc64le/cpu/run_py3_contrib.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ==============================================================================
-
-set -e
-set -x
-
-N_JOBS=$(grep -c ^processor /proc/cpuinfo)
-
-echo ""
-echo "Bazel will use ${N_JOBS} concurrent job(s)."
-echo ""
-
-# Run configure.
-export TF_NEED_CUDA=0
-export CC_OPT_FLAGS='-mcpu=power8 -mtune=power8'
-export PYTHON_BIN_PATH=`which python3`
-yes "" | $PYTHON_BIN_PATH configure.py
-
-# Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --test_tag_filters=-no_oss,-oss_serial,-gpu,-benchmark-test -k \
-    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 --config=opt \
-    --test_size_filters=small,medium --test_output=errors -- \
-    //tensorflow/contrib/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh
index cc213a86bf..77286e8448 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2_core.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py2.sh
@@ -37,8 +37,8 @@ yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
 bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
-    --test_lang_filters=py --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
-    --build_tests_only --test_output=errors --local_test_jobs=${LT_JOBS} --config=opt \
+    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
+    --test_output=errors --local_test_jobs=${LT_JOBS} --build_tests_only --config=opt \
     --test_size_filters=small,medium \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
+    //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_cc_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh
index 68a9d0068b..17aa52ee6b 100755
--- a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_cc_core.sh
+++ b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3.sh
@@ -37,8 +37,8 @@ yes "" | $PYTHON_BIN_PATH configure.py
 
 # Run bazel test command. Double test timeouts to avoid flakes.
 bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
-    --test_lang_filters=cc --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
-    --build_tests_only --test_output=errors --local_test_jobs=${LT_JOBS} --config=opt \
+    --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
+    --test_output=errors --local_test_jobs=${LT_JOBS} --build_tests_only --config=opt \
     --test_size_filters=small,medium \
     --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...
+    //tensorflow/... -//tensorflow/compiler/...
diff --git a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3_core.sh b/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3_core.sh
deleted file mode 100755
index 1b8d38f3cb..0000000000
--- a/tensorflow/tools/ci_build/linux/ppc64le/gpu/run_py3_core.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2018 The TensorFlow Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ==============================================================================
-
-set -e
-set -x
-
-N_JOBS=$(grep -c ^processor /proc/cpuinfo)
-LT_JOBS=$(nvidia-smi --query-gpu=gpu_name --format=csv,noheader | wc -l)
-
-echo ""
-echo "Bazel will use ${N_JOBS} concurrent job(s)."
-echo "Bazel will use ${LT_JOBS} local test job(s)."
-echo ""
-
-# Run configure.
-export PYTHON_BIN_PATH=`which python3`
-export CC_OPT_FLAGS='-mcpu=power8 -mtune=power8'
-
-export TF_NEED_CUDA=1
-export TF_CUDA_COMPUTE_CAPABILITIES=3.7
-
-yes "" | $PYTHON_BIN_PATH configure.py
-
-# Run bazel test command. Double test timeouts to avoid flakes.
-bazel test --config=cuda --test_tag_filters=-no_oss,-oss_serial,-no_gpu,-benchmark-test -k \
-    --test_lang_filters=py --jobs=${N_JOBS} --test_timeout 300,450,1200,3600 \
-    --build_tests_only --test_output=errors --local_test_jobs=${LT_JOBS} --config=opt \
-    --test_size_filters=small,medium \
-    --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute -- \
-    //tensorflow/... -//tensorflow/compiler/... -//tensorflow/contrib/...