Fix breakages in OSS builds

See example breakages logs at:
http://ci.tensorflow.org/job/tensorflow-cl-cpu-python3-pip/10847/console
http://ci.tensorflow.org/job/tensorflow-cl-gpu/11008/console

1. CL/172477381 added the no_oss tag to tests with oss_serial tags, which broke the logic of OSS_SERIAL tests in pip.sh and run_pip_test.sh. This CL fixes that.

2. The nccl_kernels BUILD target in contrib/nccl/BUILD was missing some dependencies. This CL adds the missing ones.

Fixes: 
PiperOrigin-RevId: 173133914
This commit is contained in:
Shanqing Cai 2017-10-23 10:26:34 -07:00 committed by TensorFlower Gardener
parent 3ed049b673
commit 0e56ffb7b7
2 changed files with 3 additions and 0 deletions
tensorflow
contrib/nccl
tools/ci_build/builds

View File

@ -74,8 +74,10 @@ tf_kernel_library(
"kernels/nccl_rewrite.cc",
],
deps = [
"//tensorflow/core:core_cpu",
"//tensorflow/core:framework",
"//tensorflow/core:gpu_headers_lib",
"//tensorflow/core:lib",
"//tensorflow/core:proto_text",
"@nccl_archive//:nccl",
],

View File

@ -78,6 +78,7 @@ ln -s $(pwd)/tensorflow ${PIP_TEST_ROOT}/tensorflow
# tests with no_pip_gpu tag.
PIP_TEST_FILTER_TAG="-no_pip,-no_oss"
if [[ ${IS_OSS_SERIAL} == "1" ]]; then
PIP_TEST_FILTER_TAG="$(echo "${PIP_TEST_FILTER_TAG}" | sed s/-no_oss//)"
PIP_TEST_FILTER_TAG="${PIP_TEST_FILTER_TAG},oss_serial"
else
PIP_TEST_FILTER_TAG="${PIP_TEST_FILTER_TAG},-oss_serial"