diff --git a/tensorflow/contrib/learn/BUILD b/tensorflow/contrib/learn/BUILD index 980f971c50e..44c322fba29 100644 --- a/tensorflow/contrib/learn/BUILD +++ b/tensorflow/contrib/learn/BUILD @@ -29,6 +29,7 @@ py_library( "//tensorflow/contrib/layers:layers_py", "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/contrib/linear_optimizer:sdca_ops_py", + "//tensorflow/contrib/lookup:lookup_py", "//tensorflow/contrib/losses:losses_py", "//tensorflow/contrib/metrics:metrics_py", "//tensorflow/contrib/rnn:rnn_py", @@ -50,24 +51,37 @@ py_library( "//tensorflow/python:init_ops", "//tensorflow/python:io_ops", "//tensorflow/python:logging_ops", + "//tensorflow/python:lookup_ops", "//tensorflow/python:math_ops", "//tensorflow/python:nn", "//tensorflow/python:parsing_ops", "//tensorflow/python:partitioned_variables", "//tensorflow/python:platform", + "//tensorflow/python:random_seed", "//tensorflow/python:resources", "//tensorflow/python:rnn", "//tensorflow/python:session", "//tensorflow/python:sparse_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:state_ops", "//tensorflow/python:string_ops", "//tensorflow/python:summary", + "//tensorflow/python:tensor_util", "//tensorflow/python:training", "//tensorflow/python:util", "//tensorflow/python:variable_scope", "//tensorflow/python:variables", + "//tensorflow/python:weights_broadcast_ops", + "//tensorflow/python/estimator", "//tensorflow/python/estimator:estimator_py", + "//tensorflow/python/estimator:export_output", "//tensorflow/python/estimator:inputs", + "//tensorflow/python/estimator:inputs_queues", + "//tensorflow/python/estimator:model_fn", + "//tensorflow/python/estimator:numpy_io", + "//tensorflow/python/estimator:pandas_io", + "//tensorflow/python/estimator:run_config", + "//tensorflow/python/feature_column", "//tensorflow/python/feature_column:feature_column_py", "//tensorflow/python/saved_model:builder", "//tensorflow/python/saved_model:loader", @@ -107,14 +121,11 @@ py_test( py_test( name = "feeding_functions_test", size = "small", - srcs = [ - "python/learn/tests/dataframe/feeding_functions_test.py", - ], + srcs = ["python/learn/tests/dataframe/feeding_functions_test.py"], srcs_version = "PY2AND3", deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -122,16 +133,13 @@ py_test( py_test( name = "feeding_queue_runner_test", size = "small", - srcs = [ - "python/learn/tests/dataframe/feeding_queue_runner_test.py", - ], + srcs = ["python/learn/tests/dataframe/feeding_queue_runner_test.py"], srcs_version = "PY2AND3", deps = [ ":learn", "//tensorflow/python:client", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -146,7 +154,6 @@ py_test( ":learn", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", ], ) @@ -160,7 +167,6 @@ py_test( "//tensorflow/contrib/layers:layers_py", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:parsing_ops", ], ) @@ -174,7 +180,6 @@ py_test( ":learn", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", ], ) @@ -186,7 +191,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", ], ) @@ -201,7 +205,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:io_ops", "//tensorflow/python:training", "//tensorflow/python:variables", @@ -217,7 +220,6 @@ py_test( ":learn", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -230,7 +232,7 @@ py_test( deps = [ ":learn", "//tensorflow:tensorflow_py", - "//tensorflow/python:framework_test_lib", + "//tensorflow/core:protos_all_py", "//third_party/py/numpy", ], ) @@ -245,7 +247,6 @@ py_test( "//tensorflow/python:client", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -259,7 +260,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -273,7 +273,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -287,9 +286,9 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/core:protos_all_py", "//tensorflow/python:client_testlib", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:lib", "//tensorflow/python:parsing_ops", "//third_party/py/numpy", @@ -304,7 +303,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -318,7 +316,6 @@ py_test( ":learn", "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -333,7 +330,6 @@ py_test( ":learn", "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -347,9 +343,8 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", "//third_party/py/numpy", ], ) @@ -361,11 +356,10 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/contrib/framework:framework_py", "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/python:client_testlib", - "//tensorflow/python:control_flow_ops", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//tensorflow/python:variables", "//third_party/py/numpy", @@ -380,7 +374,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", ], ) @@ -394,11 +387,11 @@ py_test( "//tensorflow/core:protos_all_py", "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", "//tensorflow/python:training", "//tensorflow/python:util", "//tensorflow/python:variables", + "//tensorflow/python/estimator", ], ) @@ -414,9 +407,7 @@ py_test( "//tensorflow/python:client_testlib", "//tensorflow/python:control_flow_ops", "//tensorflow/python:extra_py_tests_deps", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:resources", "//tensorflow/python:state_ops", "//tensorflow/python:summary", @@ -433,8 +424,8 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/contrib/training:training_py", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", ], ) @@ -458,21 +449,21 @@ py_test( "//tensorflow/python:summary", "//tensorflow/python:training", "//tensorflow/python:variables", + "//tensorflow/python/estimator", ], ) py_test( name = "run_config_test", size = "small", - srcs = [ - "python/learn/estimators/run_config_test.py", - ], + srcs = ["python/learn/estimators/run_config_test.py"], srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/core:protos_all_py", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", + "//tensorflow/python/estimator:run_config", ], ) @@ -485,9 +476,8 @@ py_test( ":learn", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", ], ) @@ -506,14 +496,18 @@ py_test( "//tensorflow/contrib/metrics:metrics_py", "//tensorflow/contrib/testing:testing_py", "//tensorflow/python:array_ops", + "//tensorflow/python:check_ops", "//tensorflow/python:client", "//tensorflow/python:client_testlib", + "//tensorflow/python:control_flow_ops", "//tensorflow/python:data_flow_ops", "//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_test_lib", + "//tensorflow/python:lib", "//tensorflow/python:math_ops", "//tensorflow/python:parsing_ops", "//tensorflow/python:platform", + "//tensorflow/python:protos_all_py", "//tensorflow/python:training", "//tensorflow/python:util", "//tensorflow/python:variables", @@ -559,7 +553,6 @@ py_test( "//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:math_ops", "//third_party/py/numpy", @@ -574,18 +567,17 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", - "//tensorflow/contrib/framework:framework_py", "//tensorflow/contrib/layers:layers_py", "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/contrib/metrics:metrics_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:init_ops", "//tensorflow/python:math_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:training", + "//tensorflow/python/feature_column", "//tensorflow/python/ops/losses", "//third_party/py/numpy", ], @@ -598,12 +590,12 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/core:protos_all_py", "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:control_flow_ops", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:lookup_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:variables", "//tensorflow/python/ops/losses", "//third_party/py/numpy", @@ -624,12 +616,12 @@ py_test( "//tensorflow/contrib/metrics:metrics_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:init_ops", "//tensorflow/python:math_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:training", + "//tensorflow/python/feature_column", "//third_party/py/numpy", ], ) @@ -655,9 +647,8 @@ py_test( "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:training", ], ) @@ -669,14 +660,16 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", - "//tensorflow/contrib/factorization:factorization_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", + "//tensorflow/python:control_flow_ops", + "//tensorflow/python:data_flow_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:random_ops", + "//tensorflow/python:training", "//third_party/py/numpy", ], ) @@ -700,9 +693,8 @@ py_test( ":learn", "//tensorflow/contrib/layers:layers_py", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -720,13 +712,14 @@ py_test( "//tensorflow/python:array_ops", "//tensorflow/python:client", "//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:functional_ops", + "//tensorflow/python:lookup_ops", "//tensorflow/python:math_ops", "//tensorflow/python:random_ops", + "//tensorflow/python:random_seed", + "//tensorflow/python:rnn_cell", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:variables", "//third_party/py/numpy", ], @@ -740,17 +733,15 @@ py_test( deps = [ ":learn", "//tensorflow/contrib/layers:layers_py", - "//tensorflow/contrib/rnn:rnn_py", + "//tensorflow/contrib/lookup:lookup_py", "//tensorflow/python:array_ops", - "//tensorflow/python:client", "//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:functional_ops", + "//tensorflow/python:init_ops", + "//tensorflow/python:lookup_ops", "//tensorflow/python:math_ops", "//tensorflow/python:random_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:variables", "//third_party/py/numpy", ], @@ -771,11 +762,11 @@ py_test( "//tensorflow/contrib/metrics:metrics_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:math_ops", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:training", + "//tensorflow/python/feature_column", "//third_party/py/numpy", ], ) @@ -813,9 +804,8 @@ py_test( "//tensorflow/contrib/layers:layers_py", "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", "//tensorflow/python:state_ops", ], ) @@ -829,9 +819,8 @@ py_test( ":learn", "//tensorflow/contrib/layers:layers_py", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:sparse_tensor", ], ) @@ -843,7 +832,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", ], ) @@ -867,9 +855,14 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", - "//third_party/py/numpy", + "//tensorflow/python:constant_op", + "//tensorflow/python:control_flow_ops", + "//tensorflow/python:training", + "//tensorflow/python/estimator:export_output", + "//tensorflow/python/saved_model:signature_constants", + "@six_archive//:six", ], ) @@ -881,7 +874,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -896,8 +888,7 @@ py_test( "//tensorflow/contrib/layers:layers_py", "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:random_seed", ], ) @@ -909,7 +900,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -921,12 +911,10 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", - "//tensorflow/python:array_ops", + "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", - "//tensorflow/python:math_ops", + "//third_party/py/numpy", ], ) @@ -940,9 +928,8 @@ py_test( "//tensorflow/contrib/layers:layers_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", + "//tensorflow/python:random_seed", "//tensorflow/python:variables", "//third_party/py/numpy", ], @@ -955,11 +942,10 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", - "//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:rnn_cell", "//third_party/py/numpy", ], ) @@ -972,7 +958,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", "//third_party/py/numpy", ], ) @@ -985,7 +970,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", ], ) @@ -997,7 +981,6 @@ py_test( deps = [ ":learn", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework_test_lib", ], ) @@ -1015,6 +998,7 @@ py_test( "//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_test_lib", "//tensorflow/python:io_ops", + "//tensorflow/python:math_ops", "//tensorflow/python:parsing_ops", "//tensorflow/python:platform", "//tensorflow/python:training", @@ -1031,7 +1015,6 @@ py_test( ":learn", "//tensorflow/python:client_testlib", "//tensorflow/python:errors", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -1046,7 +1029,6 @@ py_test( ":learn", "//tensorflow/python:client_testlib", "//tensorflow/python:errors", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:training", "//third_party/py/numpy", ], @@ -1066,12 +1048,11 @@ py_test( ":learn", "//tensorflow/contrib/layers:layers_py", "//tensorflow/contrib/session_bundle:exporter", + "//tensorflow/contrib/session_bundle:manifest_proto_py_pb2", "//tensorflow/python:array_ops", "//tensorflow/python:client", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", "//tensorflow/python:random_ops", "//tensorflow/python:training", @@ -1091,6 +1072,7 @@ py_test( "//tensorflow/python:framework", "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", + "//tensorflow/python:util", ], ) @@ -1101,12 +1083,13 @@ py_test( srcs_version = "PY2AND3", deps = [ ":learn", + "//tensorflow/contrib/layers:layers_py", + "//tensorflow/core:protos_all_py", "//tensorflow/python:array_ops", "//tensorflow/python:client_testlib", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:platform", + "//tensorflow/python:util", "//tensorflow/python/saved_model:signature_constants", "//tensorflow/python/saved_model:signature_def_utils", ], @@ -1124,9 +1107,7 @@ py_test( "//tensorflow/contrib/learn/python/learn/datasets", "//tensorflow/python:client_testlib", "//tensorflow/python:control_flow_ops", - "//tensorflow/python:framework", "//tensorflow/python:framework_for_generated_wrappers", - "//tensorflow/python:framework_test_lib", "//tensorflow/python:random_ops", "//tensorflow/python:training", ],