BUILD cleanup in contrib/...

PiperOrigin-RevId: 173889798

tensorflow/contrib/all_reduce/BUILD

@@ -32,12 +32,17 @@ tf_py_test(
     additional_deps = [
         ":all_reduce",
         "//third_party/py/numpy",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:platform",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:state_ops",
     ],
 )
 

tensorflow/contrib/batching/BUILD

@@ -177,14 +177,13 @@ tf_custom_op_py_library(
     deps = [
         ":batch_ops",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
+        "//tensorflow/python:gradients",
         "//tensorflow/python:platform",
-        "//tensorflow/python:state_ops",
+        "//tensorflow/python:script_ops",
-        "//tensorflow/python:variable_scope",
+        "//tensorflow/python:util",
-        "//tensorflow/python:variables",
     ],
 )
 

tensorflow/contrib/cloud/BUILD

@@ -63,11 +63,15 @@ tf_py_test(
         ":bigquery_reader_ops_op_lib",
         ":cloud_py",
         "//tensorflow/contrib/cloud/kernels:bigquery_reader_ops",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:data_flow_ops",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:io_ops",
         "//tensorflow/python:parsing_ops",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:util",
     ],
     tags = ["manual"],
 )

tensorflow/contrib/cluster_resolver/BUILD

@@ -13,7 +13,9 @@ licenses(["notice"])  # Apache 2.0
 filegroup(
     name = "all_files",
     srcs = glob(
-        ["**/*"],
+        include = [
+            "**/*",
+        ],
         exclude = [
             "**/METADATA",
             "**/OWNERS",
@@ -37,9 +39,7 @@ py_library(
 
 py_library(
     name = "cluster_resolver_py",
-    srcs = [
+    srcs = ["python/training/cluster_resolver.py"],
-        "python/training/cluster_resolver.py",
-    ],
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/python:training",
@@ -48,9 +48,7 @@ py_library(
 
 py_library(
     name = "gce_cluster_resolver_py",
-    srcs = [
+    srcs = ["python/training/gce_cluster_resolver.py"],
-        "python/training/gce_cluster_resolver.py",
-    ],
     srcs_version = "PY2AND3",
     deps = [
         ":cluster_resolver_py",
@@ -60,9 +58,7 @@ py_library(
 
 py_library(
     name = "tpu_cluster_resolver_py",
-    srcs = [
+    srcs = ["python/training/tpu_cluster_resolver.py"],
-        "python/training/tpu_cluster_resolver.py",
-    ],
     srcs_version = "PY2AND3",
     deps = [
         ":cluster_resolver_py",
@@ -79,6 +75,7 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
     ],
     main = "python/training/cluster_resolver_test.py",
 )
@@ -88,11 +85,13 @@ tf_py_test(
     size = "small",
     srcs = ["python/training/gce_cluster_resolver_test.py"],
     additional_deps = [
+        ":cluster_resolver_py",
         ":gce_cluster_resolver_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
     ],
     main = "python/training/gce_cluster_resolver_test.py",
 )
@@ -107,6 +106,7 @@ tf_py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:training",
     ],
     main = "python/training/tpu_cluster_resolver_test.py",
 )

tensorflow/contrib/cudnn_rnn/BUILD

@@ -36,6 +36,7 @@ tf_kernel_library(
         "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core:lib_internal",
+        "//tensorflow/core:stream_executor",
         "//tensorflow/core/kernels:bounds_check_lib",
         "//third_party/eigen3",
     ],
@@ -70,14 +71,23 @@ tf_custom_op_py_library(
     visibility = ["//visibility:public"],
     deps = [
         ":cudnn_rnn_ops",
+        "//tensorflow/contrib/rnn:rnn_py",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:common_shapes",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers_base",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:random_seed",
+        "//tensorflow/python:rnn_cell",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
+        "//tensorflow/python:variable_scope",
     ],
 )
 
@@ -104,9 +114,13 @@ tf_custom_op_py_library(
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers_base",
         "//tensorflow/python:platform",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
+        "//tensorflow/python:variable_scope",
     ],
 )
 

tensorflow/contrib/eager/python/BUILD

@@ -67,6 +67,7 @@ py_test(
     deps = [
         ":datasets",
         "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:script_ops",
         "//tensorflow/python/data",
@@ -143,12 +144,11 @@ py_library(
     deps = [
         "//tensorflow/contrib/summary:summary_ops",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:constant_op",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:init_ops",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/eager:context",
@@ -169,7 +169,6 @@ py_test(
         "//tensorflow/python:lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:training",
-        "//tensorflow/python:variables",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/eager:test",
     ],
@@ -190,6 +189,7 @@ py_library(
         "//tensorflow/python:framework_ops",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/eager:function",
+        "@six_archive//:six",
     ],
 )
 
@@ -212,11 +212,9 @@ py_library(
     srcs_version = "PY2AND3",
     visibility = ["//tensorflow:internal"],
     deps = [
-        "//tensorflow/python:framework_ops",
         "//tensorflow/python:layers_base",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/estimator:util",
-        "@six_archive//:six",
     ],
 )
 
@@ -227,9 +225,12 @@ py_test(
     deps = [
         ":network",
         "//tensorflow/python:constant_op",
+        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:layers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
+        "//tensorflow/python:resource_variable_ops",
+        "//tensorflow/python:variable_scope",
         "//tensorflow/python/eager:test",
     ],
 )

tensorflow/contrib/estimator/BUILD

@@ -82,7 +82,6 @@ py_library(
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:training",
-        "//tensorflow/python:util",
         "//tensorflow/python/estimator",
         "//tensorflow/python/estimator:model_fn",
         "//tensorflow/python/estimator:util",

tensorflow/contrib/factorization/BUILD

@@ -50,15 +50,22 @@ tf_custom_op_py_library(
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:linalg_ops",
+        "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:metrics",
         "//tensorflow/python:nn",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:summary",
+        "//tensorflow/python:training",
         "//tensorflow/python:util",
+        "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/estimator",
+        "//tensorflow/python/estimator:model_fn",
         "//third_party/py/numpy",
     ],
 )
@@ -133,12 +140,17 @@ tf_py_test(
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
         "//third_party/py/numpy",
         "//tensorflow/contrib/learn",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:random_ops",
+        "//tensorflow/python:random_seed",
+        "//tensorflow/python:training",
     ],
     tags = [
         "no_pip",  # b/38283730
@@ -162,6 +174,7 @@ tf_py_test(
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:random_seed",
         "//tensorflow/python:variables",
     ],
     tags = ["notsan"],  # b/62863147
@@ -193,10 +206,13 @@ tf_py_test(
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:sparse_tensor",
     ],
 )
 
@@ -220,6 +236,7 @@ py_test(
         "//tensorflow/python:platform_benchmark",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:training",
+        "//tensorflow/python/estimator:run_config",
         "//third_party/py/numpy",
     ],
 )
@@ -233,13 +250,20 @@ tf_py_test(
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
         ":factorization_ops_test_utils_py",
         "//third_party/py/numpy",
+        "//tensorflow/contrib/learn",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:platform_benchmark",
+        "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:state_ops",
+        "//tensorflow/python:training",
         "//tensorflow/python:variables",
     ],
     tags = [
@@ -256,11 +280,13 @@ tf_py_test(
     additional_deps = [
         ":factorization_py",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
+        ":gen_factorization_ops",
         "//third_party/py/numpy",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:sparse_tensor",
     ],
 )
 
@@ -284,10 +310,15 @@ tf_py_test(
         ":gen_factorization_ops",
         ":factorization_py_CYCLIC_DEPENDENCIES_THAT_NEED_TO_GO",
         "//third_party/py/numpy",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:framework",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
+        "//tensorflow/python:sparse_tensor",
     ],
 )
 

tensorflow/contrib/ffmpeg/BUILD

@@ -89,6 +89,7 @@ tf_py_test(
         "@six_archive//:six",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:platform",
     ],
     data = [
@@ -105,6 +106,7 @@ tf_py_test(
         "@six_archive//:six",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:platform",
     ],
     data = [

tensorflow/contrib/framework/BUILD

@@ -47,6 +47,7 @@ tf_custom_op_py_library(
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:audio_ops_gen",
+        "//tensorflow/python:check_ops",
         "//tensorflow/python:checkpoint_ops_gen",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework",
@@ -56,13 +57,17 @@ tf_custom_op_py_library(
         "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:pywrap_tensorflow",
+        "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:state_ops_gen",
         "//tensorflow/python:tensor_array_ops",
+        "//tensorflow/python:tensor_util",
         "//tensorflow/python:training",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/eager:context",
         "//third_party/py/numpy",
         "@six_archive//:six",
     ],
@@ -158,6 +163,11 @@ py_test(
         ":framework_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:gradients",
+        "//tensorflow/python:platform_test",
+        "//tensorflow/python:variables",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -170,7 +180,14 @@ py_test(
         ":framework_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:gradients",
+        "//tensorflow/python:math_ops",
+        "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python/eager:backprop",
+        "//tensorflow/python/eager:context",
+        "//tensorflow/python/eager:tape",
+        "//third_party/py/numpy",
     ],
 )
 

tensorflow/contrib/fused_conv/BUILD

@@ -38,7 +38,6 @@ tf_custom_op_py_library(
         ":fused_conv2d_bias_activation_op",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:control_flow_ops",
@@ -49,6 +48,7 @@ tf_custom_op_py_library(
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:session",
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
         "//third_party/py/numpy",
@@ -69,7 +69,7 @@ tf_kernel_library(
         "//tensorflow/core:lib",
         "//tensorflow/core:lib_proto_parsing",
         "//tensorflow/core:stream_executor",
-        "//tensorflow/core/kernels:bounds_check_lib",
+        "//tensorflow/core/kernels:bounds_check",
         "//tensorflow/core/kernels:conv_2d_hdrs",
         "//tensorflow/core/kernels:conv_ops_gpu_hdrs",
         "//tensorflow/core/kernels:gpu_util_hdrs",

tensorflow/contrib/gdr/BUILD

@@ -85,7 +85,6 @@ tf_cuda_library(
         "//tensorflow/core/distributed_runtime:rendezvous_mgr_interface",
         "//tensorflow/core/distributed_runtime:worker",
         "//tensorflow/core/distributed_runtime:worker_cache",
-        "//tensorflow/core/distributed_runtime:worker_env",
         "//tensorflow/core/distributed_runtime:worker_session",
         "//tensorflow/core/distributed_runtime/rpc:grpc_call",
         "//tensorflow/core/distributed_runtime/rpc:grpc_tensor_coding",

tensorflow/contrib/grid_rnn/BUILD

@@ -31,14 +31,12 @@ cuda_py_tests(
     additional_deps = [
         ":grid_rnn_py",
         "//third_party/py/numpy",
-        "//tensorflow/contrib/rnn:rnn_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:init_ops",
         "//tensorflow/python:nn_ops",
-        "//tensorflow/python:platform_test",
+        "//tensorflow/python:rnn",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
     ],

tensorflow/contrib/hvx/clock_cycle_profiling/BUILD

@@ -52,13 +52,9 @@ tf_cc_binary(
             "//tensorflow/core:android_tensorflow_test_lib",
         ],
         "//conditions:default": [
-            "//tensorflow/core:core_cpu",
             "//tensorflow/core:lib",
-            "//tensorflow/core:framework",
             "//tensorflow/core:framework_internal",
-            "//tensorflow/core:protos_all_cc",
             "//tensorflow/core:tensorflow",
-            "//tensorflow/core:test",
         ],
     }),
 )

tensorflow/contrib/image/BUILD

@@ -75,11 +75,13 @@ tf_custom_op_py_library(
         ":image_ops",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:common_shapes",
         "//tensorflow/python:constant_op",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:linalg_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:util",
     ],
 )
 

tensorflow/contrib/input_pipeline/BUILD

@@ -67,9 +67,9 @@ tf_custom_op_py_library(
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:state_ops",
+        "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
     ],

tensorflow/contrib/layers/BUILD

@@ -88,17 +88,21 @@ tf_custom_op_py_library(
         "//tensorflow/python:clip_ops",
         "//tensorflow/python:common_shapes",
         "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
         "//tensorflow/python:layers",
+        "//tensorflow/python:layers_base",
+        "//tensorflow/python:linalg_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_ops",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:standard_ops",
@@ -109,6 +113,7 @@ tf_custom_op_py_library(
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",
+        "//tensorflow/python/eager:context",
         "//tensorflow/python/feature_column",
         "@six_archive//:six",
     ],

tensorflow/contrib/linalg/BUILD

@@ -17,22 +17,11 @@ py_library(
     srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
-        "//tensorflow/python:client_testlib",
-        "//tensorflow/python:common_shapes",
-        "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:linalg_ops",
-        "//tensorflow/python:math_ops",
-        "//tensorflow/python:platform",
-        "//tensorflow/python:random_ops",
-        "//tensorflow/python:random_seed",
-        "//tensorflow/python:tensor_util",
         "//tensorflow/python:util",
         "//tensorflow/python/ops/linalg",
-        "//third_party/py/numpy",
         "@six_archive//:six",
     ],
 )

tensorflow/contrib/lookup/BUILD

@@ -34,12 +34,12 @@ py_test(
     deps = [
         ":lookup_py",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:lookup_ops",
+        "//tensorflow/python:session",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",

tensorflow/contrib/losses/BUILD

@@ -19,12 +19,19 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
+        ":metric_learning_py",
         "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_ops",
+        "//tensorflow/python:script_ops",
+        "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:summary",
         "//tensorflow/python:util",
     ],
 )
@@ -59,13 +66,16 @@ py_library(
     ],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
-        "//tensorflow/python:nn_ops",
         "//tensorflow/python:script_ops",
+        "//tensorflow/python:sparse_ops",
+        "//tensorflow/python:sparse_tensor",
+        "//tensorflow/python:summary",
         "//tensorflow/python:util",
     ],
 )
@@ -78,18 +88,11 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":metric_learning_py",
-        "//tensorflow/contrib/framework:framework_py",
-        "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
-        "//tensorflow/python:init_ops",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:random_ops",
+        "//tensorflow/python:nn",
-        "//tensorflow/python:random_seed",
+        "//tensorflow/python:sparse_tensor",
-        "//tensorflow/python:training",
-        "//tensorflow/python:variable_scope",
-        "//tensorflow/python:variables",
         "//third_party/py/numpy",
     ],
 )

tensorflow/contrib/memory_stats/BUILD

@@ -63,6 +63,8 @@ tf_custom_op_py_library(
     deps = [
         ":memory_stats_ops",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:platform",
+        "//tensorflow/python:util",
     ],
 )
 

tensorflow/contrib/meta_graph_transform/BUILD

@@ -21,7 +21,12 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:ops",
+        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:graph_util",
+        "//tensorflow/python:session",
+        "//tensorflow/python:training",
+        "//tensorflow/python:util",
         "//tensorflow/python/saved_model:constants",
         "//tensorflow/tools/graph_transforms:transform_graph_py",
     ],

tensorflow/contrib/metrics/BUILD

@@ -42,6 +42,7 @@ py_library(
         "//tensorflow/python:state_ops",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
+        "//tensorflow/python:weights_broadcast_ops",
     ],
 )
 

tensorflow/contrib/nccl/BUILD

@@ -79,6 +79,7 @@ tf_kernel_library(
         "//tensorflow/core:gpu_headers_lib",
         "//tensorflow/core:lib",
         "//tensorflow/core:proto_text",
+        "//tensorflow/core:stream_executor",
         "@nccl_archive//:nccl",
     ],
     alwayslink = 1,
@@ -114,7 +115,11 @@ tf_custom_op_py_library(
     deps = [
         ":nccl_ops",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:device",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:util",
+        "//tensorflow/python/eager:context",
     ],
 )
 

tensorflow/contrib/nearest_neighbor/BUILD

@@ -41,18 +41,14 @@ tf_gen_op_wrapper_py(
 tf_custom_op_py_library(
     name = "nearest_neighbor_py",
     srcs = ["__init__.py"] + glob(["python/ops/*.py"]),
-    dso = [
+    dso = [":python/ops/_nearest_neighbor_ops.so"],
-        ":python/ops/_nearest_neighbor_ops.so",
+    kernels = [":nearest_neighbor_ops_kernels"],
-    ],
-    kernels = [
-        ":nearest_neighbor_ops_kernels",
-    ],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
     deps = [
-        ":nearest_neighbor_ops_pywrapper",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:platform",
     ],
 )
 
@@ -70,9 +66,7 @@ tf_kernel_library(
 
 cc_library(
     name = "heap",
-    hdrs = [
+    hdrs = ["kernels/heap.h"],
-        "kernels/heap.h",
-    ],
 )
 
 tf_cc_test(
@@ -81,17 +75,14 @@ tf_cc_test(
     srcs = ["kernels/heap_test.cc"],
     deps = [
         ":heap",
-        "//tensorflow/core:test",
         "//tensorflow/core:test_main",
-        "//tensorflow/core:testlib",
+        "//tensorflow/core/kernels:ops_testutil",
     ],
 )
 
 cc_library(
     name = "hyperplane_lsh_probes",
-    hdrs = [
+    hdrs = ["kernels/hyperplane_lsh_probes.h"],
-        "kernels/hyperplane_lsh_probes.h",
-    ],
     deps = [
         ":heap",
         "//third_party/eigen3",
@@ -107,6 +98,7 @@ tf_cc_test(
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
         "//tensorflow/core:testlib",
+        "//tensorflow/core/kernels:ops_testutil",
     ],
 )
 

tensorflow/contrib/nn/BUILD

@@ -30,6 +30,7 @@ py_library(
         "//tensorflow/python:function",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
+        "//tensorflow/python:nn_ops",
         "//tensorflow/python:random_ops",
         "//tensorflow/python:tensor_shape",
         "//tensorflow/python:tensor_util",
@@ -77,9 +78,9 @@ py_test(
     deps = [
         ":nn_py",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:dtypes",
+        "//tensorflow/python:constant_op",
-        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:gradient_checker",
-        "//tensorflow/python:nn",
+        "//third_party/py/numpy",
     ],
 )
 

tensorflow/contrib/opt/BUILD

@@ -86,9 +86,9 @@ py_test(
     ],
     deps = [
         ":opt_py",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:session",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
         "//third_party/py/numpy",
@@ -119,13 +119,13 @@ py_test(
     deps = [
         ":opt_py",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:resource_variable_ops",
+        "//tensorflow/python:session",
         "//tensorflow/python:variables",
         "//third_party/py/numpy",
     ],
@@ -139,9 +139,11 @@ tf_py_test(
         "//third_party/py/numpy",
         "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:session",
         "//tensorflow/python:training",
         "//tensorflow/python:variables",
     ],

tensorflow/contrib/predictor/BUILD

@@ -25,7 +25,10 @@ py_library(
     srcs = ["__init__.py"],
     srcs_version = "PY2AND3",
     visibility = ["//visibility:public"],
-    deps = [":predictor_factories"],
+    deps = [
+        ":predictor_factories",
+        "//tensorflow/python:util",
+    ],
 )
 
 py_library(
@@ -58,7 +61,6 @@ py_library(
         "//tensorflow/python:session",
         "//tensorflow/python/saved_model:loader",
         "//tensorflow/python/saved_model:signature_constants",
-        "//tensorflow/python/saved_model:signature_def_utils",
     ],
 )
 

tensorflow/contrib/quantize/BUILD

@@ -29,6 +29,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":graph_matcher",
+        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:dtypes",
@@ -75,6 +76,7 @@ py_library(
         ":input_to_ops",
         "//tensorflow/contrib/graph_editor:graph_editor_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn",
         "//tensorflow/python:nn_ops",
@@ -87,7 +89,6 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":fold_batch_norms",
-        ":graph_matcher",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:dtypes",
@@ -208,6 +209,7 @@ py_library(
         ":fold_batch_norms",
         ":quantize",
         "//tensorflow/python:framework_ops",
+        "//tensorflow/python:util",
         "//tensorflow/python:variables",
     ],
 )

tensorflow/contrib/receptive_field/BUILD

@@ -39,7 +39,9 @@ py_library(
     deps = [
         ":graph_compute_order_py",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:platform",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -49,12 +51,13 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":receptive_field_py",
-        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/slim",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:dtypes",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:nn",
+        "//third_party/py/numpy",
     ],
 )
 

tensorflow/contrib/reduce_slice_ops/BUILD

@@ -71,6 +71,7 @@ tf_custom_op_py_library(
         ":reduce_slice_ops",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:framework",
+        "//tensorflow/python:platform",
     ],
 )
 

tensorflow/contrib/resampler/BUILD

@@ -26,9 +26,15 @@ tf_custom_op_py_library(
     deps = [
         ":resampler_ops",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/python:array_ops",
+        "//tensorflow/python:client_testlib",
+        "//tensorflow/python:constant_op",
+        "//tensorflow/python:dtypes",
+        "//tensorflow/python:errors",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:util",
+        "//third_party/py/numpy",
     ],
 )
 

tensorflow/contrib/rnn/BUILD

@@ -62,21 +62,24 @@ tf_custom_op_py_library(
         "//tensorflow/contrib/compiler:compiler_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/util:util_py",
+        "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:clip_ops",
         "//tensorflow/python:embedding_ops",
-        "//tensorflow/python:framework",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:init_ops",
-        "//tensorflow/python:layers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:nn_ops",
-        "//tensorflow/python:partitioned_variables",
         "//tensorflow/python:platform",
+        "//tensorflow/python:pywrap_tensorflow",
+        "//tensorflow/python:random_ops",
         "//tensorflow/python:rnn",
         "//tensorflow/python:rnn_cell",
+        "//tensorflow/python:session",
+        "//tensorflow/python:training",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
+        "//tensorflow/python:variables",
     ],
 )
 
@@ -382,7 +385,6 @@ py_binary(
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:client",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:pywrap_tensorflow",
@@ -412,8 +414,5 @@ py_library(
     name = "benchmarking",
     srcs = ["python/kernel_tests/benchmarking.py"],
     srcs_version = "PY2AND3",
-    deps = [
+    deps = ["//tensorflow/python:framework_ops"],
-        "//tensorflow/python:framework_ops",
-        "//third_party/py/numpy",
-    ],
 )

tensorflow/contrib/saved_model/BUILD

@@ -37,9 +37,14 @@ py_library(
     visibility = ["//visibility:public"],
     deps = [
         "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:lib",
         "//tensorflow/python:util",
+        "//tensorflow/python/saved_model:builder",
         "//tensorflow/python/saved_model:constants",
+        "//tensorflow/python/saved_model:signature_constants",
+        "//tensorflow/python/saved_model:signature_def_utils",
+        "//tensorflow/python/saved_model:tag_constants",
     ],
 )
 
@@ -85,10 +90,11 @@ py_test(
     deps = [
         ":saved_model_py",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
-        "//tensorflow/python/saved_model",
+        "//tensorflow/python:variables",
+        "//tensorflow/python/saved_model:loader",
         "//tensorflow/python/saved_model:signature_constants",
+        "//tensorflow/python/saved_model:tag_constants",
     ],
 )
 

tensorflow/contrib/seq2seq/BUILD

@@ -33,18 +33,31 @@ tf_custom_op_py_library(
         "//tensorflow/contrib/distributions:distributions_py",
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/contrib/rnn:rnn_py",
+        "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
+        "//tensorflow/python:check_ops",
+        "//tensorflow/python:clip_ops",
         "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:embedding_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:functional_ops",
+        "//tensorflow/python:init_ops",
+        "//tensorflow/python:layers",
+        "//tensorflow/python:layers_base",
         "//tensorflow/python:math_ops",
+        "//tensorflow/python:nn_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:random_ops",
         "//tensorflow/python:rnn",
         "//tensorflow/python:rnn_cell",
         "//tensorflow/python:script_ops",
         "//tensorflow/python:tensor_array_ops",
+        "//tensorflow/python:tensor_util",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
+        "//tensorflow/python/ops/distributions",
         "//third_party/py/numpy",
+        "@six_archive//:six",
     ],
 )
 

tensorflow/contrib/session_bundle/BUILD

@@ -136,7 +136,6 @@ py_test(
         ":gc",
         ":manifest_proto_py",
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
@@ -411,8 +410,6 @@ tf_cc_test(
         ":test_util",
         "//tensorflow/cc/saved_model:signature_constants",
         "//tensorflow/cc/saved_model:tag_constants",
-        "//tensorflow/core:core_cpu",
-        "//tensorflow/core:framework",
         "//tensorflow/core:lib",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core:test",

tensorflow/contrib/signal/BUILD

@@ -32,8 +32,8 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         "//tensorflow/core:protos_all_py",
-        "//tensorflow/python:framework",
         "//tensorflow/python:tf_optimizer",
+        "//tensorflow/python:training",
     ],
 )
 

tensorflow/contrib/slim/BUILD

@@ -48,7 +48,6 @@ py_library(
     srcs = ["python/slim/learning.py"],
     srcs_version = "PY2AND3",
     deps = [
-        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/contrib/training:training_py",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:client",
@@ -78,7 +77,6 @@ py_test(
         "//tensorflow/contrib/losses:losses_py",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",

tensorflow/contrib/slim/python/slim/data/BUILD

@@ -68,13 +68,13 @@ py_test(
         ":tfexample_decoder",
         "//tensorflow/contrib/slim:queues",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:image_ops",
         "//tensorflow/python:io_ops",
         "//tensorflow/python:parsing_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:session",
     ],
 )
 
@@ -187,6 +187,7 @@ py_test(
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:image_ops",
+        "//tensorflow/python:lookup_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:parsing_ops",
         "//third_party/py/numpy",

tensorflow/contrib/stateless/BUILD

@@ -21,7 +21,7 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":stateless_random_ops",
-        "//tensorflow/python:framework",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:util",
     ],
 )

tensorflow/contrib/summary/BUILD

@@ -26,9 +26,8 @@ py_test(
     deps = [
         ":summary_ops",
         ":summary_test_util",
-        "//tensorflow/core:protos_all_py",
+        "//tensorflow/python:errors",
         "//tensorflow/python:framework_test_lib",
-        "//tensorflow/python:lib",
         "//tensorflow/python:platform",
         "//tensorflow/python:training",
         "//tensorflow/python/eager:function",
@@ -43,12 +42,15 @@ py_library(
     visibility = ["//tensorflow:internal"],
     deps = [
         ":gen_summary_ops",
+        "//tensorflow/python:array_ops",
         "//tensorflow/python:constant_op",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:layers_base",
+        "//tensorflow/python:resource_variable_ops",
         "//tensorflow/python:summary_op_util",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
         "//tensorflow/python/eager:context",
     ],
 )

tensorflow/contrib/tensorboard/db/BUILD

@@ -22,10 +22,8 @@ tf_cc_test(
     srcs = ["schema_test.cc"],
     deps = [
         ":schema",
-        "//tensorflow/core:lib",
         "//tensorflow/core:test",
         "//tensorflow/core:test_main",
-        "//tensorflow/core/lib/db:sqlite",
     ],
 )
 

tensorflow/contrib/text/BUILD

@@ -36,15 +36,21 @@ tf_custom_op_py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":gen_skip_gram_ops",
+        "//tensorflow/contrib/lookup:lookup_py",
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:check_ops",
         "//tensorflow/python:control_flow_ops",
+        "//tensorflow/python:dtypes",
         "//tensorflow/python:framework",
+        "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:random_ops",
+        "//tensorflow/python:random_seed",
         "//tensorflow/python:training",
+        "//tensorflow/python:util",
     ],
 )
 

tensorflow/contrib/timeseries/examples/BUILD

@@ -88,6 +88,8 @@ py_binary(
     tags = ["no_pip"],
     deps = [
         "//tensorflow:tensorflow_py",
+        "//tensorflow/contrib/timeseries/python/timeseries:estimators",
+        "//tensorflow/contrib/timeseries/python/timeseries:model",
         "//third_party/py/numpy",
     ],
 )
@@ -98,7 +100,10 @@ py_test(
     srcs = ["lstm_test.py"],
     srcs_version = "PY2AND3",
     tags = ["notsan"],
-    deps = [":lstm"],
+    deps = [
+        ":lstm",
+        "//tensorflow/python:client_testlib",
+    ],
 )
 
 filegroup(

tensorflow/contrib/timeseries/python/timeseries/BUILD

@@ -138,15 +138,13 @@ py_library(
         "//tensorflow/python:control_flow_ops",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
-        "//tensorflow/python:init_ops",
         "//tensorflow/python:math_ops",
-        "//tensorflow/python:nn_ops",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:util",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python/estimator:estimator_py",
         "//tensorflow/python/estimator:export",
-        "//third_party/py/numpy",
+        "//tensorflow/python/estimator:head",
     ],
 )
 
@@ -184,7 +182,6 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":feature_keys",
-        "//tensorflow/contrib/framework:framework_py",
         "//tensorflow/python:dtypes",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:init_ops",
@@ -207,7 +204,6 @@ py_test(
         ":model_utils",
         "//tensorflow/python:array_ops",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:variables",
     ],
 )
 
@@ -327,11 +323,11 @@ py_library(
         ":input_pipeline",
         ":state_management",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_seed",
+        "//tensorflow/python:session",
         "//tensorflow/python:training",
         "//tensorflow/python:util",
         "//tensorflow/python:variables",
@@ -380,10 +376,10 @@ py_test(
         ":input_pipeline",
         ":test_utils",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_ops",
         "//tensorflow/python:platform",
+        "//tensorflow/python:session",
         "//tensorflow/python:training",
         "//tensorflow/python:variable_scope",
         "//tensorflow/python:variables",

tensorflow/contrib/training/BUILD

@@ -42,6 +42,7 @@ py_library(
         "//tensorflow/python:data_flow_ops",
         "//tensorflow/python:errors",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:layers_base",
         "//tensorflow/python:logging_ops",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:parsing_ops",
@@ -112,6 +113,7 @@ py_test(
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:random_ops",
+        "//tensorflow/python:sparse_ops",
         "//tensorflow/python:sparse_tensor",
         "//tensorflow/python:string_ops",
         "//tensorflow/python:training",
@@ -126,9 +128,12 @@ py_test(
     srcs = ["python/training/feeding_queue_runner_test.py"],
     srcs_version = "PY2AND3",
     deps = [
-        ":training_py",
         "//tensorflow/python:client_testlib",
-        "//tensorflow/python:framework_test_lib",
+        "//tensorflow/python:framework_ops",
+        "//tensorflow/python:session",
+        "//tensorflow/python:training",
+        "//tensorflow/python/estimator:inputs_queues",
+        "//third_party/py/numpy",
     ],
 )
 
@@ -140,7 +145,6 @@ py_test(
     deps = [
         ":training_py",
         "//tensorflow/python:client_testlib",
-        "@six_archive//:six",
     ],
 )
 
@@ -244,12 +248,12 @@ py_test(
         "//tensorflow/contrib/metrics:metrics_py",
         "//tensorflow/core:protos_all_py",
         "//tensorflow/python:array_ops",
-        "//tensorflow/python:client",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_seed",
+        "//tensorflow/python:session",
         "//tensorflow/python:state_ops",
         "//tensorflow/python:summary",
         "//tensorflow/python:training",
@@ -271,6 +275,7 @@ py_test(
         "//tensorflow/contrib/layers:layers_py",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python:framework_for_generated_wrappers",
+        "//tensorflow/python:gradients",
         "//tensorflow/python:math_ops",
         "//tensorflow/python:platform",
         "//tensorflow/python:random_seed",