Further BUILD cleanup in tensorflow/contrib/...

PiperOrigin-RevId: 162561536

1 files changed, 37 insertions, 36 deletions

diff --git a/tensorflow/contrib/predictor/BUILD b/tensorflow/contrib/predictor/BUILD
index 8bd8c5f618..745dc2f836 100644
--- a/tensorflow/contrib/predictor/BUILD
+++ b/tensorflow/contrib/predictor/BUILD
@@ -22,47 +22,40 @@ filegroup(
 
 py_library(
     name = "predictor",
-    srcs = [
-        "__init__.py",
-    ],
+    srcs = ["__init__.py"],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
-    deps = [
-        ":predictor_factories",
-    ],
+    deps = [":predictor_factories"],
 )
 
 py_library(
     name = "predictor_factories",
-    srcs = [
-        "predictor_factories.py",
-    ],
+    srcs = ["predictor_factories.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":contrib_estimator_predictor",
         ":core_estimator_predictor",
         ":saved_model_predictor",
-        "//tensorflow/contrib/learn",
+        "//tensorflow/python/estimator",
     ],
 )
 
 py_library(
     name = "base_predictor",
-    srcs = [
-        "predictor.py",
-    ],
+    srcs = ["predictor.py"],
     srcs_version = "PY2AND3",
+    deps = ["@six_archive//:six"],
 )
 
 py_library(
     name = "saved_model_predictor",
-    srcs = [
-        "saved_model_predictor.py",
-    ],
+    srcs = ["saved_model_predictor.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":base_predictor",
         "//tensorflow/contrib/saved_model:saved_model_py",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:session",
         "//tensorflow/python/saved_model:loader",
         "//tensorflow/python/saved_model:signature_constants",
         "//tensorflow/python/saved_model:signature_def_utils",
@@ -71,36 +64,46 @@ py_library(
 
 py_library(
     name = "core_estimator_predictor",
-    srcs = [
-        "core_estimator_predictor.py",
-    ],
+    srcs = ["core_estimator_predictor.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":base_predictor",
-        "//tensorflow/contrib/learn",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:training",
+        "//tensorflow/python/estimator:model_fn",
+        "//tensorflow/python/saved_model:signature_constants",
     ],
 )
 
 py_library(
     name = "contrib_estimator_predictor",
-    srcs = [
-        "contrib_estimator_predictor.py",
-    ],
+    srcs = ["contrib_estimator_predictor.py"],
     srcs_version = "PY2AND3",
     deps = [
         ":base_predictor",
         "//tensorflow/contrib/learn",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:training",
     ],
 )
 
 py_library(
     name = "testing_common",
-    srcs = [
-        "testing_common.py",
-    ],
+    srcs = ["testing_common.py"],
     srcs_version = "PY2AND3",
     tags = ["no_pip"],
     deps = [
+        "//tensorflow/contrib/learn",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python/estimator",
+        "//tensorflow/python/estimator:export",
+        "//tensorflow/python/estimator:export_output",
+        "//tensorflow/python/estimator:model_fn",
+        "//tensorflow/python/saved_model:signature_constants",
     ],
 )
 
@@ -117,38 +120,36 @@ py_library(
 
 py_test(
     name = "saved_model_predictor_test",
-    srcs = [
-        "saved_model_predictor_test.py",
-    ],
+    srcs = ["saved_model_predictor_test.py"],
     data = [":test_export_dir"],
     srcs_version = "PY2AND3",
     tags = ["no_pip"],
     deps = [
         ":saved_model_predictor",
-        ":testing_common",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python/saved_model:signature_def_utils",
+        "//third_party/py/numpy",
     ],
 )
 
 py_test(
     name = "core_estimator_predictor_test",
-    srcs = [
-        "core_estimator_predictor_test.py",
-    ],
+    srcs = ["core_estimator_predictor_test.py"],
     srcs_version = "PY2AND3",
     tags = ["no_pip"],
     deps = [
         ":core_estimator_predictor",
         ":testing_common",
         "//tensorflow/python:client_testlib",
+        "//third_party/py/numpy",
     ],
 )
 
 py_test(
     name = "contrib_estimator_predictor_test",
-    srcs = [
-        "contrib_estimator_predictor_test.py",
-    ],
+    srcs = ["contrib_estimator_predictor_test.py"],
     srcs_version = "PY2AND3",
     tags = ["no_pip"],
     deps = [