diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD index d15713f7875..6f60df3323a 100644 --- a/tensorflow/c/BUILD +++ b/tensorflow/c/BUILD @@ -151,7 +151,7 @@ tf_cuda_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core/distributed_runtime:server_lib", @@ -233,7 +233,7 @@ cc_library( ":tf_tensor_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }), ) @@ -276,7 +276,7 @@ tf_cuda_library( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:attr_builder", "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib", "//tensorflow/core/platform", @@ -424,7 +424,7 @@ tf_cuda_library( ":c_api", ":c_api_experimental", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core:test", ], @@ -481,7 +481,7 @@ tf_cuda_cc_test( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:spectral_ops_op_lib", "//tensorflow/core:state_ops_op_lib", @@ -513,7 +513,7 @@ tf_cc_test( "//tensorflow/c/eager:c_api", "//tensorflow/c/eager:c_api_test_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/types:optional", @@ -530,7 +530,7 @@ tf_cc_test( ":c_test_util", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -602,7 +602,7 @@ tf_cuda_cc_test( ":kernels", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/kernels:ops_testutil", @@ -626,7 +626,7 @@ tf_cc_test( ":ops", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD index 59f3f48a43c..ab2bcf61134 100644 --- a/tensorflow/c/eager/BUILD +++ b/tensorflow/c/eager/BUILD @@ -53,7 +53,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler/lib:traceme", ], }) + select({ @@ -140,7 +140,7 @@ tf_cuda_library( "//tensorflow/c:c_test_util", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", ], ) @@ -164,7 +164,7 @@ tf_cuda_cc_test( ":c_api_test_util", "//tensorflow/c:c_test_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/strings", @@ -190,7 +190,7 @@ tf_cuda_cc_test( ":c_api_test_util", "//tensorflow/c:c_test_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib", @@ -228,7 +228,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }) + select({ "//tensorflow:with_xla_support": [ @@ -275,7 +275,7 @@ tf_cuda_cc_test( "//tensorflow/c:c_test_util", "//tensorflow/cc/profiler", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/strings", diff --git a/tensorflow/c/experimental/BUILD b/tensorflow/c/experimental/BUILD index 53cd99f18a6..15fe52c5e3b 100644 --- a/tensorflow/c/experimental/BUILD +++ b/tensorflow/c/experimental/BUILD @@ -65,7 +65,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/distributed_runtime:server_lib", "//tensorflow/core/distributed_runtime:worker_env", "//tensorflow/core/distributed_runtime/rpc:grpc_server_lib", @@ -108,7 +108,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/distributed_runtime:rendezvous_mgr_interface", diff --git a/tensorflow/c/kernels/BUILD b/tensorflow/c/kernels/BUILD index 7cac7d78235..07ff8be2a79 100644 --- a/tensorflow/c/kernels/BUILD +++ b/tensorflow/c/kernels/BUILD @@ -41,7 +41,7 @@ tf_cc_test( deps = [ ":bitcast_op", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/cc/BUILD b/tensorflow/cc/BUILD index 70dadf79dbe..d17eae27f13 100644 --- a/tensorflow/cc/BUILD +++ b/tensorflow/cc/BUILD @@ -77,7 +77,7 @@ tf_cc_test( "//tensorflow/core:all_kernels", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -99,7 +99,7 @@ tf_cc_test( "//tensorflow/core:all_kernels", "//tensorflow/core:framework", "//tensorflow/core:framework_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -174,7 +174,7 @@ cc_library_with_android_deps( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -193,7 +193,7 @@ cc_library_with_android_deps( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -233,7 +233,7 @@ cc_library_with_android_deps( deps = [ "//tensorflow/core:core_cpu", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -648,7 +648,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -665,7 +665,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/strings", @@ -728,7 +728,7 @@ tf_cc_binary( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) @@ -742,7 +742,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels:ops_util", ], ) @@ -759,7 +759,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -774,7 +774,7 @@ cc_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -790,7 +790,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/cc/profiler/BUILD b/tensorflow/cc/profiler/BUILD index 5b4a105eb28..47657849301 100644 --- a/tensorflow/cc/profiler/BUILD +++ b/tensorflow/cc/profiler/BUILD @@ -18,7 +18,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -31,8 +31,8 @@ cc_library( hdrs = ["profiler.h"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core:protos_all", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", "//tensorflow/core/profiler/internal:tfprof_stats", ], diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD index 1fdb96af024..0b51c8cd4d4 100644 --- a/tensorflow/cc/saved_model/BUILD +++ b/tensorflow/cc/saved_model/BUILD @@ -48,7 +48,7 @@ cc_library( # cannot be built on mobile platforms. Instead, include the appropriate # tf_lib depending on the build platform. "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ]) + if_mobile([ # Mobile-friendly SavedModel proto. See go/portable-proto for more info. "//tensorflow/core:saved_model_portable_proto", @@ -88,7 +88,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ]) + if_android([ "//tensorflow/core:android_tensorflow_lib", ]), @@ -102,7 +102,7 @@ cc_library( ]) + if_not_mobile([ "//tensorflow/core:core_cpu", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", # mobile not supported yet ]), ) @@ -119,7 +119,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/util/tensor_bundle:naming", # mobile not supported yet ]), @@ -139,7 +139,7 @@ tf_cc_test( ":signature_constants", ":tag_constants", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -160,7 +160,7 @@ tf_cc_test( ":signature_constants", ":tag_constants", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/cc/tools/BUILD b/tensorflow/cc/tools/BUILD index a192c4bdb18..cd9a0e05c94 100644 --- a/tensorflow/cc/tools/BUILD +++ b/tensorflow/cc/tools/BUILD @@ -21,7 +21,7 @@ cc_library( "//tensorflow/cc/saved_model:loader", "//tensorflow/core:core_cpu", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -34,7 +34,7 @@ tf_cc_test( "//tensorflow/cc:resource_variable_ops", "//tensorflow/core:core_cpu", "//tensorflow/core:framework_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/compiler/aot/BUILD b/tensorflow/compiler/aot/BUILD index e3326f6a156..e35b41bbe95 100644 --- a/tensorflow/compiler/aot/BUILD +++ b/tensorflow/compiler/aot/BUILD @@ -51,7 +51,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", @@ -70,7 +70,7 @@ tf_cc_test( "//tensorflow/compiler/xla:cpu_function_runtime", "//tensorflow/compiler/xla:shape_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/strings", @@ -101,7 +101,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", "@llvm//:aarch64_code_gen", # fixdeps: keep "@llvm//:arm_code_gen", # fixdeps: keep diff --git a/tensorflow/compiler/jit/BUILD b/tensorflow/compiler/jit/BUILD index 20da141aa20..ea7048a1486 100644 --- a/tensorflow/compiler/jit/BUILD +++ b/tensorflow/compiler/jit/BUILD @@ -173,7 +173,7 @@ XLA_DEVICE_DEPS = [ "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:resource_variable_ops_op_lib", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:state_ops_op_lib", @@ -283,7 +283,7 @@ cc_library( "//tensorflow/core:gpu_runtime", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor:device_memory_allocator", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/base:core_headers", @@ -309,7 +309,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/platform:logging", "@com_google_absl//absl/base", "@com_google_absl//absl/container:flat_hash_map", @@ -366,7 +366,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", @@ -386,7 +386,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -402,7 +402,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -422,7 +422,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", @@ -513,7 +513,7 @@ cc_library( "//tensorflow/compiler/tf2xla:tf2xla_util", "//tensorflow/core:framework", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -531,7 +531,7 @@ tf_cc_test( "//tensorflow/cc:scope", "//tensorflow/core:framework", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -605,7 +605,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_map", @@ -633,7 +633,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_map", @@ -773,7 +773,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core:test", "//tensorflow/core:testlib", @@ -825,7 +825,7 @@ cc_library( "//tensorflow/compiler/xla:test", "//tensorflow/core:framework", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", diff --git a/tensorflow/compiler/mlir/BUILD b/tensorflow/compiler/mlir/BUILD index 6220fb623de..e63154851e7 100644 --- a/tensorflow/compiler/mlir/BUILD +++ b/tensorflow/compiler/mlir/BUILD @@ -117,7 +117,7 @@ tf_cc_binary( "//tensorflow/compiler/mlir/tensorflow:translate_tf_dialect_op", "//tensorflow/compiler/mlir/xla:xla_mlir_translate", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core:tensorflow", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/strings", diff --git a/tensorflow/compiler/mlir/lite/BUILD b/tensorflow/compiler/mlir/lite/BUILD index 291387b546a..903d931986b 100644 --- a/tensorflow/compiler/mlir/lite/BUILD +++ b/tensorflow/compiler/mlir/lite/BUILD @@ -337,7 +337,7 @@ cc_library( ":validators", "//tensorflow/compiler/mlir/lite/quantization:quantization_config", "//tensorflow/compiler/mlir/lite/quantization:quantization_lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "@com_google_absl//absl/memory", "@llvm//:support", "@local_config_mlir//:Analysis", @@ -487,7 +487,7 @@ cc_library( "//tensorflow/compiler/xla:statusor", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/lite:framework", "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/delegates/flex:whitelisted_flex_ops_lib", @@ -563,7 +563,7 @@ tf_cc_binary( ":tf_to_tfl_flatbuffer", "//tensorflow/compiler/mlir:init_mlir", "//tensorflow/compiler/mlir/tensorflow:translate_cl_options", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/lite:framework", "//tensorflow/lite/schema:schema_fbs", "//tensorflow/stream_executor/lib", @@ -642,7 +642,7 @@ cc_library( "//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes", "//tensorflow/compiler/mlir/tensorflow:translate_lib", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/lite/tools/optimize:quantize_weights", "//tensorflow/stream_executor/lib", "@llvm//:support", diff --git a/tensorflow/compiler/mlir/lite/python/BUILD b/tensorflow/compiler/mlir/lite/python/BUILD index 20020458c0c..4e98bacaed9 100644 --- a/tensorflow/compiler/mlir/lite/python/BUILD +++ b/tensorflow/compiler/mlir/lite/python/BUILD @@ -23,10 +23,10 @@ cc_library( "//tensorflow/compiler/mlir/tensorflow:convert_graphdef", "//tensorflow/compiler/mlir/tensorflow:mlir_roundtrip_flags", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", - "//tensorflow/lite/toco:model_flags_proto_cc", - "//tensorflow/lite/toco:toco_flags_proto_cc", - "//tensorflow/lite/toco:types_proto_cc", + "//tensorflow/core:protos_all_proto", + "//tensorflow/lite/toco:model_flags_proto", + "//tensorflow/lite/toco:toco_flags_proto", + "//tensorflow/lite/toco:types_proto", "//tensorflow/stream_executor/lib", "@llvm//:support", "@local_config_mlir//:IR", diff --git a/tensorflow/compiler/mlir/tensorflow/BUILD b/tensorflow/compiler/mlir/tensorflow/BUILD index 69bece5aec5..ccaed30423d 100644 --- a/tensorflow/compiler/mlir/tensorflow/BUILD +++ b/tensorflow/compiler/mlir/tensorflow/BUILD @@ -241,10 +241,10 @@ cc_library( "//tensorflow/compiler/xla:xla_proto", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core/platform:logging", "//tensorflow/core/protobuf/tpu:compile_metadata_proto", - "//tensorflow/core/protobuf/tpu:dynamic_padding_proto_cc", + "//tensorflow/core/protobuf/tpu:dynamic_padding_proto", "@llvm//:support", "@local_config_mlir//:Analysis", "@local_config_mlir//:IR", @@ -311,7 +311,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core/platform:types", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/algorithm:container", @@ -340,7 +340,7 @@ cc_library( deps = [ ":error_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "@com_google_absl//absl/strings", "@llvm//:support", ], @@ -365,7 +365,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/memory", @@ -393,7 +393,7 @@ cc_library( ":tensorflow", "//tensorflow/compiler/xla:status_macros", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/strings", @@ -426,7 +426,7 @@ cc_library( "//tensorflow/compiler/xla:status_macros", "//tensorflow/core:core_cpu_lib", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "@local_config_mlir//:Analysis", "@local_config_mlir//:IR", "@local_config_mlir//:StandardOps", @@ -460,7 +460,7 @@ cc_library( "//tensorflow/compiler/xla:status_macros", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/container:inlined_vector", @@ -478,7 +478,7 @@ cc_library( ":tensorflow_dialect_registration", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/strings", "@llvm//:support", @@ -497,7 +497,7 @@ cc_library( ":tensorflow", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/strings", @@ -528,7 +528,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "@com_google_absl//absl/strings", ], ) @@ -596,7 +596,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@llvm//:support", "@local_config_mlir//:IR", @@ -622,7 +622,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/memory", @@ -649,7 +649,7 @@ cc_library( ":mlir_roundtrip_flags", "//tensorflow/core:lib_proto_parsing", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core/grappler/utils:transitive_fanin", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", @@ -685,7 +685,7 @@ cc_library( ":mlir_roundtrip_flags", ":translate_cl_options", ":translate_lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/stream_executor/lib", "@llvm//:support", "@local_config_mlir//:IR", @@ -906,7 +906,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core:test", "//tensorflow/core:test_main", "@llvm//:support", diff --git a/tensorflow/compiler/mlir/xla/BUILD b/tensorflow/compiler/mlir/xla/BUILD index d20d4f72b40..d21cdfb2222 100644 --- a/tensorflow/compiler/mlir/xla/BUILD +++ b/tensorflow/compiler/mlir/xla/BUILD @@ -354,7 +354,7 @@ tf_cc_test( "//tensorflow/compiler/xla:test", "//tensorflow/compiler/xla:xla_data_proto", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_proto_cc", + "//tensorflow/core:protos_all_proto", "//tensorflow/core:test_main", "@local_config_mlir//:IR", ], diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD index dc0ba0ccde7..c90c913af3d 100644 --- a/tensorflow/compiler/tests/BUILD +++ b/tensorflow/compiler/tests/BUILD @@ -1250,7 +1250,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow_opensource", "//tensorflow/core:test", "//tensorflow/core:testlib", diff --git a/tensorflow/compiler/tf2tensorrt/BUILD b/tensorflow/compiler/tf2tensorrt/BUILD index 48d7535522b..47461fe724c 100644 --- a/tensorflow/compiler/tf2tensorrt/BUILD +++ b/tensorflow/compiler/tf2tensorrt/BUILD @@ -145,7 +145,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -179,7 +179,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -349,7 +349,7 @@ tf_cuda_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:devices", "//tensorflow/core/grappler/clusters:virtual_cluster", "//tensorflow/core/grappler/costs:graph_properties", @@ -384,7 +384,7 @@ tf_cuda_cc_test( "//tensorflow/core:direct_session", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -416,7 +416,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_base", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -439,7 +439,7 @@ cc_library( deps = [ "//tensorflow/core:graph", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", "@com_google_protobuf//:protobuf_headers", ], @@ -461,7 +461,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/compiler/tf2xla/BUILD b/tensorflow/compiler/tf2xla/BUILD index b3b06b2f68a..8a04fa8f942 100644 --- a/tensorflow/compiler/tf2xla/BUILD +++ b/tensorflow/compiler/tf2xla/BUILD @@ -46,7 +46,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -63,7 +63,7 @@ xla_proto_library( srcs = ["tf2xla.proto"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -75,7 +75,7 @@ tf_portable_proto_library( portable_deps = ["//tensorflow/core:android_proto_lib"], proto_deps = [ ":tf2xla_proto", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], visibility = ["//visibility:public"], ) @@ -93,7 +93,7 @@ xla_proto_library( srcs = ["host_compute_metadata.proto"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -117,7 +117,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", ], @@ -142,7 +142,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -193,7 +193,7 @@ cc_library( "//tensorflow/compiler/xla/service/cpu:buffer_info_util", "//tensorflow/compiler/xla/service/cpu:cpu_executable", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor:platform", ], ) @@ -262,7 +262,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:stream_executor_no_cuda", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/memory", @@ -295,7 +295,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/types:span", ], @@ -311,7 +311,7 @@ cc_library( "//tensorflow/compiler/xla:xla_data_proto", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/types:optional", ], ) @@ -329,7 +329,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -340,7 +340,7 @@ tf_cc_test( deps = [ ":sharding_util", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -365,7 +365,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", ], @@ -386,7 +386,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/strings", @@ -408,7 +408,7 @@ tf_cc_test( "//tensorflow/compiler/xla/service:cpu_plugin", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -430,7 +430,7 @@ tf_cc_test( "//tensorflow/compiler/xla/service:platform_util", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/stream_executor:multi_platform_manager", @@ -468,7 +468,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -526,7 +526,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -550,7 +550,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:optional", @@ -714,7 +714,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:resource_variable_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -736,7 +736,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -800,7 +800,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -822,7 +822,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor/lib", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -840,7 +840,7 @@ tf_cuda_cc_test( "//tensorflow/cc:scope", "//tensorflow/core:framework", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/compiler/tf2xla/cc/BUILD b/tensorflow/compiler/tf2xla/cc/BUILD index 973aafe1ad8..ca0c3168ec1 100644 --- a/tensorflow/compiler/tf2xla/cc/BUILD +++ b/tensorflow/compiler/tf2xla/cc/BUILD @@ -23,7 +23,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -46,6 +46,6 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/compiler/tf2xla/kernels/BUILD b/tensorflow/compiler/tf2xla/kernels/BUILD index 2939a35df9c..daefb57c5dc 100644 --- a/tensorflow/compiler/tf2xla/kernels/BUILD +++ b/tensorflow/compiler/tf2xla/kernels/BUILD @@ -186,7 +186,7 @@ tf_kernel_library( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:random_ops_op_lib", "//tensorflow/core:resource_variable_ops_op_lib", "//tensorflow/core:sendrecv_ops_op_lib", @@ -237,7 +237,7 @@ cc_library( "//tensorflow/compiler/xla/client/lib:constants", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -303,7 +303,7 @@ tf_kernel_library( "//tensorflow/compiler/xla/client:xla_builder", "//tensorflow/compiler/xla/client:xla_computation", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -322,7 +322,7 @@ tf_kernel_library( "//tensorflow/compiler/xla/client:xla_builder", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -340,7 +340,7 @@ tf_kernel_library( "//tensorflow/compiler/xla/client:xla_builder", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/compiler/tf2xla/lib/BUILD b/tensorflow/compiler/tf2xla/lib/BUILD index f0bd97c85eb..db670691878 100644 --- a/tensorflow/compiler/tf2xla/lib/BUILD +++ b/tensorflow/compiler/tf2xla/lib/BUILD @@ -43,7 +43,7 @@ cc_library( "//tensorflow/compiler/xla/client:xla_builder", "//tensorflow/compiler/xla/client/lib:constants", "//tensorflow/compiler/xla/client/lib:math", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/compiler/xla/service/cpu/BUILD b/tensorflow/compiler/xla/service/cpu/BUILD index 1f30ba29da6..29f270bf518 100644 --- a/tensorflow/compiler/xla/service/cpu/BUILD +++ b/tensorflow/compiler/xla/service/cpu/BUILD @@ -971,7 +971,7 @@ tf_cc_test( "//tensorflow/compiler/xla:test", "//tensorflow/compiler/xla/tests:hlo_test_base", "//tensorflow/compiler/xla/tests:xla_internal_test_main", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", ], ) diff --git a/tensorflow/compiler/xla/service/gpu/BUILD b/tensorflow/compiler/xla/service/gpu/BUILD index edb57abe69e..c3e14d8723b 100755 --- a/tensorflow/compiler/xla/service/gpu/BUILD +++ b/tensorflow/compiler/xla/service/gpu/BUILD @@ -1452,7 +1452,7 @@ tf_cc_test( "//tensorflow/compiler/xla:test", "//tensorflow/compiler/xla/tests:hlo_test_base", "//tensorflow/compiler/xla/tests:xla_internal_test_main", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", ], ) @@ -1603,7 +1603,7 @@ xla_proto_library( deps = [ "//tensorflow/compiler/xla:xla_data_proto", "//tensorflow/compiler/xla/service:hlo_proto", - "//tensorflow/core:autotuning_proto_cc", + "//tensorflow/core:autotuning_proto", ], ) diff --git a/tensorflow/compiler/xla/tools/BUILD b/tensorflow/compiler/xla/tools/BUILD index 01ddc141d13..dd2ba6b5f72 100644 --- a/tensorflow/compiler/xla/tools/BUILD +++ b/tensorflow/compiler/xla/tools/BUILD @@ -233,7 +233,7 @@ tf_cc_binary( "//tensorflow/compiler/xla/service:platform_util", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/strings", ], diff --git a/tensorflow/compiler/xrt/kernels/BUILD b/tensorflow/compiler/xrt/kernels/BUILD index fc15bb43c52..6e9945a7213 100644 --- a/tensorflow/compiler/xrt/kernels/BUILD +++ b/tensorflow/compiler/xrt/kernels/BUILD @@ -33,7 +33,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -68,7 +68,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor:stream_executor_headers", "@com_google_absl//absl/strings", ], diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD index 16dd6c92e53..841861f397f 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD @@ -4,7 +4,7 @@ # # Public targets: # -# ":protos_all_cc" - exports all core TensorFlow protos +# ":protos_all" - exports all core TensorFlow protos # ":protos_all_py" - py_proto_library version (Google-internal) # ":lib" - exports the public non-test headers for: # //third_party/tensorflow/core/platform:: Platform-specific code and external dependencies @@ -258,7 +258,7 @@ tf_generate_proto_text_sources( tf_jspb_proto_library( name = "protos_all_jspb_proto", visibility = ["//visibility:public"], - deps = [":protos_all_cc"], + deps = [":protos_all"], ) proto_library( @@ -573,7 +573,7 @@ cc_library( deps = [ ":core_stringpiece", ":lib_proto_parsing", - ":protos_all_cc", + ":protos_all", ], alwayslink = 1, ) @@ -615,7 +615,7 @@ cc_library( ":functional_ops_op_lib", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", "//tensorflow/core/platform/default/build_config:gtest", "//tensorflow/core/kernels:required", "@com_google_googletest//:gtest", @@ -839,7 +839,7 @@ cc_library( deps = [ ":framework", ":lib", - ":protos_all_cc", + ":protos_all", ], ) @@ -851,7 +851,7 @@ cc_library( deps = [ ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", "//tensorflow/core/util/proto:proto_utils", "@com_google_absl//absl/strings", ], @@ -863,7 +863,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":lib", - ":protos_all_cc", + ":protos_all", ], ) @@ -959,7 +959,7 @@ tf_gen_op_libs( ], deps = [ ":lib", - ":protos_all_cc", + ":protos_all", ], ) @@ -980,7 +980,7 @@ tf_gen_op_libs( ], deps = [ ":lib", - ":protos_all_cc", + ":protos_all", ], ) @@ -988,7 +988,7 @@ tf_gen_op_libs( op_lib_names = [ "mkl_array_ops", ], - deps = [":protos_all_cc"], + deps = [":protos_all"], ) tf_gen_op_libs( @@ -1027,8 +1027,8 @@ tf_gen_op_libs( deps = [ ":lib", ":lib_proto_parsing", - ":protos_all_cc", - "//tensorflow/core/protobuf/tpu:tpu_embedding_configuration_proto_cc", + ":protos_all", + "//tensorflow/core/protobuf/tpu:tpu_embedding_configuration_proto", "//tensorflow/core/tpu:tpu_embedding_optimization_parameters_utils", "//tensorflow/core/tpu:tpu_embedding_output_layout_utils", ], @@ -1108,7 +1108,7 @@ cc_library( ], deps = [ "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -1122,7 +1122,7 @@ tf_cc_test( ":test", ":testlib", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_googletest//:gtest_main", ], ) @@ -1248,7 +1248,7 @@ cc_library( ":framework", ":lib", ":math_ops_op_lib", - ":protos_all_cc", + ":protos_all", ], alwayslink = 1, ) @@ -1482,7 +1482,7 @@ cc_library( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":shape_inference_testutil", ":tensor_testutil", ":test", @@ -1925,7 +1925,7 @@ cc_library( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":stream_executor", ], ) @@ -1959,49 +1959,49 @@ cc_library( tf_pyclif_proto_library( name = "example/example_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "example/example.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "example/feature_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "example/feature.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "protobuf/config_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "protobuf/config.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "protobuf/device_properties_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "protobuf/device_properties.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "protobuf/graph_debug_info_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "protobuf/graph_debug_info.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "protobuf/meta_graph_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "protobuf/meta_graph.proto", visibility = ["//visibility:public"], ) tf_pyclif_proto_library( name = "protobuf/saved_model_pyclif", - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "protobuf/saved_model.proto", visibility = ["//visibility:public"], ) @@ -2023,7 +2023,7 @@ tf_pyclif_proto_library( ] + [ tf_pyclif_proto_library( name = "framework/%s_pyclif" % proto_name, - proto_lib = ":protos_all_cc", + proto_lib = ":protos_all", proto_srcfile = "framework/%s.proto" % proto_name, visibility = ["//visibility:public"], ), @@ -2744,7 +2744,7 @@ tf_cuda_library( ":feature_util", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":stats_calculator_portable", ":version_lib", ":util_port", @@ -2829,7 +2829,7 @@ tf_cuda_library( deps = [":framework_lite"], ) -# TODO(josh11b): Is this needed, or can we just use ":protos_all_cc"? +# TODO(josh11b): Is this needed, or can we just use ":protos_all"? cc_library( name = "protos_cc", visibility = ["//visibility:public"], @@ -2886,7 +2886,7 @@ tf_cuda_library( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", "//third_party/eigen3", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -2945,7 +2945,7 @@ tf_cuda_library( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", "@com_google_absl//absl/container:flat_hash_set", "//third_party/eigen3", ] + if_static([ @@ -3092,7 +3092,7 @@ tf_cuda_library( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", @@ -3136,7 +3136,7 @@ tf_cuda_library( ":framework", ":graph", ":lib", - ":protos_all_cc", + ":protos_all", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", "//tensorflow/core/grappler:grappler_item", @@ -3170,7 +3170,7 @@ cc_library( ":allocator", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":shared_counter", "@com_google_absl//absl/container:flat_hash_set", ], @@ -3216,7 +3216,7 @@ tf_cuda_library( ":lib", ":lib_experimental", ":lib_internal", - ":protos_all_cc", + ":protos_all", "//tensorflow/core/debug:debug_graph_utils", "//tensorflow/core/kernels:function_ops", "//tensorflow/core/profiler/lib:profiler_lib", @@ -3240,7 +3240,7 @@ cc_library( ":framework", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ], alwayslink = 1, ) @@ -3330,7 +3330,7 @@ tf_cuda_library( ":graph", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":stream_executor", "//third_party/eigen3", ], @@ -3347,7 +3347,7 @@ tf_cuda_library( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":stream_executor", "//third_party/eigen3", ] + if_static([":gpu_runtime_impl"]), @@ -3368,7 +3368,7 @@ tf_cuda_library( ":gpu_mem_allocator", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ], ) @@ -3496,7 +3496,7 @@ cc_library( ":framework", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ], ) @@ -3560,7 +3560,7 @@ tf_cc_tests( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "//tensorflow/core/platform:scanner", @@ -3584,7 +3584,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", "//third_party/eigen3", "@com_google_absl//absl/strings", @@ -3599,7 +3599,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "//third_party/eigen3", @@ -3625,7 +3625,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "//third_party/eigen3", @@ -3664,7 +3664,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "//third_party/eigen3", @@ -3686,7 +3686,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "//third_party/eigen3", @@ -3720,7 +3720,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ], @@ -3783,7 +3783,7 @@ tf_cc_test( ":lib", ":lib_internal", ":lib_test_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", "@com_google_absl//absl/memory", @@ -3808,7 +3808,7 @@ tf_cc_test( srcs = ["framework/op_gen_lib_test.cc"], deps = [ ":op_gen_lib", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ], @@ -3828,7 +3828,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -3942,7 +3942,7 @@ tf_cc_tests( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -3985,7 +3985,7 @@ tf_cc_tests( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -4030,7 +4030,7 @@ tf_cc_tests( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", "@com_google_googletest//:gtest_main", ], @@ -4056,7 +4056,7 @@ tf_cc_tests_gpu( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -4085,7 +4085,7 @@ tf_cc_tests_gpu( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -4114,7 +4114,7 @@ tf_cc_tests_gpu( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":protos_test_cc", ":test", ":test_main", @@ -4163,7 +4163,7 @@ tf_cc_test_mkl( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4231,7 +4231,7 @@ tf_cc_tests_gpu( ":gpu_runtime", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4250,7 +4250,7 @@ tf_cc_test_gpu( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4280,7 +4280,7 @@ tf_cuda_cc_test( ":gpu_id", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4331,7 +4331,7 @@ tf_cc_test_gpu( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4357,7 +4357,7 @@ tf_cc_test_gpu( ":gpu_runtime", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4387,7 +4387,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4422,7 +4422,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4448,7 +4448,7 @@ tf_cuda_cc_test( ":framework", ":framework_internal", ":lib", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4551,7 +4551,7 @@ tf_cuda_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4593,7 +4593,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4636,7 +4636,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4669,7 +4669,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4694,7 +4694,7 @@ tf_cc_test( ":framework_internal", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4725,7 +4725,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4762,7 +4762,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4810,7 +4810,7 @@ tf_cc_test_gpu( ":gpu_runtime", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4835,7 +4835,7 @@ tf_cc_test_gpu( ":gpu_runtime", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4859,7 +4859,7 @@ tf_cc_test_gpu( ":gpu_runtime", ":lib", ":lib_internal", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4885,7 +4885,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4911,7 +4911,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4940,7 +4940,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -4967,7 +4967,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -5012,7 +5012,7 @@ tf_cc_tests( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -5036,7 +5036,7 @@ tf_cc_test( ":lib", ":lib_internal", ":ops", - ":protos_all_cc", + ":protos_all", ":test", ":test_main", ":testlib", @@ -5269,7 +5269,7 @@ transitive_hdrs( ":core_cpu", ":framework", ":lib", - ":protos_all_cc", + ":protos_all", ":stream_executor", "//tensorflow/core/platform:platform_strings", ], @@ -5293,7 +5293,7 @@ tf_portable_proto_library( link_full_protobuf = False, prefix_dir = "emscripten_proto_no_rtti", proto_deps = [ - ":protos_all_cc", + ":protos_all", "@com_google_protobuf//:protobuf", ], visibility = ["//visibility:public"], diff --git a/tensorflow/core/api_def/BUILD b/tensorflow/core/api_def/BUILD index f96645ad9f8..626191d3c7c 100644 --- a/tensorflow/core/api_def/BUILD +++ b/tensorflow/core/api_def/BUILD @@ -62,7 +62,7 @@ cc_library( "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -72,7 +72,7 @@ tf_cc_test( deps = [ ":update_api_def_lib", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -110,7 +110,7 @@ tf_cc_test( "//tensorflow/core:lib_test_internal", "//tensorflow/core:op_gen_lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], diff --git a/tensorflow/core/common_runtime/eager/BUILD b/tensorflow/core/common_runtime/eager/BUILD index 29587887f6f..a1c9194debe 100644 --- a/tensorflow/core/common_runtime/eager/BUILD +++ b/tensorflow/core/common_runtime/eager/BUILD @@ -37,7 +37,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }), ) @@ -68,7 +68,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core/distributed_runtime:collective_param_resolver_distributed", "//tensorflow/core/distributed_runtime:device_resolver_distributed", @@ -149,7 +149,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core/distributed_runtime/eager:eager_client", "//tensorflow/core/distributed_runtime/eager:remote_tensor_handle_data", @@ -190,7 +190,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", ], }), @@ -205,7 +205,7 @@ cc_library( ":tensor_handle", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -215,7 +215,7 @@ KERNEL_AND_DEVICE_DEPS = [ "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler/lib:traceme", "//tensorflow/core/grappler/optimizers:meta_optimizer", ] @@ -266,7 +266,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }), ) @@ -291,7 +291,7 @@ tf_cc_test( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -337,7 +337,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/distributed_runtime/eager:eager_client", "//tensorflow/core/distributed_runtime/eager:remote_execute_node", "//tensorflow/core/distributed_runtime/eager:remote_copy_node", @@ -412,7 +412,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }), ) diff --git a/tensorflow/core/debug/BUILD b/tensorflow/core/debug/BUILD index ccdf478fabf..35520b0e4ab 100644 --- a/tensorflow/core/debug/BUILD +++ b/tensorflow/core/debug/BUILD @@ -105,7 +105,7 @@ tf_cuda_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -127,7 +127,7 @@ tf_cuda_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], alwayslink = 1, @@ -148,7 +148,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -186,7 +186,7 @@ tf_cc_test( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -230,7 +230,7 @@ tf_cc_test( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -259,7 +259,7 @@ tf_cc_test( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -274,7 +274,7 @@ cc_library( ":debug_node_key", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -284,7 +284,7 @@ tf_cc_binary( deps = [ "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/platform:regexp", ], ) diff --git a/tensorflow/core/distributed_runtime/BUILD b/tensorflow/core/distributed_runtime/BUILD index 45efd4a473d..ebfd9750553 100644 --- a/tensorflow/core/distributed_runtime/BUILD +++ b/tensorflow/core/distributed_runtime/BUILD @@ -61,7 +61,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", ], ) @@ -72,7 +72,7 @@ tf_cc_test( srcs = ["message_wrappers_test.cc"], deps = [ ":message_wrappers", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -97,7 +97,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", ], ) @@ -132,7 +132,7 @@ cc_library( ":worker_session", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:ptr_util", "//tensorflow/core:worker_proto_cc", ], @@ -146,7 +146,7 @@ tf_cc_test( ":session_mgr", ":worker_env", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -170,7 +170,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", ], ) @@ -252,7 +252,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_base", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -266,7 +266,7 @@ cc_library( deps = [ ":worker_interface", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/distributed_runtime/eager:eager_client", ], ) @@ -321,7 +321,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", ], ) @@ -345,7 +345,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/debug:debug_graph_utils", ], ) @@ -408,7 +408,7 @@ cc_library( hdrs = ["master_env.h"], deps = [ ":worker_cache", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", ], ) @@ -426,7 +426,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", "//tensorflow/core/debug", "//tensorflow/core/profiler/lib:traceme", @@ -454,7 +454,7 @@ cc_library( deps = [ "//tensorflow/core:core_cpu_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -465,7 +465,7 @@ cc_library( deps = [ "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -505,7 +505,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -524,7 +524,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib_internal", # protobuf::Any - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", ], ) @@ -541,7 +541,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -558,7 +558,7 @@ cc_library( ":device_resolver_distributed", ":worker_cache", "//tensorflow/core:core_cpu_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -587,7 +587,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -604,7 +604,7 @@ cc_library( ":worker_cache", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", ], ) @@ -619,7 +619,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -653,7 +653,7 @@ tf_cuda_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:state_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -693,7 +693,7 @@ tf_cuda_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -720,7 +720,7 @@ tf_cuda_cc_test( "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/core/distributed_runtime/eager/BUILD b/tensorflow/core/distributed_runtime/eager/BUILD index bbcc10b029a..00b401571f9 100644 --- a/tensorflow/core/distributed_runtime/eager/BUILD +++ b/tensorflow/core/distributed_runtime/eager/BUILD @@ -17,7 +17,7 @@ cc_library( hdrs = ["remote_tensor_handle.h"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -37,7 +37,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:context", "//tensorflow/core/common_runtime/eager:eager_operation", "//tensorflow/core/common_runtime/eager:tensor_handle", @@ -53,7 +53,7 @@ cc_library( ":eager_client", "//tensorflow/core:eager_service_proto_cc", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:context", "//tensorflow/core/common_runtime/eager:eager_executor", ], @@ -78,7 +78,7 @@ cc_library( "//tensorflow/core:eager_service_proto_cc", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:eager_executor", "//tensorflow/core/common_runtime/eager:shape_inference", "//tensorflow/core/common_runtime/eager:tensor_handle", @@ -105,7 +105,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:context", "//tensorflow/core/common_runtime/eager:eager_operation", "//tensorflow/core/common_runtime/eager:execute", @@ -136,7 +136,7 @@ tf_cc_test( "//tensorflow/core:eager_service_proto_cc", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -175,7 +175,7 @@ tf_cc_test( srcs = ["remote_mgr_test.cc"], deps = [ ":remote_mgr", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/common_runtime/eager:tensor_handle", diff --git a/tensorflow/core/distributed_runtime/rpc/BUILD b/tensorflow/core/distributed_runtime/rpc/BUILD index e11d55ee05f..a5a64884233 100644 --- a/tensorflow/core/distributed_runtime/rpc/BUILD +++ b/tensorflow/core/distributed_runtime/rpc/BUILD @@ -89,7 +89,7 @@ cc_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", "//tensorflow/core/distributed_runtime:tensor_coding", "//tensorflow/core/distributed_runtime:worker_cache_logger", @@ -107,7 +107,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], ) @@ -122,7 +122,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", "@com_google_absl//absl/flags:flag", ], @@ -191,7 +191,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:worker_proto_cc", "//tensorflow/core/distributed_runtime:graph_mgr", "//tensorflow/core/distributed_runtime:rendezvous_mgr_interface", @@ -342,7 +342,7 @@ tf_cc_binary( "//tensorflow/core:lookup_ops_op_lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core/distributed_runtime:server_lib", "//tensorflow/core/kernels:data_flow", @@ -365,7 +365,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:state_ops_op_lib", "//tensorflow/core:testlib", "//tensorflow/core/distributed_runtime:server_lib", @@ -400,7 +400,7 @@ tf_cuda_library( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -419,7 +419,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/distributed_runtime:call_options", "//tensorflow/core/distributed_runtime:local_master", "//tensorflow/core/distributed_runtime:master_interface", @@ -453,7 +453,7 @@ tf_cuda_cc_tests( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -473,7 +473,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -513,7 +513,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:state_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/core/grappler/BUILD b/tensorflow/core/grappler/BUILD index 3f79c023caf..4783aba8cb6 100644 --- a/tensorflow/core/grappler/BUILD +++ b/tensorflow/core/grappler/BUILD @@ -13,7 +13,7 @@ cc_library( ":utils", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -27,7 +27,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", ], @@ -42,7 +42,7 @@ tf_cc_test( "//tensorflow/cc:cc_ops", "//tensorflow/core:all_kernels", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -74,7 +74,7 @@ cc_library( deps = [ ":graph_view", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:inlined_vector", "@com_google_absl//absl/strings", @@ -89,7 +89,7 @@ tf_cc_test( deps = [ ":graph_topology_view", ":graph_view", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -105,7 +105,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/hash", @@ -141,7 +141,7 @@ cc_library( ":op_types", ":utils", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/utils:transitive_fanin", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/strings", @@ -165,7 +165,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/inputs:utils", "//tensorflow/core/grappler/optimizers:model_pruner", ], @@ -176,7 +176,7 @@ tf_cc_test( srcs = ["grappler_item_test.cc"], deps = [ ":grappler_item", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -195,7 +195,7 @@ tf_cc_test( "//tensorflow/cc:gradients", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -218,7 +218,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/strings", @@ -235,7 +235,7 @@ tf_cc_test( ":utils", "//tensorflow/cc:cc_ops", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/core/grappler/clusters/BUILD b/tensorflow/core/grappler/clusters/BUILD index 20bed36d1b8..913876db44b 100644 --- a/tensorflow/core/grappler/clusters/BUILD +++ b/tensorflow/core/grappler/clusters/BUILD @@ -31,7 +31,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:gpu_id", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] + select({ ":xsmm": ["@libxsmm_archive//:xsmm_avx"], "//conditions:default": [], @@ -47,7 +47,7 @@ tf_cc_test( ":utils", "//tensorflow/core:gpu_id", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -64,7 +64,7 @@ cc_library( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core/grappler:grappler_item", ], @@ -82,7 +82,7 @@ cc_library( ":utils", "//tensorflow/core:core_cpu_base", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/costs:analytical_cost_estimator", "//tensorflow/core/grappler/costs:op_level_cost_estimator", "//tensorflow/core/grappler/costs:virtual_scheduler", @@ -96,7 +96,7 @@ tf_cc_test( ":virtual_cluster", "//tensorflow/cc:cc_ops", "//tensorflow/cc:scope", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler:grappler_item", @@ -142,7 +142,7 @@ tf_cc_test( "//tensorflow/cc:scope", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler:grappler_item", diff --git a/tensorflow/core/grappler/costs/BUILD b/tensorflow/core/grappler/costs/BUILD index af79d098fb8..37c4e930e44 100644 --- a/tensorflow/core/grappler/costs/BUILD +++ b/tensorflow/core/grappler/costs/BUILD @@ -51,7 +51,7 @@ cc_library( "//tensorflow/core:core_cpu_base", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/clusters:cluster", @@ -71,7 +71,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -91,7 +91,7 @@ cc_library( ":cost_estimator", ":graph_properties", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/clusters:cluster", @@ -142,7 +142,7 @@ tf_cuda_library( "//tensorflow/core:gpu_id", "//tensorflow/core:lib", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/clusters:utils", ] + tf_protos_grappler(), @@ -158,7 +158,7 @@ tf_cc_test( "//tensorflow/core:all_kernels", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -173,7 +173,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -195,7 +195,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:devices", "//tensorflow/core/grappler/clusters:cluster", ], @@ -208,7 +208,7 @@ tf_cc_test( ":virtual_placer", "//tensorflow/core:core_cpu", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler/clusters:virtual_cluster", @@ -220,7 +220,7 @@ cc_library( hdrs = ["op_context.h"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] + tf_protos_grappler(), ) @@ -236,7 +236,7 @@ cc_library( ":virtual_placer", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -253,7 +253,7 @@ tf_cc_test( ":virtual_placer", ":virtual_scheduler", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -273,7 +273,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/clusters:cluster", "//tensorflow/core/grappler/costs:cost_estimator", @@ -291,7 +291,7 @@ cc_library( ":op_context", "//third_party/eigen3", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/clusters:utils", ] + tf_protos_grappler(), ) @@ -302,7 +302,7 @@ tf_cc_test( deps = [ ":op_level_cost_estimator", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -323,7 +323,7 @@ cc_library( "//tensorflow/core:core_cpu_base", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -337,7 +337,7 @@ tf_cc_test( ":analytical_cost_estimator", ":virtual_scheduler", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/core/grappler/graph_analyzer/BUILD b/tensorflow/core/grappler/graph_analyzer/BUILD index 1377424a6fb..2ffa2c9e12b 100644 --- a/tensorflow/core/grappler/graph_analyzer/BUILD +++ b/tensorflow/core/grappler/graph_analyzer/BUILD @@ -24,7 +24,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -42,7 +42,7 @@ cc_library( deps = [ ":graph_analyzer_lib", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core/grappler:grappler_item", "@com_google_absl//absl/strings", diff --git a/tensorflow/core/grappler/inputs/BUILD b/tensorflow/core/grappler/inputs/BUILD index 250665995e6..2734e80828c 100644 --- a/tensorflow/core/grappler/inputs/BUILD +++ b/tensorflow/core/grappler/inputs/BUILD @@ -15,7 +15,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -54,7 +54,7 @@ cc_library( "//tensorflow/core:functional_ops_op_lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:no_op_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:sendrecv_ops_op_lib", "//tensorflow/core:tensorflow", "//tensorflow/core/grappler:grappler_item", @@ -72,7 +72,7 @@ cc_library( deps = [ ":input_yielder", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:grappler_item_builder", "//tensorflow/core/grappler:utils", diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD index ace1308d53d..9cba007f660 100644 --- a/tensorflow/core/grappler/optimizers/BUILD +++ b/tensorflow/core/grappler/optimizers/BUILD @@ -20,7 +20,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -38,7 +38,7 @@ tf_cuda_cc_test( deps = [ ":static_schedule", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler:grappler_item", @@ -58,7 +58,7 @@ cc_library( deps = [ ":graph_optimizer", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:devices", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", @@ -73,7 +73,7 @@ tf_cuda_cc_test( deps = [ ":auto_parallel", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -95,7 +95,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -127,7 +127,7 @@ tf_cc_test( "//tensorflow/core:direct_session", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -150,7 +150,7 @@ cc_library( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler:grappler_item", @@ -180,7 +180,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:direct_session", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -200,7 +200,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -212,7 +212,7 @@ cc_library( deps = [ "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/costs:graph_properties", @@ -227,7 +227,7 @@ tf_cuda_cc_test( deps = [ ":graph_optimizer_stage", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -247,7 +247,7 @@ cc_library( deps = [ ":graph_optimizer", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -265,7 +265,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", @@ -310,7 +310,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -334,7 +334,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -353,7 +353,7 @@ tf_cuda_cc_test( ":dependency_optimizer", ":model_pruner", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -375,7 +375,7 @@ cc_library( deps = [ ":graph_optimizer", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:mutable_graph_view", "//tensorflow/core/grappler:op_types", @@ -392,7 +392,7 @@ tf_cuda_cc_test( deps = [ ":model_pruner", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -445,7 +445,7 @@ cc_library( ":static_schedule", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:mutable_graph_view", @@ -473,7 +473,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -495,7 +495,7 @@ cc_library( ":graph_optimizer", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:devices", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", @@ -519,7 +519,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -547,7 +547,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:devices", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:mutable_graph_view", @@ -610,7 +610,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/clusters:virtual_cluster", "//tensorflow/core/grappler/utils:canonicalizer", @@ -637,7 +637,7 @@ tf_cuda_cc_test( "//tensorflow/cc:cc_ops", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -706,7 +706,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:mutable_graph_view", @@ -726,7 +726,7 @@ tf_cuda_cc_test( deps = [ ":loop_optimizer", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -749,7 +749,7 @@ cc_library( ":graph_optimizer", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:mutable_graph_view", "//tensorflow/core/grappler:op_types", @@ -768,7 +768,7 @@ tf_cuda_cc_test( ":shape_optimizer", "//tensorflow/cc:cc_ops", "//tensorflow/core:core_cpu", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -789,7 +789,7 @@ tf_kernel_library( ":graph_optimizer", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", @@ -809,7 +809,7 @@ tf_cuda_cc_test( ":remapper", "//tensorflow/cc:cc_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -832,7 +832,7 @@ tf_cc_test_mkl( ":remapper", "//tensorflow/cc:cc_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -854,7 +854,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -892,7 +892,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -914,7 +914,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:direct_session", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -935,7 +935,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -947,7 +947,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -963,7 +963,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", ], ) @@ -974,7 +974,7 @@ tf_cc_test( srcs = ["function_api_info_test.cc"], deps = [ ":function_api_info", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -1011,7 +1011,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1032,7 +1032,7 @@ cc_library( ":graph_optimizer", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", @@ -1051,7 +1051,7 @@ tf_cuda_cc_test( deps = [ ":pin_to_host_optimizer", "//tensorflow/cc:cc_ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1071,7 +1071,7 @@ cc_library( ":graph_optimizer", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler/clusters:cluster", @@ -1113,7 +1113,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/costs:graph_properties", @@ -1135,7 +1135,7 @@ tf_cuda_cc_test( ":generic_layout_optimizer_transposer", "//tensorflow/cc:cc_ops", "//tensorflow/cc:cc_ops_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:tensorflow", "//tensorflow/core:test", @@ -1172,7 +1172,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/container:flat_hash_set", diff --git a/tensorflow/core/grappler/utils/BUILD b/tensorflow/core/grappler/utils/BUILD index fe07e769ef2..16156e6234b 100644 --- a/tensorflow/core/grappler/utils/BUILD +++ b/tensorflow/core/grappler/utils/BUILD @@ -16,7 +16,7 @@ cc_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", "//tensorflow/core/grappler/inputs:utils", @@ -32,7 +32,7 @@ tf_cc_test( deps = [ ":scc", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler:grappler_item", @@ -49,7 +49,7 @@ cc_library( deps = [ "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler:op_types", @@ -64,7 +64,7 @@ tf_cc_test( deps = [ ":topological_sort", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -81,7 +81,7 @@ cc_library( ":graph_view", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:op_types", "@com_google_absl//absl/container:flat_hash_map", ], @@ -96,7 +96,7 @@ tf_cc_test( ":graph_view", "//tensorflow/core:lib", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -109,7 +109,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "@com_google_absl//absl/container:flat_hash_map", ], @@ -121,7 +121,7 @@ tf_cc_test( deps = [ ":traversal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -145,7 +145,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:utils", @@ -183,7 +183,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", @@ -205,7 +205,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -219,7 +219,7 @@ cc_library( hdrs = ["colocation.h"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:utils", ], ) @@ -231,7 +231,7 @@ tf_cc_test( deps = [ ":colocation", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -246,7 +246,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] + tf_protos_grappler(), ) @@ -257,7 +257,7 @@ tf_cc_test( ":symbolic_shapes", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -269,7 +269,7 @@ cc_library( hdrs = ["tpu.h"], visibility = ["//visibility:public"], deps = [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] + tf_protos_grappler(), ) @@ -278,7 +278,7 @@ tf_cc_test( srcs = ["tpu_test.cc"], deps = [ ":tpu", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -292,7 +292,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", ], @@ -319,7 +319,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/hash", @@ -353,7 +353,7 @@ cc_library( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:op_types", "//tensorflow/core/grappler:utils", "@com_google_absl//absl/container:flat_hash_map", @@ -371,7 +371,7 @@ tf_cc_test( ":grappler_test", "//tensorflow/cc:cc_ops", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -388,7 +388,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:utils", ], ) @@ -400,7 +400,7 @@ tf_cc_test( ":transitive_fanin", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/core/grappler/verifiers/BUILD b/tensorflow/core/grappler/verifiers/BUILD index 068dd6a9be4..4caa2ee871c 100644 --- a/tensorflow/core/grappler/verifiers/BUILD +++ b/tensorflow/core/grappler/verifiers/BUILD @@ -13,7 +13,7 @@ cc_library( deps = [ "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -29,7 +29,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/utils:topological_sort", ], ) @@ -42,7 +42,7 @@ tf_cc_test( "//tensorflow/cc:cc_ops", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/grappler:grappler_item", diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index 48e9796954e..ac685f969a7 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -196,7 +196,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -230,7 +230,7 @@ tf_kernel_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler/lib:traceme", ] + if_nccl([ ":virtual_nccl", @@ -249,7 +249,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -437,7 +437,7 @@ tf_cc_test( ":sparse_utils", "//tensorflow/core:framework", "//tensorflow/core:framework_lite", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "@com_google_absl//absl/base:core_headers", @@ -485,7 +485,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", ], @@ -558,7 +558,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -602,7 +602,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -626,7 +626,7 @@ cc_library( ":typed_queue", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -638,7 +638,7 @@ cc_library( ":ops_util_hdrs", ":split_lib_hdrs", "//tensorflow/core:framework_headers_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels/batching_util:periodic_function_dynamic", "//tensorflow/core/kernels/batching_util:shared_batch_scheduler_hdrs", ], @@ -948,7 +948,7 @@ ARRAY_DEPS = [ "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/eigen3", ] + if_sycl(["//tensorflow/core:sycl_runtime"]) @@ -1102,7 +1102,7 @@ tf_cc_test( ":ops_testutil", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1217,7 +1217,7 @@ tf_kernel_library( # "//tensorflow/core:core_cpu_internal", # "//tensorflow/core:framework", # "//tensorflow/core:lib", -# "//tensorflow/core:protos_all_cc", +# "//tensorflow/core:protos_all", # "//tensorflow/core:test", # "//tensorflow/core:test_main", # "//tensorflow/core:testlib", @@ -1446,7 +1446,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:framework_lite", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:ragged_to_dense_util", ], ) @@ -1551,7 +1551,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1570,7 +1570,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1588,7 +1588,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1606,7 +1606,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1624,7 +1624,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1643,7 +1643,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1675,7 +1675,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1701,7 +1701,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -1729,7 +1729,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1751,7 +1751,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1773,7 +1773,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1796,7 +1796,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -1818,7 +1818,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -1837,7 +1837,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1859,7 +1859,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -1880,7 +1880,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1898,7 +1898,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1916,7 +1916,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1944,7 +1944,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -1965,7 +1965,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2021,7 +2021,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2040,7 +2040,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2059,7 +2059,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2077,7 +2077,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2095,7 +2095,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2114,7 +2114,7 @@ tf_cc_test( "//tensorflow/core:debug_ops_op_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2135,7 +2135,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2154,7 +2154,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2172,7 +2172,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2192,7 +2192,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2227,7 +2227,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2246,7 +2246,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2264,7 +2264,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2285,7 +2285,7 @@ tf_kernel_library( ":ops_util", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/eigen3", ], alwayslink = 1, @@ -2369,7 +2369,7 @@ tf_cc_test( ":ops_testutil", ":ops_util", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2484,7 +2484,7 @@ tf_kernel_library( name = "random_shuffle_queue_op", prefix = "random_shuffle_queue_op", deps = DATA_FLOW_DEPS + [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -2515,7 +2515,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2679,7 +2679,7 @@ tf_cuda_cc_tests( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -2712,7 +2712,7 @@ cc_library( ":typed_queue", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -2727,7 +2727,7 @@ cc_library( ":typed_queue", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -2867,7 +2867,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/clusters:virtual_cluster", "//tensorflow/core/grappler/optimizers:meta_optimizer", @@ -2915,7 +2915,7 @@ IMAGE_DEPS = [ "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:png_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] tf_kernel_library( @@ -3052,7 +3052,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -3063,7 +3063,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -3175,7 +3175,7 @@ tf_cc_tests( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3195,7 +3195,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3211,7 +3211,7 @@ tf_cuda_cc_test( ":ops_util", "//tensorflow/core:core_cpu", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3227,7 +3227,7 @@ tf_cuda_cc_test( ":ops_util", "//tensorflow/core:core_cpu", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3245,7 +3245,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3261,7 +3261,7 @@ tf_cuda_cc_test( ":ops_util", "//tensorflow/core:core_cpu", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3290,7 +3290,7 @@ IO_DEPS = [ "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:reader_base", "//tensorflow/core/util/tensor_bundle", ] @@ -3333,7 +3333,7 @@ SAVE_RESTORE_DEPS = [ "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/util/tensor_bundle", ] @@ -3392,7 +3392,7 @@ tf_cc_tests( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3651,7 +3651,7 @@ LOGGING_DEPS = [ "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] tf_kernel_library( @@ -3700,7 +3700,7 @@ tf_cc_tests( ":ops_util", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3743,7 +3743,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -3993,7 +3993,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4011,7 +4011,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4029,7 +4029,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4053,7 +4053,7 @@ tf_cc_tests( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4073,7 +4073,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4094,7 +4094,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -4117,7 +4117,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -4138,7 +4138,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4161,7 +4161,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4184,7 +4184,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4203,7 +4203,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4243,7 +4243,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4261,7 +4261,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4279,7 +4279,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4298,7 +4298,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4653,7 +4653,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4673,7 +4673,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4695,7 +4695,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4823,7 +4823,7 @@ tf_cuda_cc_test( ":ops_util", "//tensorflow/core:core_cpu", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -4871,7 +4871,7 @@ PARSING_DEPS = [ "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ] tf_kernel_library( @@ -5225,7 +5225,7 @@ tf_kernel_library( prefix = "serialize_sparse_op", deps = SPARSE_DEPS + [ ":reshape_util", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -5234,7 +5234,7 @@ tf_kernel_library( prefix = "deserialize_sparse_string_op", deps = SPARSE_DEPS + [ ":reshape_util", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -5242,7 +5242,7 @@ tf_kernel_library( name = "deserialize_sparse_variant_op", prefix = "deserialize_sparse_variant_op", deps = SPARSE_DEPS + [ - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -5269,7 +5269,7 @@ tf_cuda_cc_tests( "//tensorflow/core:core_cpu", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5445,7 +5445,7 @@ tf_cc_test( ":scatter_op", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5464,7 +5464,7 @@ tf_cuda_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5502,7 +5502,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@icu//:common", ], ) @@ -5551,7 +5551,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5593,7 +5593,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5617,7 +5617,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5641,7 +5641,7 @@ tf_cc_test( ":string_ngrams_op", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5690,7 +5690,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -5921,7 +5921,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", ], ) @@ -5948,7 +5948,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:lib_test_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//third_party/eigen3", @@ -5981,7 +5981,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -6009,7 +6009,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:lib_test_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//third_party/eigen3", @@ -6036,7 +6036,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:lib_test_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//third_party/eigen3", @@ -6065,7 +6065,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:lib_test_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//third_party/eigen3", @@ -6098,7 +6098,7 @@ tf_cuda_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -6852,7 +6852,7 @@ tf_cc_test( ":ops_util", ":quantized_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -6868,7 +6868,7 @@ tf_cc_test( ":ops_util", ":quantized_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -6884,7 +6884,7 @@ tf_cc_test( ":ops_util", ":quantized_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -6904,7 +6904,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", "//third_party/eigen3", @@ -6963,7 +6963,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7002,7 +7002,7 @@ cc_binary( ":ops_util", ":quantized_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:tensorflow", "//tensorflow/core:test", @@ -7028,7 +7028,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -7049,7 +7049,7 @@ tf_cc_test( "//tensorflow/core:direct_session", "//tensorflow/core:framework", "//tensorflow/core:image_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -7091,7 +7091,7 @@ cc_binary( "//tensorflow/core:direct_session", "//tensorflow/core:framework", "//tensorflow/core:image_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -7111,7 +7111,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7132,7 +7132,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7154,7 +7154,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7176,7 +7176,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7195,7 +7195,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7216,7 +7216,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7238,7 +7238,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7275,7 +7275,7 @@ cc_binary( ":quantized_ops", "//tensorflow/core:framework", "//tensorflow/core:tensor_testutil", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", ], }), @@ -7299,7 +7299,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -7318,7 +7318,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7356,7 +7356,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7378,7 +7378,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7395,7 +7395,7 @@ tf_cc_test( ":quantized_ops", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7417,7 +7417,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7441,7 +7441,7 @@ tf_cc_test_mkl( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:mkl_array_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7463,7 +7463,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7517,7 +7517,7 @@ tf_cc_test( "//tensorflow/core:direct_session", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:testlib", ], @@ -7531,7 +7531,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -7561,7 +7561,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -7600,7 +7600,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:remote_fused_graph_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -7627,7 +7627,7 @@ tf_cc_test( "//tensorflow/core:direct_session", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:remote_fused_graph_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -7662,7 +7662,7 @@ tf_cc_test( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -7742,7 +7742,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -7838,7 +7838,7 @@ tf_cc_test_mkl( "//tensorflow/core:math_ops_op_lib", "//tensorflow/core:mkl_array_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -7981,7 +7981,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:math_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -8007,7 +8007,7 @@ tf_cc_test_mkl( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -8062,7 +8062,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -8073,7 +8073,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/lib/db:sqlite", "//tensorflow/core/summary:schema", "//tensorflow/core/summary:summary_db_writer", diff --git a/tensorflow/core/kernels/batching_util/BUILD b/tensorflow/core/kernels/batching_util/BUILD index 370c96c6e7f..2bcd0dcd944 100644 --- a/tensorflow/core/kernels/batching_util/BUILD +++ b/tensorflow/core/kernels/batching_util/BUILD @@ -13,7 +13,7 @@ cc_library( hdrs = ["periodic_function.h"], deps = [ "//tensorflow/core:framework_headers_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -93,7 +93,7 @@ tf_cc_test( ":fake_clock_env", ":shared_batch_scheduler", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], diff --git a/tensorflow/core/kernels/data/BUILD b/tensorflow/core/kernels/data/BUILD index 03f9d26cf0d..393af26076a 100644 --- a/tensorflow/core/kernels/data/BUILD +++ b/tensorflow/core/kernels/data/BUILD @@ -41,7 +41,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:testlib", @@ -59,7 +59,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/container:flat_hash_map", ], ) @@ -71,7 +71,7 @@ tf_cc_test( ":dataset_utils", "//tensorflow/cc:cc_ops", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -112,7 +112,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler:grappler_item_builder", @@ -132,7 +132,7 @@ cc_library( ":captured_function", "//tensorflow/core:framework", "//tensorflow/core:graph", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/lib/core:status", ], ) @@ -159,7 +159,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels:variable_ops", "@com_google_absl//absl/time", ], @@ -191,7 +191,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:math_ops_op_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:random_ops_op_lib", "//tensorflow/core:spectral_ops_op_lib", "//tensorflow/core:test", @@ -467,7 +467,7 @@ tf_kernel_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -668,7 +668,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -1121,7 +1121,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", "//tensorflow/core/kernels:ops_util", "@com_google_absl//absl/memory", @@ -1179,7 +1179,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/eigen3", ], ) @@ -1227,7 +1227,7 @@ tf_kernel_library( "//tensorflow/core:dataset_ops_op_lib", "//tensorflow/core:framework", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -1277,7 +1277,7 @@ tf_kernel_library( "//tensorflow/core:core_cpu_internal", "//tensorflow/core:dataset_ops_op_lib", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_topology_view", "//tensorflow/core/grappler/utils:traversal", ], diff --git a/tensorflow/core/kernels/data/experimental/BUILD b/tensorflow/core/kernels/data/experimental/BUILD index 9cd0e926ea0..ed4aa5948bb 100644 --- a/tensorflow/core/kernels/data/experimental/BUILD +++ b/tensorflow/core/kernels/data/experimental/BUILD @@ -53,7 +53,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler/optimizers/data:auto_shard", "//tensorflow/core/kernels/data:rewrite_utils", ], @@ -84,7 +84,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels/data:captured_function", "//tensorflow/core/kernels/data:dataset_utils", "//tensorflow/core/kernels/data:take_dataset_op", @@ -321,7 +321,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels/data:name_utils", ], ) @@ -409,7 +409,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:graph_view", "//tensorflow/core/kernels/data:dataset_utils", "//tensorflow/core/profiler/lib:traceme", @@ -438,7 +438,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels:summary_interface", ], ) @@ -451,7 +451,7 @@ tf_kernel_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/core/kernels/hexagon/BUILD b/tensorflow/core/kernels/hexagon/BUILD index 103e93fb67a..5f7d48f038c 100644 --- a/tensorflow/core/kernels/hexagon/BUILD +++ b/tensorflow/core/kernels/hexagon/BUILD @@ -33,7 +33,7 @@ tf_cc_test( "//tensorflow/core:mkl_nn_ops_op_lib", "//tensorflow/core:nn_ops_op_lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:remote_fused_graph_ops_op_lib", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -74,7 +74,7 @@ tf_kernel_library( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels:remote_fused_graph_execute_utils", "//third_party/eigen3", ], diff --git a/tensorflow/core/ops/compat/BUILD b/tensorflow/core/ops/compat/BUILD index 299076d8cfd..018ffd5ac2a 100644 --- a/tensorflow/core/ops/compat/BUILD +++ b/tensorflow/core/ops/compat/BUILD @@ -25,7 +25,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index be9cdf95262..9a9f9b51b67 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -136,6 +136,8 @@ def cc_proto_library( use_grpc_plugin = False, use_grpc_namespace = False, make_default_target_header_only = False, + protolib_name = None, + protolib_deps = [], **kargs): """Bazel rule to create a C++ protobuf library from proto source files. @@ -153,27 +155,34 @@ def cc_proto_library( cc_proto_library can depend on it. use_grpc_plugin: a flag to indicate whether to call the grpc C++ plugin when processing the proto files. + use_grpc_namespace: the namespace for the grpc services. make_default_target_header_only: Controls the naming of generated rules. If True, the `name` rule will be header-only, and an _impl rule will contain the implementation. Otherwise the header-only rule (name + "_headers_only") must be referred to explicitly. + protolib_name: the name for the proto library generated by this rule. + protolib_deps: The dependencies to proto libraries. **kargs: other keyword arguments that are passed to cc_library. """ includes = [] if include != None: includes = [include] + if protolib_name == None: + protolib_name = name + if not protolib_deps: + protolib_deps = deps if internal_bootstrap_hack: # For pre-checked-in generated files, we add the internal_bootstrap_hack # which will skip the codegen action. proto_gen( - name = name + "_genproto", + name = protolib_name + "_genproto", srcs = srcs, includes = includes, protoc = protoc, visibility = ["//visibility:public"], - deps = [s + "_genproto" for s in deps], + deps = [s + "_genproto" for s in protolib_deps], ) # An empty cc_library to make rule dependency consistent. @@ -195,7 +204,7 @@ def cc_proto_library( outs = gen_srcs + gen_hdrs proto_gen( - name = name + "_genproto", + name = protolib_name + "_genproto", srcs = srcs, outs = outs, gen_cc = 1, @@ -205,7 +214,7 @@ def cc_proto_library( plugin_options = plugin_options, protoc = protoc, visibility = ["//visibility:public"], - deps = [s + "_genproto" for s in deps], + deps = [s + "_genproto" for s in protolib_deps], ) if use_grpc_plugin: @@ -237,6 +246,18 @@ def cc_proto_library( **kargs ) + # Temporarily also add an alias with the 'protolib_name'. So far we relied + # on copybara to switch dependencies to the _cc dependencies. Now that these + # copybara rules are removed, we need to first change the internal BUILD + # files to depend on the correct targets instead, then this can be removed. + # TODO(b/143648532): Remove this once all reverse dependencies are migrated. + if protolib_name != name: + native.alias( + name = protolib_name, + actual = name, + visibility = kargs["visibility"], + ) + # Re-defined protocol buffer rule to bring in the change introduced in commit # https://github.com/google/protobuf/commit/294b5758c373cbab4b72f35f4cb62dc1d8332b68 # which was not part of a stable protobuf release in 04/2018. @@ -273,7 +294,7 @@ def py_proto_library( protoc: the label of the protocol compiler to generate the sources. use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin when processing the proto files. - **kargs: other keyword arguments that are passed to cc_library. + **kargs: other keyword arguments that are passed to py_library. """ outs = _proto_py_outs(srcs, use_grpc_plugin) @@ -338,16 +359,30 @@ def tf_proto_library_cc( if cc_grpc_version: use_grpc_plugin = True + protolib_deps = tf_deps(protodeps, "") cc_deps = tf_deps(protodeps, "_cc") cc_name = name + "_cc" if not srcs: # This is a collection of sub-libraries. Build header-only and impl # libraries containing all the sources. proto_gen( - name = cc_name + "_genproto", + name = name + "_genproto", protoc = "@com_google_protobuf//:protoc", visibility = ["//visibility:public"], - deps = [s + "_genproto" for s in cc_deps], + deps = [s + "_genproto" for s in protolib_deps], + ) + + # Temporarily also add an alias with 'name'. So far we relied on + # copybara to switch dependencies to the _cc dependencies. Now that these + # copybara rules are removed, we need to change the internal BUILD files to + # depend on the correct targets instead. + # TODO(b/143648532): Remove this once all reverse dependencies are + # migrated. + native.alias( + name = name, + actual = cc_name, + testonly = testonly, + visibility = visibility, ) native.cc_library( name = cc_name, @@ -364,6 +399,7 @@ def tf_proto_library_cc( cc_proto_library( name = cc_name, + protolib_name = name, testonly = testonly, srcs = srcs, cc_libs = cc_libs + if_static( @@ -380,6 +416,7 @@ def tf_proto_library_cc( use_grpc_plugin = use_grpc_plugin, visibility = visibility, deps = cc_deps + ["@com_google_protobuf//:cc_wkt_protos"], + protolib_deps = protolib_deps + ["@com_google_protobuf//:cc_wkt_protos"], ) def tf_proto_library_py( diff --git a/tensorflow/core/profiler/BUILD b/tensorflow/core/profiler/BUILD index 329f0933509..06f745b4054 100644 --- a/tensorflow/core/profiler/BUILD +++ b/tensorflow/core/profiler/BUILD @@ -11,13 +11,13 @@ tf_cc_binary( name = "profiler", srcs = ["profiler.cc"], deps = [ - ":protos_all_cc", + ":protos_all", "//tensorflow/c:c_api", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:framework_headers_lib", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler:tfprof_options", "//tensorflow/core/profiler/internal:tfprof_stats", "//tensorflow/core/profiler/internal:tfprof_utils", @@ -33,7 +33,7 @@ cc_library( deps = [ "//tensorflow/core:framework_headers_lib", "//tensorflow/core:lib", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", ], ) diff --git a/tensorflow/core/profiler/internal/BUILD b/tensorflow/core/profiler/internal/BUILD index b92d96e539e..1902576cc29 100644 --- a/tensorflow/core/profiler/internal/BUILD +++ b/tensorflow/core/profiler/internal/BUILD @@ -20,9 +20,9 @@ cc_library( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -35,7 +35,7 @@ cc_library( ":tfprof_node_show", ":tfprof_utils", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@jsoncpp_git//:jsoncpp", ], ) @@ -47,9 +47,9 @@ cc_library( deps = [ ":tfprof_utils", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -68,9 +68,9 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -88,9 +88,9 @@ cc_library( "//tensorflow/c:c_api", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -110,9 +110,9 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -129,9 +129,9 @@ cc_library( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -145,8 +145,8 @@ cc_library( ":tfprof_node", ":tfprof_utils", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core:protos_all", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -164,9 +164,9 @@ cc_library( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -186,9 +186,9 @@ cc_library( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -212,9 +212,9 @@ tf_cc_test( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -235,9 +235,9 @@ tf_cc_test( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -249,7 +249,7 @@ cc_library( copts = if_not_windows(["-Wno-sign-compare"]), deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", "//tensorflow/core/profiler:tfprof_options", ], @@ -270,8 +270,8 @@ cc_library( "//tensorflow/c:checkpoint_reader", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core:protos_all", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", "//tensorflow/core/profiler/internal/advisor:tfprof_advisor", ], @@ -297,9 +297,9 @@ tf_cc_test( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -312,7 +312,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", ], ) @@ -332,9 +332,9 @@ tf_cc_test( ":tfprof_utils", "//tensorflow/c:checkpoint_reader", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler:tfprof_options", ], ) @@ -359,7 +359,7 @@ cc_library( name = "tfprof_tf_lib", deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:regexp_internal", ], ) @@ -404,7 +404,7 @@ tf_cuda_library( ], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/synchronization", ], ) @@ -430,7 +430,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/core/profiler/internal/advisor/BUILD b/tensorflow/core/profiler/internal/advisor/BUILD index 7d72ceee228..ca58291a748 100644 --- a/tensorflow/core/profiler/internal/advisor/BUILD +++ b/tensorflow/core/profiler/internal/advisor/BUILD @@ -10,7 +10,7 @@ cc_library( hdrs = ["checker.h"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler/internal:tfprof_stats", ], ) @@ -20,7 +20,7 @@ cc_library( srcs = ["internal_checker_runner_dummy.cc"], hdrs = ["internal_checker_runner.h"], deps = [ - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler/internal:tfprof_utils", ], ) @@ -58,7 +58,7 @@ cc_library( ":expensive_operation_checker", ":internal_checker_runner_dummy", ":operation_checker", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", ], ) diff --git a/tensorflow/core/profiler/internal/cpu/BUILD b/tensorflow/core/profiler/internal/cpu/BUILD index e00d982a62f..34e2e0ba9e2 100644 --- a/tensorflow/core/profiler/internal/cpu/BUILD +++ b/tensorflow/core/profiler/internal/cpu/BUILD @@ -18,7 +18,7 @@ tf_cuda_library( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler/internal:profiler_interface", "//tensorflow/core/profiler/internal:traceme_recorder", "@com_google_absl//absl/container:flat_hash_map", @@ -34,7 +34,7 @@ tf_cuda_cc_test( ":host_tracer", "//tensorflow/core:core_cpu_lib", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core/profiler/internal:profiler_interface", "//tensorflow/core/profiler/lib:traceme", diff --git a/tensorflow/core/profiler/internal/gpu/BUILD b/tensorflow/core/profiler/internal/gpu/BUILD index 40a0a744b45..9b637536c13 100644 --- a/tensorflow/core/profiler/internal/gpu/BUILD +++ b/tensorflow/core/profiler/internal/gpu/BUILD @@ -33,7 +33,7 @@ tf_cuda_library( ":cupti_utils", "//tensorflow/core:core_cpu_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler/internal:parse_annotation", "//tensorflow/core/profiler/internal:profiler_interface", "//tensorflow/core/profiler/lib:traceme", @@ -62,7 +62,7 @@ tf_cc_test_gpu( "//tensorflow/core:gpu_runtime", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", diff --git a/tensorflow/core/profiler/lib/BUILD b/tensorflow/core/profiler/lib/BUILD index f15aadfc0f3..7de8ee159a9 100644 --- a/tensorflow/core/profiler/lib/BUILD +++ b/tensorflow/core/profiler/lib/BUILD @@ -24,7 +24,7 @@ tf_cuda_library( deps = [ "//tensorflow/core/profiler/internal:profiler_interface", "//tensorflow/core/profiler/lib:profiler_utils", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "@com_google_absl//absl/strings", ] + select({ "//tensorflow:android": [], @@ -34,7 +34,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:session_options", ], }), diff --git a/tensorflow/core/profiler/rpc/BUILD b/tensorflow/core/profiler/rpc/BUILD index c3437424383..54c327fa94d 100644 --- a/tensorflow/core/profiler/rpc/BUILD +++ b/tensorflow/core/profiler/rpc/BUILD @@ -15,7 +15,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:grpc_services", "//tensorflow/core:lib", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler/lib:profiler_lib", "//tensorflow/core/profiler/lib:profiler_session", ], @@ -33,7 +33,7 @@ tf_cuda_library( "//tensorflow/core:framework", "//tensorflow/core:grpc_services", "//tensorflow/core:lib", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "//tensorflow/core/profiler/lib:profiler_lib", "//tensorflow/core/profiler/lib:profiler_session", ], diff --git a/tensorflow/core/profiler/rpc/client/BUILD b/tensorflow/core/profiler/rpc/client/BUILD index fa3ee9d2865..2a8273da7be 100644 --- a/tensorflow/core/profiler/rpc/client/BUILD +++ b/tensorflow/core/profiler/rpc/client/BUILD @@ -20,7 +20,7 @@ tf_cuda_library( "//tensorflow/core:grpc_services", "//tensorflow/core:lib", "//tensorflow/core/distributed_runtime/rpc:grpc_util", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "@com_google_absl//absl/strings", ], ) @@ -35,7 +35,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:grpc_services", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/profiler:op_profile_proto_cc", ], ) @@ -46,7 +46,7 @@ cc_library( hdrs = ["trace_events_to_json.h"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@jsoncpp_git//:jsoncpp", ], ) @@ -57,10 +57,10 @@ tf_cc_test( deps = [ ":trace_events_to_json", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", - "//tensorflow/core/profiler:protos_all_cc", + "//tensorflow/core/profiler:protos_all", "@jsoncpp_git//:jsoncpp", ], ) diff --git a/tensorflow/core/protobuf/tpu/BUILD b/tensorflow/core/protobuf/tpu/BUILD index 34656d28a73..3bbb97885a0 100644 --- a/tensorflow/core/protobuf/tpu/BUILD +++ b/tensorflow/core/protobuf/tpu/BUILD @@ -81,10 +81,10 @@ xla_proto_library( ], visibility = ["//visibility:public"], deps = [ - ":dynamic_padding_proto_cc", + ":dynamic_padding_proto", "//tensorflow/compiler/xla:xla_data_proto", "//tensorflow/compiler/xla:xla_proto", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/core/summary/BUILD b/tensorflow/core/summary/BUILD index 44c9b4b8b17..2e74ce094a3 100644 --- a/tensorflow/core/summary/BUILD +++ b/tensorflow/core/summary/BUILD @@ -45,7 +45,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/kernels:summary_interface", "//tensorflow/core/lib/db:sqlite", ], @@ -59,7 +59,7 @@ tf_cc_test( ":schema", ":summary_db_writer", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core/lib/db:sqlite", @@ -76,7 +76,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:ptr_util", "//tensorflow/core/kernels:summary_interface", ], @@ -91,7 +91,7 @@ tf_cc_test( ":summary_file_writer", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], @@ -108,7 +108,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:png_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -122,7 +122,7 @@ tf_cc_binary( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/lib/db:sqlite", ], ) diff --git a/tensorflow/core/tpu/BUILD b/tensorflow/core/tpu/BUILD index 6184f52d240..d455c1bf76d 100644 --- a/tensorflow/core/tpu/BUILD +++ b/tensorflow/core/tpu/BUILD @@ -13,8 +13,8 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", - "//tensorflow/core/protobuf/tpu:optimization_parameters_proto_cc", + "//tensorflow/core:protos_all", + "//tensorflow/core/protobuf/tpu:optimization_parameters_proto", "@com_google_absl//absl/base", ], ) @@ -27,8 +27,8 @@ cc_library( deps = [ "//tensorflow/core:framework_headers_lib", "//tensorflow/core:lib_proto_parsing", - "//tensorflow/core:protos_all_cc", - "//tensorflow/core/protobuf/tpu:tpu_embedding_configuration_proto_cc", - "//tensorflow/core/protobuf/tpu:tpu_embedding_output_layout_proto_cc", + "//tensorflow/core:protos_all", + "//tensorflow/core/protobuf/tpu:tpu_embedding_configuration_proto", + "//tensorflow/core/protobuf/tpu:tpu_embedding_output_layout_proto", ], ) diff --git a/tensorflow/core/util/tensor_bundle/BUILD b/tensorflow/core/util/tensor_bundle/BUILD index d6c5fcf3f73..f84fd3e6ec0 100644 --- a/tensorflow/core/util/tensor_bundle/BUILD +++ b/tensorflow/core/util/tensor_bundle/BUILD @@ -50,7 +50,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -80,7 +80,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensor_testutil", "//tensorflow/core:test", "//tensorflow/core:test_main", diff --git a/tensorflow/examples/label_image/BUILD b/tensorflow/examples/label_image/BUILD index efa637db03f..c018b78c99f 100644 --- a/tensorflow/examples/label_image/BUILD +++ b/tensorflow/examples/label_image/BUILD @@ -46,7 +46,7 @@ tf_cc_binary( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], }), diff --git a/tensorflow/examples/multibox_detector/BUILD b/tensorflow/examples/multibox_detector/BUILD index 4b1e18954fa..8bbe1def216 100644 --- a/tensorflow/examples/multibox_detector/BUILD +++ b/tensorflow/examples/multibox_detector/BUILD @@ -22,7 +22,7 @@ tf_cc_binary( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) diff --git a/tensorflow/examples/speech_commands/BUILD b/tensorflow/examples/speech_commands/BUILD index e9589aeac80..361840b5f2b 100644 --- a/tensorflow/examples/speech_commands/BUILD +++ b/tensorflow/examples/speech_commands/BUILD @@ -248,7 +248,7 @@ tf_cc_binary( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) @@ -306,7 +306,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) @@ -340,7 +340,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) @@ -374,7 +374,7 @@ tf_cc_binary( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/examples/wav_to_spectrogram/BUILD b/tensorflow/examples/wav_to_spectrogram/BUILD index 9aeaf9414ae..70d150836cf 100644 --- a/tensorflow/examples/wav_to_spectrogram/BUILD +++ b/tensorflow/examples/wav_to_spectrogram/BUILD @@ -20,7 +20,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) diff --git a/tensorflow/java/BUILD b/tensorflow/java/BUILD index 3bd836f5e4e..e16644bd570 100644 --- a/tensorflow/java/BUILD +++ b/tensorflow/java/BUILD @@ -121,7 +121,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_googlesource_code_re2//:re2", ], ) diff --git a/tensorflow/js/BUILD b/tensorflow/js/BUILD index 02cbcdf3df9..ab562ba5557 100644 --- a/tensorflow/js/BUILD +++ b/tensorflow/js/BUILD @@ -29,7 +29,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -45,7 +45,7 @@ tf_cc_test( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", ], diff --git a/tensorflow/lite/delegates/flex/BUILD b/tensorflow/lite/delegates/flex/BUILD index 2365b1e88dc..38f86021dde 100644 --- a/tensorflow/lite/delegates/flex/BUILD +++ b/tensorflow/lite/delegates/flex/BUILD @@ -30,7 +30,7 @@ cc_library( "//conditions:default": [ "//tensorflow/c:c_api_internal", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], }), ) @@ -188,7 +188,7 @@ cc_library( "//tensorflow/core/common_runtime/eager:execute", "//tensorflow/core/common_runtime/eager:tensor_handle", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:framework", ], }), diff --git a/tensorflow/lite/toco/BUILD b/tensorflow/lite/toco/BUILD index 68cb7adccb9..f5cf6970004 100644 --- a/tensorflow/lite/toco/BUILD +++ b/tensorflow/lite/toco/BUILD @@ -63,7 +63,7 @@ tf_proto_library_py( cc_library( name = "tensorflow_core_cc_protos_all", - deps = ["//tensorflow/core:protos_all_cc"], + deps = ["//tensorflow/core:protos_all"], ) cc_library( @@ -93,7 +93,7 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - ":model_flags_proto_cc", + ":model_flags_proto", ":runtime", ":toco_port", "//tensorflow/core:lib", @@ -123,9 +123,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":model_cmdline_flags", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_port", - ":types_proto_cc", + ":types_proto", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "@com_google_absl//absl/strings", @@ -145,10 +145,10 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - ":model_flags_proto_cc", + ":model_flags_proto", ":toco_graphviz_dump_options", ":toco_port", - ":types_proto_cc", + ":types_proto", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "@com_google_absl//absl/strings", @@ -289,7 +289,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":model", - ":model_flags_proto_cc", + ":model_flags_proto", ":runtime", ":toco_port", ":tooling_util", @@ -329,11 +329,11 @@ cc_library( deps = [ ":graph_transformations", ":model", - ":model_flags_proto_cc", - ":types_proto_cc", + ":model_flags_proto", + ":types_proto", ":runtime", ":toco_graphviz_dump_options", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_port", ":tooling_util", "@com_google_protobuf//:protobuf_headers", @@ -342,7 +342,7 @@ cc_library( "//tensorflow/core:core_cpu_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/toco/tensorflow_graph_matching:resolve_cluster", "//tensorflow/lite/toco/tflite:export", "//tensorflow/lite/toco/tflite:import", @@ -362,7 +362,7 @@ tf_cc_test( "//tensorflow/core:graph", "//tensorflow/core:lib", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], @@ -382,12 +382,12 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":model", - ":model_flags_proto_cc", + ":model_flags_proto", ":runtime", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_graphviz_dump_options", ":toco_port", - ":types_proto_cc", + ":types_proto", "//tensorflow/core:lib", "//tensorflow/lite/kernels/internal:types", "@com_google_absl//absl/memory", @@ -420,12 +420,12 @@ cc_library( deps = [ ":model", ":model_cmdline_flags", - ":model_flags_proto_cc", + ":model_flags_proto", ":toco_cmdline_flags", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_port", ":toco_tooling", - ":types_proto_cc", + ":types_proto", "@com_google_absl//absl/strings", "//tensorflow/core:lib", # We cannot embed the core:ops dependency directly into :toco_tooling as @@ -441,13 +441,13 @@ tf_cc_binary( deps = [ ":model", ":model_cmdline_flags", - ":model_flags_proto_cc", + ":model_flags_proto", ":toco_cmdline_flags", ":toco_convert", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_port", ":toco_tooling", - ":types_proto_cc", + ":types_proto", "@com_google_absl//absl/strings", "//tensorflow/core:lib", # We cannot embed the core:ops dependency directly into :toco_tooling as @@ -463,13 +463,13 @@ tf_cc_test( deps = [ ":model", ":model_cmdline_flags", - ":model_flags_proto_cc", + ":model_flags_proto", ":toco_cmdline_flags", ":toco_convert", - ":toco_flags_proto_cc", + ":toco_flags_proto", ":toco_port", ":toco_tooling", - ":types_proto_cc", + ":types_proto", "@com_google_googletest//:gtest", "@com_google_absl//absl/strings", "//tensorflow/core:lib", @@ -500,7 +500,7 @@ tf_cc_test( ], deps = [ ":model_cmdline_flags", - ":model_flags_proto_cc", + ":model_flags_proto", "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], @@ -513,7 +513,7 @@ tf_cc_test( ], deps = [ ":toco_cmdline_flags", - ":toco_flags_proto_cc", + ":toco_flags_proto", "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], diff --git a/tensorflow/lite/toco/python/BUILD b/tensorflow/lite/toco/python/BUILD index ab69b402f1d..ef3533778b9 100644 --- a/tensorflow/lite/toco/python/BUILD +++ b/tensorflow/lite/toco/python/BUILD @@ -37,13 +37,13 @@ cc_library( "//third_party/python_runtime:headers", "//tensorflow/core:lib", "//tensorflow/lite/python/interpreter_wrapper:python_utils", - "//tensorflow/lite/toco:model_flags_proto_cc", + "//tensorflow/lite/toco:model_flags_proto", "//tensorflow/lite/toco:toco_convert", - "//tensorflow/lite/toco:toco_flags_proto_cc", + "//tensorflow/lite/toco:toco_flags_proto", "//tensorflow/lite/toco:toco_graphviz_dump_options", "//tensorflow/lite/toco:toco_port", "//tensorflow/lite/toco:toco_tooling", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/compiler/mlir/lite/python:graphdef_to_tfl_flatbuffer", ] + select({ # This is required when running `tflite_convert` from `bazel`. diff --git a/tensorflow/lite/toco/tensorflow_graph_matching/BUILD b/tensorflow/lite/toco/tensorflow_graph_matching/BUILD index 0ec0ac44a25..b12e5910005 100644 --- a/tensorflow/lite/toco/tensorflow_graph_matching/BUILD +++ b/tensorflow/lite/toco/tensorflow_graph_matching/BUILD @@ -31,7 +31,7 @@ cc_library( ], deps = [ ":cluster_utils", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/toco:model", "//tensorflow/lite/toco:tooling_util", ], @@ -50,7 +50,7 @@ cc_library( ":cluster", ":cluster_utils", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/toco:model", "//tensorflow/lite/toco:toco_port", "//tensorflow/lite/toco:tooling_util", @@ -67,7 +67,7 @@ tf_cc_test( ":resolve_cluster", ":resolve_svdf", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_googletest//:gtest_main", ], ) @@ -85,7 +85,7 @@ cc_library( ":cluster", ":cluster_utils", ":resolve_svdf", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/toco:tooling_util", ], ) diff --git a/tensorflow/lite/toco/tflite/BUILD b/tensorflow/lite/toco/tflite/BUILD index 43cb88de4f6..b116c6a98d0 100644 --- a/tensorflow/lite/toco/tflite/BUILD +++ b/tensorflow/lite/toco/tflite/BUILD @@ -26,7 +26,7 @@ cc_library( deps = [ ":types", "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:ptr_util", "//tensorflow/lite/delegates/flex:whitelisted_flex_ops_lib", "//tensorflow/lite/schema:schema_fbs", @@ -46,7 +46,7 @@ tf_cc_test( deps = [ ":operator", "//tensorflow/core:ops", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/lite/toco:tooling_util", "@com_google_googletest//:gtest_main", "@flatbuffers", diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index d7f723a925f..50bb2105fe5 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -315,7 +315,7 @@ cc_library( hdrs = ["grappler/cost_analyzer.h"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/clusters:cluster", "//tensorflow/core/grappler/costs:analytical_cost_estimator", @@ -332,7 +332,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/grappler:grappler_item", "//tensorflow/core/grappler/costs:graph_properties", ], @@ -375,7 +375,7 @@ cc_library( ":numpy_lib", "//tensorflow/c:c_api", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -418,7 +418,7 @@ cc_library( features = ["-parse_headers"], deps = [ "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@pybind11", ], @@ -441,7 +441,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -482,7 +482,7 @@ tf_python_pybind_extension( ":pybind11_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@pybind11", ], @@ -502,7 +502,7 @@ tf_python_pybind_extension( "//tensorflow/core:core_cpu_headers_lib", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@com_google_absl//absl/strings", "@pybind11", @@ -515,7 +515,7 @@ tf_python_pybind_extension( module_name = "_pywrap_stat_summarizer", deps = [ "//tensorflow/core:framework", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@com_google_absl//absl/memory", "@pybind11", @@ -544,7 +544,7 @@ tf_python_pybind_extension( ":pybind11_status", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@com_google_absl//absl/strings", "@pybind11", @@ -561,7 +561,7 @@ tf_python_pybind_extension( ":pybind11_status", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@com_google_absl//absl/strings", "@pybind11", @@ -605,7 +605,7 @@ tf_python_pybind_extension( ":pybind11_status", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@pybind11", ], @@ -648,7 +648,7 @@ tf_python_pybind_extension( module_name = "_pywrap_py_exception_registry", deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@pybind11", ], @@ -695,7 +695,7 @@ cc_library( "//tensorflow/c/eager:c_api_internal", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:script_ops_op_lib", "//tensorflow/python:ndarray_tensor", "//tensorflow/python/eager:pywrap_tfe_lib", @@ -908,7 +908,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@com_google_absl//absl/strings", ], alwayslink = 1, @@ -924,7 +924,7 @@ cc_library( "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:op_gen_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -1246,7 +1246,7 @@ tf_python_pybind_extension( deps = [ ":pybind11_status", "//tensorflow/core:framework_headers_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "@pybind11", ], ) @@ -2000,7 +2000,7 @@ cc_library( deps = [ "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -5192,7 +5192,7 @@ tf_python_pybind_extension( ":pybind11_status", "//tensorflow/core:core_cpu_headers_lib", "//tensorflow/core:framework_internal_headers_lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/python_runtime:headers", "@pybind11", ], @@ -5221,7 +5221,7 @@ cc_library( "//tensorflow/core:core_cpu", "//tensorflow/core:lib", "//tensorflow/core:master_proto_cc", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:replay_log_proto_cc", ], ) @@ -5248,7 +5248,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//third_party/py/numpy:headers", "//third_party/python_runtime:headers", ], @@ -5676,7 +5676,7 @@ tf_cuda_library( "//tensorflow/core", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) diff --git a/tensorflow/python/eager/BUILD b/tensorflow/python/eager/BUILD index 4a76bd79513..678c2bd95cf 100644 --- a/tensorflow/python/eager/BUILD +++ b/tensorflow/python/eager/BUILD @@ -36,7 +36,7 @@ cc_library( "//tensorflow/c/eager:tape", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core/common_runtime/eager:tensor_handle", "//tensorflow/core/platform:logging", "//tensorflow/core/platform:types", diff --git a/tensorflow/stream_executor/lib/BUILD b/tensorflow/stream_executor/lib/BUILD index e1c2a72577b..ef2d613d431 100644 --- a/tensorflow/stream_executor/lib/BUILD +++ b/tensorflow/stream_executor/lib/BUILD @@ -32,7 +32,7 @@ cc_library( hdrs = glob(["**/*.h"]), deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/stream_executor/platform", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 5971d41525f..7c27391edc5 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -805,7 +805,7 @@ def tf_gen_op_wrappers_cc( clean_dep("//tensorflow/core:framework"), clean_dep("//tensorflow/core:lib"), clean_dep("//tensorflow/core:ops"), - clean_dep("//tensorflow/core:protos_all_cc"), + clean_dep("//tensorflow/core:protos_all"), ]) + if_android([ clean_dep("//tensorflow/core:android_tensorflow_lib"), ]), @@ -822,7 +822,7 @@ def tf_gen_op_wrappers_cc( clean_dep("//tensorflow/core:framework"), clean_dep("//tensorflow/core:lib"), clean_dep("//tensorflow/core:ops"), - clean_dep("//tensorflow/core:protos_all_cc"), + clean_dep("//tensorflow/core:protos_all"), ]) + if_android([ clean_dep("//tensorflow/core:android_tensorflow_lib"), ]), diff --git a/tensorflow/tools/benchmark/BUILD b/tensorflow/tools/benchmark/BUILD index 93b408d522e..5c330fc6d13 100644 --- a/tensorflow/tools/benchmark/BUILD +++ b/tensorflow/tools/benchmark/BUILD @@ -37,7 +37,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:framework_lite", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", ], diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD index 06390ce9945..bb8893c4c71 100644 --- a/tensorflow/tools/graph_transforms/BUILD +++ b/tensorflow/tools/graph_transforms/BUILD @@ -32,7 +32,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -47,7 +47,7 @@ tf_cc_test( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core:test", "//tensorflow/core:test_main", @@ -67,7 +67,7 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) @@ -129,7 +129,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:graph", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "//tensorflow/core/kernels:quantization_utils", ] + if_not_windows([ @@ -197,7 +197,7 @@ tf_cc_test( "//tensorflow/core:bitwise_ops_op_lib", "//tensorflow/core:core_cpu", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -232,7 +232,7 @@ cc_library( "//tensorflow/core:framework_internal", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], alwayslink = 1, ) @@ -274,7 +274,7 @@ tf_cc_test( "//tensorflow/core:core_cpu", "//tensorflow/core:framework", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:test", "//tensorflow/core:test_main", "//tensorflow/core:testlib", @@ -294,7 +294,7 @@ cc_library( "//tensorflow/core:framework", "//tensorflow/core:framework_internal", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", ], ) diff --git a/tensorflow/tools/optimization/BUILD b/tensorflow/tools/optimization/BUILD index 73a8a15b121..071e7939d0e 100644 --- a/tensorflow/tools/optimization/BUILD +++ b/tensorflow/tools/optimization/BUILD @@ -25,7 +25,7 @@ tf_cuda_library( "//tensorflow/core:framework_internal", "//tensorflow/core:framework_lite", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", ], ) @@ -44,7 +44,7 @@ tf_cc_binary( "//tensorflow/core:framework_internal", "//tensorflow/core:framework_lite", "//tensorflow/core:lib", - "//tensorflow/core:protos_all_cc", + "//tensorflow/core:protos_all", "//tensorflow/core:tensorflow", "@com_google_absl//absl/strings", ], diff --git a/tensorflow/tools/proto_text/BUILD b/tensorflow/tools/proto_text/BUILD index 2ba510e435b..cfe310b877b 100644 --- a/tensorflow/tools/proto_text/BUILD +++ b/tensorflow/tools/proto_text/BUILD @@ -80,7 +80,7 @@ tf_generate_proto_text_sources( srcs = ["test.proto"], srcs_relative_dir = "tensorflow/tools/proto_text/", deps = [ - ":test_proto_cc", + ":test_proto", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", ], @@ -95,7 +95,7 @@ tf_cc_test( ], deps = [ ":gen_proto_text_functions_lib", - ":test_proto_cc", + ":test_proto", "//tensorflow/core:lib", "//tensorflow/core:lib_internal", "//tensorflow/core:test",