Internal change

PiperOrigin-RevId: 489502255

mediapipe/calculators/audio/BUILD

@@ -197,7 +197,6 @@ cc_library(
         ":spectrogram_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:matrix",
-        "//mediapipe/framework/formats:time_series_header_cc_proto",
         "//mediapipe/framework/port:core_proto",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",

mediapipe/calculators/core/BUILD

@@ -341,7 +341,6 @@ cc_test(
     srcs = ["concatenate_proto_list_calculator_test.cc"],
     deps = [
         ":concatenate_proto_list_calculator",
-        ":concatenate_vector_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework:timestamp",
@@ -403,7 +402,6 @@ cc_test(
     srcs = ["clip_vector_size_calculator_test.cc"],
     deps = [
         ":clip_vector_size_calculator",
-        "//mediapipe/calculators/core:packet_resampler_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework:timestamp",
@@ -956,10 +954,10 @@ cc_library(
     deps = [
         ":split_vector_calculator_cc_proto",
         "//mediapipe/framework/formats:detection_cc_proto",
-        "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework/formats:landmark_cc_proto",
         "//mediapipe/framework/formats:classification_cc_proto",
+        "//mediapipe/framework/formats:landmark_cc_proto",
         "//mediapipe/framework/formats:rect_cc_proto",
+        "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/formats:tensor",
         "//mediapipe/framework/port:ret_check",

mediapipe/calculators/image/BUILD

@@ -159,8 +159,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":set_alpha_calculator_cc_proto",
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image_frame_opencv",
@@ -186,8 +186,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":bilateral_filter_calculator_cc_proto",
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "@com_google_absl//absl/strings",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
@@ -290,10 +290,10 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":image_cropping_calculator_cc_proto",
+        "//mediapipe/framework/formats:rect_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image_frame_opencv",
-        "//mediapipe/framework/formats:rect_cc_proto",
         "//mediapipe/framework/port:opencv_core",
         "//mediapipe/framework/port:opencv_imgproc",
         "//mediapipe/framework/port:ret_check",
@@ -361,12 +361,12 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":recolor_calculator_cc_proto",
+        "//mediapipe/util:color_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image_frame_opencv",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/port:ret_check",
-        "//mediapipe/util:color_cc_proto",
         "//mediapipe/framework/port:opencv_core",
         "//mediapipe/framework/port:opencv_imgproc",
     ] + select({
@@ -630,8 +630,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":segmentation_smoothing_calculator_cc_proto",
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image",

mediapipe/calculators/tensor/BUILD

@@ -433,6 +433,7 @@ cc_library(
     }),
     visibility = ["//visibility:public"],
     deps = [
+        ":inference_calculator_cc_proto",
         ":inference_calculator_options_lib",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/api2:node",
@@ -794,12 +795,12 @@ cc_library(
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/types:span",
         "//mediapipe/framework/api2:node",
+        "//mediapipe/framework/formats/object_detection:anchor_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:port",
         "//mediapipe/framework/deps:file_path",
         "//mediapipe/framework/formats:location",
         "//mediapipe/framework/formats:tensor",
-        "//mediapipe/framework/formats/object_detection:anchor_cc_proto",
         "//mediapipe/framework/port:ret_check",
     ] + selects.with_or({
         ":compute_shader_unavailable": [],
@@ -1279,7 +1280,6 @@ cc_library(
             "//mediapipe/gpu:MPPMetalHelper",
             "@com_google_absl//absl/strings",
             "//mediapipe/framework:calculator_framework",
-            "//mediapipe/framework/formats:rect_cc_proto",
             "//mediapipe/framework/formats:tensor",
             "//mediapipe/framework/port:ret_check",
             "//mediapipe/framework/port:status",
@@ -1378,9 +1378,9 @@ cc_library(
         "//mediapipe/framework:calculator_context",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:port",
+        "//mediapipe/gpu:gpu_origin_cc_proto",
         "//mediapipe/util:resource_util",
         "@org_tensorflow//tensorflow/lite:framework",
-        "//mediapipe/gpu:gpu_origin_cc_proto",
         "//mediapipe/framework/port:statusor",
     ] + selects.with_or({
         "//mediapipe/gpu:disable_gpu": [],

mediapipe/calculators/tensorflow/BUILD

@@ -346,8 +346,8 @@ cc_library(
     srcs = ["matrix_to_tensor_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework/formats:time_series_header_cc_proto",
         ":matrix_to_tensor_calculator_options_cc_proto",
+        "//mediapipe/framework/formats:time_series_header_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/port:status",
@@ -414,7 +414,7 @@ cc_library(
         "//mediapipe/calculators/image:opencv_image_encoder_calculator_cc_proto",
         "//mediapipe/calculators/tensorflow:pack_media_sequence_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework/formats:detection_cc_proto",  # build_cleaner: keep
+        "//mediapipe/framework/formats:detection_cc_proto",
         "//mediapipe/framework/formats:location",
         "//mediapipe/framework/formats:location_opencv",
         "//mediapipe/framework/port:opencv_imgcodecs",
@@ -451,8 +451,8 @@ cc_library(
     srcs = ["tensorflow_inference_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        ":tensorflow_session",
         ":tensorflow_inference_calculator_cc_proto",
+        ":tensorflow_session",
         "@com_google_absl//absl/log:check",
         "//mediapipe/framework:timestamp",
         "@com_google_absl//absl/base:core_headers",
@@ -515,6 +515,7 @@ cc_library(
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/port:ret_check",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
     ] + select({
         "//conditions:default": [
             "//mediapipe/framework/port:file_helpers",
@@ -546,6 +547,7 @@ cc_library(
         "//mediapipe/framework/deps:clock",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:ret_check",
+        "@org_tensorflow//tensorflow/core:protos_all_cc",
     ] + select({
         "//conditions:default": [
             "//mediapipe/framework/port:file_helpers",
@@ -666,8 +668,8 @@ cc_library(
     srcs = ["tensor_to_matrix_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework/formats:time_series_header_cc_proto",
         ":tensor_to_matrix_calculator_cc_proto",
+        "//mediapipe/framework/formats:time_series_header_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:matrix",
         "//mediapipe/framework/port:status",
@@ -704,10 +706,10 @@ cc_library(
     srcs = ["tensor_to_vector_float_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
+        ":tensor_to_vector_float_calculator_options_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/port:status",
         "//mediapipe/framework/port:ret_check",
-        ":tensor_to_vector_float_calculator_options_cc_proto",
     ] + select({
         "//conditions:default": [
             "@org_tensorflow//tensorflow/core:framework",
@@ -1083,7 +1085,6 @@ cc_test(
     linkstatic = 1,
     deps = [
         ":tensor_to_image_frame_calculator",
-        ":tensor_to_image_frame_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
         "//mediapipe/framework/formats:image_frame",
@@ -1236,6 +1237,7 @@ cc_test(
     data = [":test_frozen_graph"],
     linkstatic = 1,
     deps = [
+        ":tensorflow_inference_calculator_cc_proto",
         ":tensorflow_session",
         ":tensorflow_inference_calculator",
         ":tensorflow_session_from_frozen_graph_generator",

mediapipe/calculators/tflite/BUILD

@@ -289,8 +289,8 @@ cc_library(
     }),
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/util/tflite:config",
         ":tflite_converter_calculator_cc_proto",
+        "//mediapipe/util/tflite:config",
         "//mediapipe/util:resource_util",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
@@ -410,15 +410,15 @@ cc_library(
     }),
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/util/tflite:config",
         ":tflite_tensors_to_detections_calculator_cc_proto",
         "//mediapipe/framework/formats:detection_cc_proto",
+        "//mediapipe/framework/formats/object_detection:anchor_cc_proto",
+        "//mediapipe/util/tflite:config",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/types:span",
         "//mediapipe/framework/deps:file_path",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:location",
-        "//mediapipe/framework/formats/object_detection:anchor_cc_proto",
         "//mediapipe/framework/port:ret_check",
         "@org_tensorflow//tensorflow/lite:framework",
     ] + selects.with_or({

mediapipe/calculators/util/BUILD

@@ -23,8 +23,8 @@ cc_library(
     srcs = ["alignment_points_to_rects_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
+        ":detections_to_rects_calculator_cc_proto",
         "//mediapipe/calculators/util:detections_to_rects_calculator",
-        "//mediapipe/calculators/util:detections_to_rects_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:detection_cc_proto",
@@ -266,8 +266,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":annotation_overlay_calculator_cc_proto",
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/util:color_cc_proto",
         "@com_google_absl//absl/strings",
         "//mediapipe/framework:calculator_framework",
@@ -755,7 +755,6 @@ cc_library(
     deps = [
         ":labels_to_render_data_calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:classification_cc_proto",
         "//mediapipe/framework/formats:video_stream_header",
         "//mediapipe/framework/port:ret_check",
@@ -1313,8 +1312,8 @@ cc_library(
     srcs = ["to_image_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/api2:node",
         "//mediapipe/framework/formats:image_frame",
@@ -1336,8 +1335,8 @@ cc_library(
     srcs = ["from_image_calculator.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework:calculator_options_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image",

mediapipe/calculators/video/BUILD

@@ -342,12 +342,12 @@ cc_library(
         "//mediapipe/framework/port:opencv_features2d",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
+        "//mediapipe/util/tracking:box_tracker_cc_proto",
+        "//mediapipe/util/tracking:flow_packager_cc_proto",
         "//mediapipe/util:resource_util",
         "//mediapipe/util/tracking",
         "//mediapipe/util/tracking:box_detector",
         "//mediapipe/util/tracking:box_tracker",
-        "//mediapipe/util/tracking:box_tracker_cc_proto",
-        "//mediapipe/util/tracking:flow_packager_cc_proto",
         "//mediapipe/util/tracking:tracking_visualization_utilities",
     ] + select({
         "//mediapipe:android": [

mediapipe/framework/BUILD

@@ -1039,7 +1039,6 @@ cc_library(
         ":graph_service_manager",
         ":port",
         "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework/deps:registration",
         "//mediapipe/framework/port:ret_check",
         "//mediapipe/framework/port:status",
@@ -1660,9 +1659,6 @@ cc_test(
         "//mediapipe/calculators/core:constant_side_packet_calculator",
         "//mediapipe/calculators/core:default_side_packet_calculator",
         "//mediapipe/calculators/core:pass_through_calculator",
-        "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/framework:packet_generator_cc_proto",
-        "//mediapipe/framework:status_handler_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
         "//mediapipe/framework/tool:template_parser",

mediapipe/framework/formats/BUILD

@@ -133,9 +133,9 @@ cc_library(
         "//visibility:public",
     ],
     deps = [
+        ":affine_transform_data_cc_proto",
         "//mediapipe/framework:port",
         "//mediapipe/framework:type_map",
-        "//mediapipe/framework/formats:affine_transform_data_cc_proto",
         "//mediapipe/framework/port:integral_types",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:point",
@@ -209,8 +209,8 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "@com_google_protobuf//:protobuf",
-        "//mediapipe/framework/formats:location_data_cc_proto",
         "//mediapipe/framework/formats/annotation:locus_cc_proto",
+        "//mediapipe/framework/formats:location_data_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/strings",
@@ -241,6 +241,7 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         ":location",
+        "//mediapipe/framework/formats/annotation:rasterization_cc_proto",
         "//mediapipe/framework/port:opencv_imgproc",
     ],
     alwayslink = 1,
@@ -251,6 +252,7 @@ cc_test(
     srcs = ["location_opencv_test.cc"],
     deps = [
         ":location_opencv",
+        "//mediapipe/framework/formats/annotation:rasterization_cc_proto",
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:rectangle",
     ],
@@ -346,8 +348,8 @@ cc_library(
     }),
     visibility = ["//visibility:public"],
     deps = [
-        "//mediapipe/framework/formats:image_frame",
         "//mediapipe/framework/formats:image_format_cc_proto",
+        "//mediapipe/framework/formats:image_frame",
         "@com_google_absl//absl/synchronization",
         "//mediapipe/framework:port",
         "//mediapipe/framework:type_map",

mediapipe/framework/formats/motion/BUILD

@@ -16,10 +16,10 @@
 # Description:
 #   Working with dense optical flow in mediapipe.
 
-licenses(["notice"])
-
 load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
 
+licenses(["notice"])
+
 package(default_visibility = ["//visibility:private"])
 
 proto_library(

mediapipe/framework/profiler/BUILD

@@ -334,6 +334,10 @@ cc_library(
         "graph_profiler_stub.h",
     ],
     visibility = ["//mediapipe/framework:__pkg__"],
+    deps = [
+        "//mediapipe/framework:calculator_cc_proto",
+        "//mediapipe/framework:calculator_profile_cc_proto",
+    ],
 )
 
 cc_test(

mediapipe/framework/stream_handler/BUILD

@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
+
 licenses(["notice"])
 
 package(
@@ -20,8 +22,6 @@ package(
     features = ["-layering_check"],
 )
 
-load("//mediapipe/framework/port:build_config.bzl", "mediapipe_cc_proto_library")
-
 proto_library(
     name = "default_input_stream_handler_proto",
     srcs = ["default_input_stream_handler.proto"],

mediapipe/framework/tool/BUILD

@@ -299,12 +299,12 @@ mediapipe_cc_test(
     data = [":node_chain_subgraph.proto"],
     requires_full_emulation = False,
     deps = [
+        ":node_chain_subgraph_cc_proto",
         ":options_field_util",
         ":options_registry",
         ":options_syntax_util",
         ":options_util",
         "//mediapipe/calculators/core:flow_limiter_calculator",
-        "//mediapipe/calculators/core:flow_limiter_calculator_cc_proto",
         "//mediapipe/framework:basic_types_registration",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:calculator_runner",
@@ -312,6 +312,7 @@ mediapipe_cc_test(
         "//mediapipe/framework/port:gtest_main",
         "//mediapipe/framework/port:parse_text_proto",
         "//mediapipe/framework/port:status",
+        "//mediapipe/framework/testdata:night_light_calculator_cc_proto",
         "//mediapipe/framework/testdata:night_light_calculator_options_lib",
         "//mediapipe/framework/tool:node_chain_subgraph_options_lib",
         "//mediapipe/util:header_util",
@@ -486,7 +487,6 @@ cc_library(
     deps = [
         ":proto_util_lite",
         "//mediapipe/framework:calculator_cc_proto",
-        "//mediapipe/framework/deps:proto_descriptor_cc_proto",
         "//mediapipe/framework/port:logging",
         "//mediapipe/framework/port:numbers",
         "//mediapipe/framework/port:ret_check",
@@ -738,9 +738,7 @@ cc_test(
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
         "//mediapipe/framework:graph_service_manager",
-        "//mediapipe/framework:mediapipe_options_cc_proto",
         "//mediapipe/framework:packet",
-        "//mediapipe/framework:packet_generator_cc_proto",
         "//mediapipe/framework:packet_set",
         "//mediapipe/framework:packet_type",
         "//mediapipe/framework:status_handler",
@@ -923,7 +921,6 @@ cc_test(
         "//mediapipe/calculators/core:pass_through_calculator",
         "//mediapipe/framework:calculator_cc_proto",
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework:stream_handler_cc_proto",
         "//mediapipe/framework:subgraph",
         "//mediapipe/framework:test_calculators",
         "//mediapipe/framework/port:gtest_main",

mediapipe/gpu/BUILD

@@ -783,7 +783,6 @@ cc_library(
         ":image_frame_view",
         ":shader_util",
         "//mediapipe/framework:calculator_framework",
-        "//mediapipe/framework:calculator_cc_proto",
         "@com_google_absl//absl/base:core_headers",
         "//mediapipe/framework:calculator_context",
         "//mediapipe/framework:calculator_node",