From 932e052347f624909b3ee712b581a2609a07088b Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 19 Jan 2020 08:34:53 -0800 Subject: [PATCH 1/2] Remove `-y` on `pip install` as it does not exist --- .../tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh | 4 ++-- .../tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh | 4 ++-- .../tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh index 30ac6e5fa5ad90..014f3e41ede61c 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh @@ -24,8 +24,8 @@ update_bazel_linux # Make sure estimator and tensorboard are the same as when final was released pip uninstall -y tf-estimator-nightly tb-nightly -pip install -y tf-estimator-nightly==1.14.0.dev2019072801 -pip install -y tb-nightly==2.1.0a20190927 +pip install tf-estimator-nightly==1.14.0.dev2019072801 +pip install tb-nightly==2.1.0a20190927 # Run configure. export TF_NEED_GCP=1 diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh index e0d901e88622c4..7823b4d139858b 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh @@ -24,8 +24,8 @@ update_bazel_linux # Make sure estimator and tensorboard are the same as when final was released pip uninstall -y tf-estimator-nightly tb-nightly -pip install -y tf-estimator-nightly==1.14.0.dev2019072801 -pip install -y tb-nightly==2.1.0a20190927 +pip install tf-estimator-nightly==1.14.0.dev2019072801 +pip install tb-nightly==2.1.0a20190927 # Run configure. export TF_NEED_GCP=1 diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh index 83b3a8d061513c..9f0a2efa9a1386 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh @@ -24,8 +24,8 @@ update_bazel_linux # Make sure estimator and tensorboard are the same as when final was released pip uninstall -y tf-estimator-nightly tb-nightly -pip install -y tf-estimator-nightly==1.14.0.dev2019072801 -pip install -y tb-nightly==2.1.0a20190927 +pip install tf-estimator-nightly==1.14.0.dev2019072801 +pip install tb-nightly==2.1.0a20190927 # Run configure. export TF_NEED_GCP=1 From 3d77cdd7dcc20a9a7d58db8f64df842c441f478b Mon Sep 17 00:00:00 2001 From: Mihai Maruseac Date: Sun, 19 Jan 2020 08:40:19 -0800 Subject: [PATCH 2/2] Remove the tests that depend on `tf.contrib` --- .../tools/ci_build/release/macos/cpu_py35_full/nonpip.sh | 2 +- .../tools/ci_build/release/macos/cpu_py36_full/nonpip.sh | 3 +-- .../tools/ci_build/release/macos/cpu_py37_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/gpu_py35_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/gpu_py36_full/nonpip.sh | 2 +- .../tools/ci_build/release/ubuntu_16/gpu_py37_full/nonpip.sh | 2 +- 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py35_full/nonpip.sh b/tensorflow/tools/ci_build/release/macos/cpu_py35_full/nonpip.sh index bbdd3165c35e0f..2c5627feff8f24 100644 --- a/tensorflow/tools/ci_build/release/macos/cpu_py35_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/macos/cpu_py35_full/nonpip.sh @@ -49,4 +49,4 @@ bazel test --test_output=errors --config=opt \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ ${DEFAULT_BAZEL_TARGETS} \ - -//tensorflow/lite/... + -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py36_full/nonpip.sh b/tensorflow/tools/ci_build/release/macos/cpu_py36_full/nonpip.sh index 46c548d36e69b4..7ef5d64bf3987a 100644 --- a/tensorflow/tools/ci_build/release/macos/cpu_py36_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/macos/cpu_py36_full/nonpip.sh @@ -49,5 +49,4 @@ bazel test --test_output=errors --config=opt \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ ${DEFAULT_BAZEL_TARGETS} \ - -//tensorflow/lite/... - + -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/macos/cpu_py37_full/nonpip.sh b/tensorflow/tools/ci_build/release/macos/cpu_py37_full/nonpip.sh index 968a8ad226c0dc..9b7c6720bfbad4 100644 --- a/tensorflow/tools/ci_build/release/macos/cpu_py37_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/macos/cpu_py37_full/nonpip.sh @@ -49,4 +49,4 @@ bazel test --test_output=errors --config=opt \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ ${DEFAULT_BAZEL_TARGETS} \ - -//tensorflow/lite/... + -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh index 014f3e41ede61c..2757004f1aee27 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py35_full/nonpip.sh @@ -48,4 +48,4 @@ bazel test --test_output=errors --config=opt --test_lang_filters=py \ --action_env=TF2_BEHAVIOR="${TF2_BEHAVIOR}" \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ - ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh index 7823b4d139858b..7bf6849f5c4710 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py36_full/nonpip.sh @@ -48,4 +48,4 @@ bazel test --test_output=errors --config=opt --test_lang_filters=py \ --action_env=TF2_BEHAVIOR="${TF2_BEHAVIOR}" \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ - ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh index 9f0a2efa9a1386..6e891257d7d597 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/cpu_py37_full/nonpip.sh @@ -48,4 +48,4 @@ bazel test --test_output=errors --config=opt --test_lang_filters=py \ --action_env=TF2_BEHAVIOR="${TF2_BEHAVIOR}" \ --build_tag_filters="${tag_filters}" \ --test_tag_filters="${tag_filters}" -- \ - ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py35_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py35_full/nonpip.sh index cfa0594bb71d76..b211c092b7bb6e 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py35_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py35_full/nonpip.sh @@ -55,4 +55,4 @@ bazel test --config=cuda --config=opt \ --test_timeout="300,450,1200,3600" --local_test_jobs=4 \ --test_output=errors --verbose_failures=true --keep_going \ --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \ - -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py36_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py36_full/nonpip.sh index fc66f82312adea..7bc2323a552c92 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py36_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py36_full/nonpip.sh @@ -55,4 +55,4 @@ bazel test --config=cuda --config=opt \ --test_timeout="300,450,1200,3600" --local_test_jobs=4 \ --test_output=errors --verbose_failures=true --keep_going \ --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \ - -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/... diff --git a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py37_full/nonpip.sh b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py37_full/nonpip.sh index b6306821559664..54094a8870141c 100644 --- a/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py37_full/nonpip.sh +++ b/tensorflow/tools/ci_build/release/ubuntu_16/gpu_py37_full/nonpip.sh @@ -55,4 +55,4 @@ bazel test --config=cuda --config=opt \ --test_timeout="300,450,1200,3600" --local_test_jobs=4 \ --test_output=errors --verbose_failures=true --keep_going \ --run_under=//tensorflow/tools/ci_build/gpu_build:parallel_gpu_execute \ - -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... + -- ${DEFAULT_BAZEL_TARGETS} -//tensorflow/lite/... -//tensorflow/python:contrib_test -//tensorflow/examples/...