diff options
author | 2017-07-11 17:49:40 -0700 | |
---|---|---|
committer | 2017-07-11 17:54:03 -0700 | |
commit | baba8fc6ae2f8a4aaed2b54927131f50d70da2a3 (patch) | |
tree | 7894c867d60ad011efb34646d49bbc72e2ac7bed | |
parent | 14f7d7f275ad4c3ae015b97b35340826860d980f (diff) |
Further BUILD cleanup in tensorflow/contrib/...
PiperOrigin-RevId: 161609382
-rw-r--r-- | tensorflow/contrib/data/python/framework/BUILD | 12 | ||||
-rw-r--r-- | tensorflow/contrib/data/python/kernel_tests/BUILD | 114 | ||||
-rw-r--r-- | tensorflow/contrib/keras/BUILD | 60 | ||||
-rw-r--r-- | tensorflow/contrib/session_bundle/BUILD | 29 |
4 files changed, 146 insertions, 69 deletions
diff --git a/tensorflow/contrib/data/python/framework/BUILD b/tensorflow/contrib/data/python/framework/BUILD index 7b84825bb4..164aa598f6 100644 --- a/tensorflow/contrib/data/python/framework/BUILD +++ b/tensorflow/contrib/data/python/framework/BUILD @@ -11,7 +11,11 @@ py_library( srcs = ["function.py"], srcs_version = "PY2AND3", deps = [ - "//tensorflow/python:framework", + "//tensorflow/python:array_ops", + "//tensorflow/python:framework_ops", + "//tensorflow/python:function", + "//tensorflow/python:util", + "//tensorflow/python:variable_scope", ], ) @@ -23,8 +27,10 @@ py_test( deps = [ ":function", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", + "//tensorflow/python:constant_op", + "//tensorflow/python:dtypes", + "//tensorflow/python:framework_ops", + "//tensorflow/python:math_ops", ], ) diff --git a/tensorflow/contrib/data/python/kernel_tests/BUILD b/tensorflow/contrib/data/python/kernel_tests/BUILD index 655c6f23dd..d5e8eb7fda 100644 --- a/tensorflow/contrib/data/python/kernel_tests/BUILD +++ b/tensorflow/contrib/data/python/kernel_tests/BUILD @@ -12,9 +12,19 @@ py_test( srcs = ["iterator_ops_test.py"], srcs_version = "PY2AND3", deps = [ - "//tensorflow/contrib/data", + "//tensorflow/contrib/data/python/ops:dataset_ops", + "//tensorflow/core:protos_all_py", + "//tensorflow/python:array_ops", + "//tensorflow/python:client", "//tensorflow/python:client_testlib", + "//tensorflow/python:constant_op", + "//tensorflow/python:dtypes", + "//tensorflow/python:errors", + "//tensorflow/python:framework_ops", + "//tensorflow/python:gradients", + "//tensorflow/python:math_ops", "//tensorflow/python:training", + "//third_party/py/numpy", ], ) @@ -24,14 +34,18 @@ py_test( srcs = ["batch_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:constant_op", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", "//tensorflow/python:math_ops", - "//tensorflow/python:platform_test", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:string_ops", + "//tensorflow/python:tensor_shape", + "//tensorflow/python:util", + "//third_party/py/numpy", ], ) @@ -41,9 +55,17 @@ py_test( srcs = ["bucketing_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:constant_op", + "//tensorflow/python:dtypes", + "//tensorflow/python:errors", + "//tensorflow/python:framework_ops", + "//tensorflow/python:math_ops", "//tensorflow/python:string_ops", + "//tensorflow/python:tensor_shape", + "//third_party/py/numpy", ], ) @@ -57,13 +79,15 @@ py_test( "nomac", # b/62040583 ], 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:math_ops", - "//tensorflow/python:platform_test", + "//tensorflow/python:sparse_tensor", + "//tensorflow/python:util", + "//third_party/py/numpy", ], ) @@ -73,13 +97,13 @@ py_test( srcs = ["filter_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:math_ops", - "//tensorflow/python:platform_test", + "//third_party/py/numpy", ], ) @@ -89,13 +113,12 @@ py_test( srcs = ["flat_map_dataset_op_test.py"], srcs_version = "PY2AND3", deps = [ - "//tensorflow/contrib/data", - "//tensorflow/python:array_ops", + "//tensorflow/contrib/data/python/ops:dataset_ops", + "//tensorflow/python:client", "//tensorflow/python:client_testlib", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", "//tensorflow/python:training", + "//third_party/py/numpy", ], ) @@ -120,16 +143,19 @@ py_test( srcs = ["map_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:constant_op", "//tensorflow/python:data_flow_ops", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", "//tensorflow/python:lookup_ops", "//tensorflow/python:math_ops", - "//tensorflow/python:platform_test", + "//tensorflow/python:random_ops", "//tensorflow/python:string_ops", + "//tensorflow/python:variable_scope", + "//third_party/py/numpy", ], ) @@ -139,12 +165,13 @@ py_test( srcs = ["range_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:constant_op", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", + "//tensorflow/python:tensor_shape", ], ) @@ -154,12 +181,17 @@ py_test( srcs = ["reader_dataset_ops_test.py"], srcs_version = "PY2AND3", deps = [ - "//tensorflow/contrib/data", + "//tensorflow/contrib/data/python/ops:dataset_ops", + "//tensorflow/core:protos_all_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", + "//tensorflow/python:constant_op", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", + "//tensorflow/python:framework_ops", + "//tensorflow/python:lib", + "//tensorflow/python:parsing_ops", + "//tensorflow/python:util", ], ) @@ -169,14 +201,13 @@ py_test( srcs = ["resample_test.py"], srcs_version = "PY2AND3", deps = [ - "//tensorflow/contrib/data", - "//tensorflow/python:array_ops", + "//tensorflow/contrib/data/python/ops:dataset_ops", "//tensorflow/python:client_testlib", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", "//tensorflow/python:string_ops", + "//tensorflow/python:util", "//tensorflow/python:variables", + "//third_party/py/numpy", ], ) @@ -186,12 +217,12 @@ py_test( srcs = ["sequence_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", + "//third_party/py/numpy", ], ) @@ -201,12 +232,13 @@ py_test( srcs = ["shuffle_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:constant_op", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", + "//third_party/py/numpy", ], ) @@ -216,12 +248,14 @@ py_test( srcs = ["cache_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:constant_op", + "//tensorflow/python:dtypes", "//tensorflow/python:errors", - "//tensorflow/python:framework", - "//tensorflow/python:platform_test", + "//tensorflow/python:variables", + "//third_party/py/numpy", ], ) @@ -231,12 +265,12 @@ py_test( srcs = ["zip_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", + "//third_party/py/numpy", ], ) diff --git a/tensorflow/contrib/keras/BUILD b/tensorflow/contrib/keras/BUILD index 9e92b03399..e48b18ff52 100644 --- a/tensorflow/contrib/keras/BUILD +++ b/tensorflow/contrib/keras/BUILD @@ -115,24 +115,35 @@ py_library( "//tensorflow/python:check_ops", "//tensorflow/python:client", "//tensorflow/python:clip_ops", + "//tensorflow/python:constant_op", "//tensorflow/python:control_flow_ops", + "//tensorflow/python:ctc_ops", + "//tensorflow/python:dtypes", "//tensorflow/python:framework", + "//tensorflow/python:framework_ops", "//tensorflow/python:functional_ops", "//tensorflow/python:gradients", "//tensorflow/python:image_ops", "//tensorflow/python:init_ops", "//tensorflow/python:layers", + "//tensorflow/python:layers_base", "//tensorflow/python:logging_ops", "//tensorflow/python:math_ops", "//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:tensor_array_grad", + "//tensorflow/python:tensor_array_ops", + "//tensorflow/python:tensor_shape", "//tensorflow/python:training", + "//tensorflow/python:util", "//tensorflow/python:variable_scope", "//tensorflow/python:variables", + "@six_archive//:six", ], ) @@ -144,8 +155,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -157,6 +168,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -168,6 +180,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -179,6 +192,8 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//tensorflow/python:init_ops", + "//third_party/py/numpy", ], ) @@ -189,7 +204,6 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", ], ) @@ -202,8 +216,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -215,6 +229,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -226,6 +241,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -302,7 +318,6 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", ], ) @@ -314,8 +329,8 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -330,8 +345,8 @@ py_test( ], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -342,7 +357,6 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", ], ) @@ -354,8 +368,8 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -366,7 +380,6 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", ], ) @@ -378,8 +391,8 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -391,6 +404,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -401,7 +415,6 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", ], ) @@ -412,7 +425,7 @@ cuda_py_test( srcs = ["python/keras/layers/normalization_test.py"], additional_deps = [ ":keras", - ":testing_utils", + "//third_party/py/numpy", "//tensorflow/python:client_testlib", ], ) @@ -425,8 +438,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -438,8 +451,8 @@ py_test( tags = ["notsan"], # http://b/62136390 deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -451,8 +464,8 @@ py_test( tags = ["notsan"], # http://b/62189182 deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -475,6 +488,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -486,8 +500,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -533,6 +547,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -544,6 +559,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -555,6 +571,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -566,8 +583,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -579,8 +596,8 @@ py_test( tags = ["notsan"], deps = [ ":keras", - ":testing_utils", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -591,7 +608,10 @@ py_test( srcs_version = "PY2AND3", deps = [ ":keras", + "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", + "//tensorflow/python:dtypes", + "//third_party/py/numpy", ], ) @@ -603,6 +623,7 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//third_party/py/numpy", ], ) @@ -614,6 +635,8 @@ py_test( deps = [ ":keras", "//tensorflow/python:client_testlib", + "//tensorflow/python:util", + "//third_party/py/numpy", ], ) @@ -625,6 +648,7 @@ py_library( srcs_version = "PY2AND3", deps = [ ":keras", + "//tensorflow/python:util", "//third_party/py/numpy", ], ) diff --git a/tensorflow/contrib/session_bundle/BUILD b/tensorflow/contrib/session_bundle/BUILD index fc34d82f25..bd1e100a54 100644 --- a/tensorflow/contrib/session_bundle/BUILD +++ b/tensorflow/contrib/session_bundle/BUILD @@ -63,6 +63,7 @@ py_library( "//tensorflow/core:protos_all_py", "//tensorflow/python:client", "//tensorflow/python:framework", + "//tensorflow/python:platform", "//tensorflow/python/saved_model:constants", "//tensorflow/python/saved_model:loader", "//tensorflow/python/saved_model:signature_constants", @@ -83,13 +84,13 @@ py_test( deps = [ ":bundle_shim_py", ":constants", + ":manifest_proto_py", "//tensorflow/core:protos_all_py", "//tensorflow/python:client_testlib", "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:parsing_ops", "//tensorflow/python:util", - "//tensorflow/python/saved_model:constants", "//tensorflow/python/saved_model:signature_constants", "//tensorflow/python/saved_model:tag_constants", ], @@ -113,6 +114,7 @@ py_library( ":constants", ":gc", ":manifest_proto_py", + "//tensorflow/core:protos_all_py", "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:platform", @@ -125,9 +127,7 @@ py_library( py_test( name = "exporter_test", size = "small", - srcs = [ - "exporter_test.py", - ], + srcs = ["exporter_test.py"], srcs_version = "PY2AND3", visibility = ["//visibility:private"], deps = [ @@ -157,15 +157,14 @@ py_library( deps = [ "//tensorflow/python:framework", "//tensorflow/python:platform", + "//tensorflow/python:util", ], ) py_test( name = "gc_test", size = "small", - srcs = [ - "gc_test.py", - ], + srcs = ["gc_test.py"], srcs_version = "PY2AND3", visibility = ["//visibility:private"], deps = [ @@ -199,8 +198,12 @@ cc_library( deprecation = "Use SavedModel Loader instead.", visibility = ["//visibility:public"], deps = [ + ":manifest_proto_cc", ":session_bundle_lite", ":signature", + "//tensorflow/core:core_cpu", + "//tensorflow/core:lib", + "//tensorflow/core:protos_all_cc", ], ) @@ -217,6 +220,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":signature_lite", + "//tensorflow/core:lib_internal", ] + if_not_mobile([ ":manifest_proto_cc", "//tensorflow/core:core_cpu", @@ -238,10 +242,12 @@ cc_test( visibility = ["//visibility:private"], deps = [ ":session_bundle", + ":signature", ":test_util", "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", + "//tensorflow/core:protos_all_cc", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -263,6 +269,7 @@ py_library( "//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:lib", "//tensorflow/python:training", + "//tensorflow/python:util", ], ) @@ -281,8 +288,8 @@ py_test( "//tensorflow/core:protos_all_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", + "//tensorflow/python:graph_util", "//tensorflow/python:math_ops", "//tensorflow/python:parsing_ops", "//tensorflow/python:training", @@ -318,7 +325,12 @@ cc_library( deprecation = "Use SavedModel instead.", visibility = ["//visibility:public"], deps = [ + ":manifest_proto_cc", ":signature_lite", + "//tensorflow/core:core_cpu", + "//tensorflow/core:framework", + "//tensorflow/core:lib", + "//tensorflow/core:protos_all_cc", ] + if_not_mobile([ "//tensorflow/core:tensorflow_opensource", ]), @@ -398,6 +410,7 @@ cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", + "//tensorflow/core:protos_all_cc", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", |