Further BUILD cleanup in tensorflow/contrib/...

PiperOrigin-RevId: 162561536

5 files changed, 56 insertions, 44 deletions

diff --git a/tensorflow/contrib/data/python/kernel_tests/BUILD b/tensorflow/contrib/data/python/kernel_tests/BUILD
index d5e8eb7fda..8e9f1527ef 100644
--- a/tensorflow/contrib/data/python/kernel_tests/BUILD
+++ b/tensorflow/contrib/data/python/kernel_tests/BUILD
@@ -114,8 +114,10 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/contrib/data/python/ops:dataset_ops",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
         "//tensorflow/python:training",
         "//third_party/py/numpy",
@@ -128,12 +130,12 @@ py_test(
     srcs = ["list_files_dataset_op_test.py"],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/contrib/data",
+        "//tensorflow/contrib/data/python/ops:dataset_ops",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform_test",
+        "//tensorflow/python:util",
     ],
 )
 
@@ -150,10 +152,12 @@ py_test(
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:errors",
+        "//tensorflow/python:io_ops",
         "//tensorflow/python:lookup_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:string_ops",
+        "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//third_party/py/numpy",
     ],
@@ -280,12 +284,12 @@ py_test(
     srcs = ["concatenate_dataset_op_test.py"],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/contrib/data",
-        "//tensorflow/python:array_ops",
+        "//tensorflow/contrib/data/python/ops:dataset_ops",
+        "//tensorflow/contrib/data/python/util:nest",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
-        "//tensorflow/python:framework",
-        "//tensorflow/python:platform_test",
+        "//tensorflow/python:tensor_shape",
+        "//third_party/py/numpy",
     ],
 )
 
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 = [
diff --git a/tensorflow/contrib/tensor_forest/BUILD b/tensorflow/contrib/tensor_forest/BUILD
index b4a8ca4320..5ac2979faf 100644
--- a/tensorflow/contrib/tensor_forest/BUILD
+++ b/tensorflow/contrib/tensor_forest/BUILD
@@ -122,6 +122,7 @@ py_library(
         ":stats_ops_py",
         ":tensor_forest_ops_py",
         ":tensor_forest_py",
+        ":tensor_forest_v4_py",
     ],
 )
 
@@ -554,13 +555,14 @@ py_library(
     srcs = ["python/tensor_forest_v4.py"],
     srcs_version = "PY2AND3",
     deps = [
+        ":tensor_forest_py",
         ":tensor_forest_v4_ops_py",
         "//tensorflow/contrib/decision_trees/proto:generic_tree_model_py",
         "//tensorflow/contrib/tensor_forest/proto:tensor_forest_params_proto_py",
         "//tensorflow/python:control_flow_ops",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:platform",
+        "@six_archive//:six",
     ],
 )
 
@@ -586,12 +588,14 @@ py_library(
         ":client_lib",
         "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/learn",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:variable_scope",
     ],
 )
 
diff --git a/tensorflow/contrib/tpu/BUILD b/tensorflow/contrib/tpu/BUILD
index c99a4d0475..69e91d05b3 100644
--- a/tensorflow/contrib/tpu/BUILD
+++ b/tensorflow/contrib/tpu/BUILD
@@ -39,6 +39,7 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":tpu",
+        ":tpu_feed",
         ":tpu_py",
         ":training_loop",
         "//tensorflow/contrib/learn",
@@ -52,6 +53,7 @@ py_library(
         "//tensorflow/python:variables",
         "//tensorflow/python/estimator",
         "//tensorflow/python/estimator:model_fn",
+        "//tensorflow/python/estimator:util",
     ],
 )
 
diff --git a/tensorflow/contrib/verbs/BUILD b/tensorflow/contrib/verbs/BUILD
index 5f062cde89..173a65a7eb 100644
--- a/tensorflow/contrib/verbs/BUILD
+++ b/tensorflow/contrib/verbs/BUILD
@@ -108,6 +108,7 @@ cc_library(
         ":rdma_mgr",
         ":verbs_util",
         "//tensorflow/core:core_cpu_internal",
+        "//tensorflow/core:gpu_runtime",
         "//tensorflow/core:lib",
         "//tensorflow/core/distributed_runtime:base_rendezvous_mgr",
         "//tensorflow/core/distributed_runtime:worker_env",