[CLEANUP]

Replace dependencies on aliases of TF protobufs

Depend on the real thing!

PiperOrigin-RevId: 334494093
Change-Id: Ib1983d931beba2f973cc49cb13aa39c365bb60d0
This commit is contained in:
Gunhan Gulsoy 2020-09-29 17:10:13 -07:00 committed by TensorFlower Gardener
parent 440a655746
commit ca8309afca
6 changed files with 43 additions and 43 deletions
tensorflow
core
debug
distributed_runtime
python

View File

@ -230,7 +230,6 @@ tf_cc_test(
"//tensorflow/core:framework",
"//tensorflow/core:functional_ops_op_lib",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:math_ops_op_lib",
"//tensorflow/core:nn_ops_op_lib",
"//tensorflow/core:no_op_op_lib",
@ -244,6 +243,7 @@ tf_cc_test(
"//tensorflow/core/distributed_runtime/rpc:grpc_testlib",
"//tensorflow/core/kernels:constant_op",
"//tensorflow/core/kernels:matmul_op",
"//tensorflow/core/protobuf:master_proto_cc",
],
)

View File

@ -68,9 +68,9 @@ cc_library(
hdrs = ["message_wrappers.h"],
deps = [
"//tensorflow/core:framework",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:master_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -106,7 +106,7 @@ cc_library(
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
"@com_google_absl//absl/types:optional",
],
)
@ -146,7 +146,7 @@ cc_library(
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:ptr_util",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -183,7 +183,7 @@ cc_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -197,7 +197,7 @@ cc_library(
":message_wrappers",
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:lib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -267,8 +267,8 @@ tf_cc_test(
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/framework:tensor_testutil",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -299,7 +299,7 @@ cc_library(
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -311,7 +311,7 @@ cc_library(
":message_wrappers",
":request_id",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core/protobuf:master_proto_cc",
],
)
@ -332,9 +332,9 @@ cc_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:master_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -356,9 +356,9 @@ cc_library(
"//tensorflow/core:graph",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core/debug:debug_graph_utils",
"//tensorflow/core/protobuf:master_proto_cc",
],
)
@ -440,10 +440,10 @@ cc_library(
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/debug",
"//tensorflow/core/profiler/lib:connected_traceme",
"//tensorflow/core/profiler/lib:traceme_encode",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -457,7 +457,7 @@ cc_library(
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -523,8 +523,8 @@ tf_cc_test(
"//tensorflow/core:session_options",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/nccl:collective_communicator",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -540,7 +540,7 @@ cc_library(
"//tensorflow/core:framework",
"//tensorflow/core:lib_internal", # protobuf::Any
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
"@com_google_absl//absl/memory",
],
)
@ -561,7 +561,7 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -673,7 +673,6 @@ tf_cuda_cc_test(
"//tensorflow/core:framework_internal",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:state_ops_op_lib",
"//tensorflow/core:test",
@ -689,6 +688,7 @@ tf_cuda_cc_test(
"//tensorflow/core/kernels:dense_update_ops",
"//tensorflow/core/kernels:identity_op",
"//tensorflow/core/kernels:variable_ops",
"//tensorflow/core/protobuf:master_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -713,7 +713,6 @@ tf_cuda_cc_test(
"//tensorflow/core:framework_internal",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
@ -722,6 +721,7 @@ tf_cuda_cc_test(
"//tensorflow/core/distributed_runtime/rpc:grpc_testlib",
"//tensorflow/core/distributed_runtime/rpc:grpc_util",
"//tensorflow/core/distributed_runtime/rpc:grpc_worker_cache",
"//tensorflow/core/protobuf:master_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -783,7 +783,7 @@ cc_library(
deps = [
":message_wrappers",
"//tensorflow/core:lib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)
@ -797,7 +797,7 @@ tf_cc_test(
"//tensorflow/core:lib",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
],
)

View File

@ -61,11 +61,11 @@ cc_library(
hdrs = ["destroy_tensor_handle_node.h"],
deps = [
":eager_client",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core/common_runtime/eager:context",
"//tensorflow/core/common_runtime/eager:eager_executor",
"//tensorflow/core/protobuf:eager_service_proto_cc",
],
)
@ -73,10 +73,10 @@ cc_library(
name = "eager_client",
hdrs = ["eager_client.h"],
deps = [
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/distributed_runtime:call_options",
"//tensorflow/core/protobuf:eager_service_proto_cc",
],
)
@ -87,13 +87,13 @@ cc_library(
deps = [
":eager_client",
"//tensorflow/core:core_cpu",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core/common_runtime/eager:eager_executor",
"//tensorflow/core/common_runtime/eager:shape_inference",
"//tensorflow/core/common_runtime/eager:tensor_handle",
"//tensorflow/core/protobuf:eager_service_proto_cc",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/types:span",
],
@ -112,7 +112,6 @@ cc_library(
"//tensorflow/c:c_api_internal",
"//tensorflow/c:tf_status_helper",
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:framework_internal",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
@ -130,6 +129,7 @@ cc_library(
"//tensorflow/core/distributed_runtime:worker_env",
"//tensorflow/core/distributed_runtime/rpc:rpc_rendezvous_mgr",
"//tensorflow/core/profiler/lib:traceme",
"//tensorflow/core/protobuf:eager_service_proto_cc",
"@com_google_absl//absl/container:fixed_array",
"@com_google_absl//absl/memory",
"@com_google_absl//absl/types:optional",
@ -146,7 +146,6 @@ tf_cc_test(
":remote_mgr",
"//tensorflow/c:c_api",
"//tensorflow/c:c_api_internal",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
@ -159,6 +158,7 @@ tf_cc_test(
"//tensorflow/core/distributed_runtime:test_utils",
"//tensorflow/core/distributed_runtime:worker_env",
"//tensorflow/core/distributed_runtime/rpc:rpc_rendezvous_mgr",
"//tensorflow/core/protobuf:eager_service_proto_cc",
"@com_google_absl//absl/types:optional",
"@com_google_absl//absl/types:variant",
],

View File

@ -96,10 +96,10 @@ cc_library(
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/distributed_runtime:tensor_coding",
"//tensorflow/core/distributed_runtime:worker_cache_logger",
"//tensorflow/core/distributed_runtime:worker_interface",
"//tensorflow/core/protobuf:worker_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -129,7 +129,7 @@ cc_library(
"//tensorflow/core:framework_internal",
"//tensorflow/core:lib",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
"@com_google_absl//absl/flags:flag",
tf_grpc_cc_dependency(),
],
@ -218,13 +218,13 @@ tf_cuda_library(
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/distributed_runtime:graph_mgr",
"//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/protobuf:worker_proto_cc",
"@com_google_absl//absl/container:flat_hash_map",
tf_grpc_cc_dependency(),
],
@ -236,8 +236,8 @@ cc_library(
hdrs = ["grpc_worker_service_impl.h"],
deps = [
":grpc_util",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/distributed_runtime:tensor_coding",
"//tensorflow/core/protobuf:worker_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -251,10 +251,10 @@ cc_library(
":grpc_util",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core/distributed_runtime:call_options",
"//tensorflow/core/distributed_runtime:master_interface",
"//tensorflow/core/profiler/lib:traceme",
"//tensorflow/core/protobuf:master_proto_cc",
"@com_google_absl//absl/time",
],
alwayslink = 1,
@ -271,9 +271,9 @@ cc_library(
":grpc_util",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core/distributed_runtime:master",
"//tensorflow/core/profiler/lib:traceme",
"//tensorflow/core/protobuf:master_proto_cc",
tf_grpc_cc_dependency(),
],
alwayslink = 1,
@ -284,7 +284,7 @@ cc_library(
srcs = ["grpc_master_service_impl.cc"],
hdrs = ["grpc_master_service_impl.h"],
deps = [
"//tensorflow/core:master_proto_cc",
"//tensorflow/core/protobuf:master_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -447,13 +447,13 @@ cc_library(
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core/distributed_runtime:call_options",
"//tensorflow/core/distributed_runtime:local_master",
"//tensorflow/core/distributed_runtime:master_interface",
"//tensorflow/core/distributed_runtime:message_wrappers",
"//tensorflow/core/distributed_runtime:request_id",
"//tensorflow/core/protobuf:master_proto_cc",
],
alwayslink = 1,
)
@ -481,7 +481,6 @@ tf_cuda_cc_tests(
"//tensorflow/core:core_cpu_internal",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
@ -489,6 +488,7 @@ tf_cuda_cc_tests(
"//tensorflow/core/distributed_runtime:server_lib",
"//tensorflow/core/distributed_runtime:test_utils",
"//tensorflow/core/platform:blocking_counter",
"//tensorflow/core/protobuf:master_proto_cc",
],
)
@ -510,7 +510,7 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -523,7 +523,7 @@ tf_cc_test(
":grpc_util",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:worker_proto_cc",
"//tensorflow/core/protobuf:worker_proto_cc",
tf_grpc_dependency(),
tf_grpc_cc_dependency(),
],
@ -546,7 +546,6 @@ tf_cuda_cc_test(
"//tensorflow/core:core_cpu",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:state_ops_op_lib",
"//tensorflow/core:test",
@ -557,6 +556,7 @@ tf_cuda_cc_test(
"//tensorflow/core/kernels:dense_update_ops",
"//tensorflow/core/kernels:matmul_op",
"//tensorflow/core/kernels:variable_ops",
"//tensorflow/core/protobuf:master_proto_cc",
],
)

View File

@ -16,7 +16,7 @@ cc_library(
srcs = ["grpc_eager_service.h"],
hdrs = ["grpc_eager_service.h"],
deps = [
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core/protobuf:eager_service_proto_cc",
"//tensorflow/stream_executor/platform",
tf_grpc_cc_dependency(),
],
@ -28,7 +28,6 @@ cc_library(
hdrs = ["grpc_eager_client.h"],
deps = [
":grpc_eager_service",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:lib",
"//tensorflow/core:lib_internal",
"//tensorflow/core/distributed_runtime:call_options",
@ -37,6 +36,7 @@ cc_library(
"//tensorflow/core/distributed_runtime/rpc:grpc_client_cq_tag",
"//tensorflow/core/distributed_runtime/rpc:grpc_state",
"//tensorflow/core/distributed_runtime/rpc:grpc_util",
"//tensorflow/core/protobuf:eager_service_proto_cc",
tf_grpc_cc_dependency(),
],
)
@ -47,7 +47,6 @@ cc_library(
hdrs = ["grpc_eager_service_impl.h"],
deps = [
":grpc_eager_service",
"//tensorflow/core:eager_service_proto_cc",
"//tensorflow/core:framework",
"//tensorflow/core:ptr_util",
"//tensorflow/core/distributed_runtime/eager:eager_service_impl",
@ -56,6 +55,7 @@ cc_library(
"//tensorflow/core/distributed_runtime/rpc:grpc_channel",
"//tensorflow/core/distributed_runtime/rpc:grpc_util",
"//tensorflow/core/distributed_runtime/rpc:grpc_worker_cache",
"//tensorflow/core/protobuf:eager_service_proto_cc",
tf_grpc_cc_dependency(),
],
)

View File

@ -5941,9 +5941,9 @@ cc_library(
deps = [
"//tensorflow/core:core_cpu",
"//tensorflow/core:lib",
"//tensorflow/core:master_proto_cc",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:replay_log_proto_cc",
"//tensorflow/core/protobuf:master_proto_cc",
],
)