diff --git a/mediapipe/calculators/image/BUILD b/mediapipe/calculators/image/BUILD index 172138d9e..6de54189f 100644 --- a/mediapipe/calculators/image/BUILD +++ b/mediapipe/calculators/image/BUILD @@ -154,9 +154,9 @@ cc_library( "//mediapipe/framework/formats:image_frame_opencv", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:opencv_core", + "//mediapipe/framework/port:opencv_imgproc", "//mediapipe/framework/port:status", "//mediapipe/framework/port:vector", - "//mediapipe/framework/port:opencv_imgproc", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ @@ -193,7 +193,6 @@ cc_library( srcs = ["bilateral_filter_calculator.cc"], deps = [ ":bilateral_filter_calculator_cc_proto", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_options_cc_proto", "//mediapipe/framework/formats:image_format_cc_proto", @@ -204,6 +203,7 @@ cc_library( "//mediapipe/framework/port:opencv_imgproc", "//mediapipe/framework/port:status", "//mediapipe/framework/port:vector", + "@com_google_absl//absl/strings", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ @@ -728,8 +728,6 @@ cc_library( deps = [ ":affine_transformation", ":warp_affine_calculator_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/api2:node", "//mediapipe/framework/api2:port", @@ -737,6 +735,8 @@ cc_library( "//mediapipe/framework/formats:image_frame", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ diff --git a/mediapipe/calculators/tensor/BUILD b/mediapipe/calculators/tensor/BUILD index 0636d1538..fd926a8fe 100644 --- a/mediapipe/calculators/tensor/BUILD +++ b/mediapipe/calculators/tensor/BUILD @@ -444,12 +444,12 @@ cc_library( tags = ["nomac"], deps = [ ":inference_calculator_interface", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", "//mediapipe/framework/deps:file_path", "//mediapipe/gpu:gl_calculator_helper", "//mediapipe/util/tflite:tflite_gpu_runner", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", "@org_tensorflow//tensorflow/lite:framework_stable", ] + select({ "//conditions:default": [], @@ -730,8 +730,6 @@ cc_library( }), deps = [ ":tensors_to_detections_calculator_cc_proto", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:port", "//mediapipe/framework/api2:node", @@ -741,6 +739,8 @@ cc_library( "//mediapipe/framework/formats:tensor", "//mediapipe/framework/formats/object_detection:anchor_cc_proto", "//mediapipe/framework/port:ret_check", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", ] + selects.with_or({ ":compute_shader_unavailable": [], "//conditions:default": [":tensors_to_detections_calculator_gpu_deps"], @@ -900,9 +900,6 @@ cc_library( }), deps = [ ":tensors_to_classification_calculator_cc_proto", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/api2:node", "//mediapipe/framework/formats:classification_cc_proto", @@ -911,6 +908,9 @@ cc_library( "//mediapipe/framework/port:ret_check", "//mediapipe/util:label_map_cc_proto", "//mediapipe/util:resource_util", + "@com_google_absl//absl/container:node_hash_map", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", ] + select({ "//mediapipe:android": [ "//mediapipe/util/android/file/base", @@ -1050,10 +1050,6 @@ cc_test( ":image_to_tensor_calculator", ":image_to_tensor_converter", ":image_to_tensor_utils", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_runner", "//mediapipe/framework/deps:file_path", @@ -1070,6 +1066,10 @@ cc_test( "//mediapipe/framework/port:opencv_imgproc", "//mediapipe/framework/port:parse_text_proto", "//mediapipe/util:image_test_utils", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", ] + select({ "//mediapipe:apple": [], "//conditions:default": ["//mediapipe/gpu:gl_context"], @@ -1165,7 +1165,6 @@ cc_library( ":image_to_tensor_converter", ":image_to_tensor_converter_gl_utils", ":image_to_tensor_utils", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:image", "//mediapipe/framework/formats:tensor", @@ -1175,6 +1174,7 @@ cc_library( "//mediapipe/gpu:gl_calculator_helper", "//mediapipe/gpu:gl_simple_shaders", "//mediapipe/gpu:shader_util", + "@com_google_absl//absl/strings", ], }), ) @@ -1218,15 +1218,15 @@ cc_library( "//mediapipe:apple": [ ":image_to_tensor_converter", ":image_to_tensor_utils", - "//mediapipe/gpu:MPPMetalHelper", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:image", "//mediapipe/framework/formats:tensor", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", + "//mediapipe/gpu:MPPMetalHelper", "//mediapipe/gpu:gpu_buffer_format", + "@com_google_absl//absl/strings", "@org_tensorflow//tensorflow/lite/delegates/gpu/common:shape", "@org_tensorflow//tensorflow/lite/delegates/gpu/common:types", ], @@ -1247,8 +1247,6 @@ cc_library( }), deps = [ ":image_to_tensor_calculator_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/types:optional", "//mediapipe/framework/api2:packet", "//mediapipe/framework/api2:port", "//mediapipe/framework/formats:image", @@ -1257,6 +1255,8 @@ cc_library( "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:statusor", "//mediapipe/gpu:gpu_origin_cc_proto", + "@com_google_absl//absl/status", + "@com_google_absl//absl/types:optional", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": ["//mediapipe/gpu:gpu_buffer"], @@ -1306,9 +1306,6 @@ cc_library( }), deps = [ ":tensors_to_segmentation_calculator_cc_proto", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_context", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:port", @@ -1319,6 +1316,9 @@ cc_library( "//mediapipe/framework/port:statusor", "//mediapipe/gpu:gpu_origin_cc_proto", "//mediapipe/util:resource_util", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", "@org_tensorflow//tensorflow/lite:framework", ] + selects.with_or({ "//mediapipe/gpu:disable_gpu": [], diff --git a/mediapipe/calculators/tensorflow/BUILD b/mediapipe/calculators/tensorflow/BUILD index e1a17bc36..e7cc9cc94 100644 --- a/mediapipe/calculators/tensorflow/BUILD +++ b/mediapipe/calculators/tensorflow/BUILD @@ -404,11 +404,6 @@ cc_library( deps = [ ":tensorflow_inference_calculator_cc_proto", ":tensorflow_session", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", "//mediapipe/framework:calculator_context", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:packet", @@ -418,6 +413,11 @@ cc_library( "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/tool:status_util", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/log:check", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ "@org_tensorflow//tensorflow/core:framework", @@ -523,11 +523,11 @@ cc_library( deps = [ ":tensorflow_session", ":tensorflow_session_from_saved_model_calculator_cc_proto", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/deps:file_path", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", + "@com_google_absl//absl/strings", "@org_tensorflow//tensorflow/cc/saved_model:constants", "@org_tensorflow//tensorflow/cc/saved_model:loader_lite", "@org_tensorflow//tensorflow/cc/saved_model:tag_constants", @@ -580,14 +580,14 @@ cc_library( deps = [ ":tensorflow_session", ":tensorflow_session_from_saved_model_generator_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "//mediapipe/framework:packet_generator", "//mediapipe/framework:packet_type", "//mediapipe/framework/deps:file_path", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/tool:status_util", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", "@org_tensorflow//tensorflow/cc/saved_model:constants", "@org_tensorflow//tensorflow/cc/saved_model:loader_lite", "@org_tensorflow//tensorflow/cc/saved_model:tag_constants", @@ -686,11 +686,11 @@ cc_library( srcs = ["tensor_to_vector_int_calculator.cc"], deps = [ ":tensor_to_vector_int_calculator_options_cc_proto", - "@com_google_absl//absl/base:core_headers", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", + "@com_google_absl//absl/base:core_headers", ] + select({ "//conditions:default": [ "@org_tensorflow//tensorflow/core:framework", @@ -1194,7 +1194,6 @@ cc_test( ":tensorflow_session", ":tensorflow_session_from_frozen_graph_generator", ":tensorflow_session_from_frozen_graph_generator_cc_proto", - "@com_google_absl//absl/flags:flag", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_runner", "//mediapipe/framework/deps:file_path", @@ -1202,6 +1201,7 @@ cc_test( "//mediapipe/framework/port:integral_types", "//mediapipe/framework/tool:sink", "//mediapipe/framework/tool:validate_type", + "@com_google_absl//absl/flags:flag", ] + select({ "//conditions:default": [ "@org_tensorflow//tensorflow/core:direct_session", diff --git a/mediapipe/calculators/tflite/BUILD b/mediapipe/calculators/tflite/BUILD index 7f4b8aa60..435ea9fc1 100644 --- a/mediapipe/calculators/tflite/BUILD +++ b/mediapipe/calculators/tflite/BUILD @@ -202,12 +202,12 @@ cc_library( }), deps = [ ":tflite_inference_calculator_cc_proto", - "@com_google_absl//absl/memory", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/stream_handler:fixed_size_input_stream_handler", "//mediapipe/util/tflite:config", "//mediapipe/util/tflite:tflite_model_loader", + "@com_google_absl//absl/memory", "@org_tensorflow//tensorflow/lite:framework", "@org_tensorflow//tensorflow/lite/delegates/xnnpack:xnnpack_delegate", "@org_tensorflow//tensorflow/lite/kernels:builtin_ops", @@ -335,8 +335,6 @@ cc_library( srcs = ["tflite_tensors_to_segmentation_calculator.cc"], deps = [ ":tflite_tensors_to_segmentation_calculator_cc_proto", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_context", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:image_frame", @@ -345,6 +343,8 @@ cc_library( "//mediapipe/framework/port:opencv_imgproc", "//mediapipe/framework/port:ret_check", "//mediapipe/util:resource_util", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", "@org_tensorflow//tensorflow/lite:framework", ] + selects.with_or({ ":gpu_inference_disabled": [], @@ -402,8 +402,6 @@ cc_library( }), deps = [ ":tflite_tensors_to_detections_calculator_cc_proto", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/deps:file_path", "//mediapipe/framework/formats:detection_cc_proto", @@ -411,6 +409,8 @@ cc_library( "//mediapipe/framework/formats/object_detection:anchor_cc_proto", "//mediapipe/framework/port:ret_check", "//mediapipe/util/tflite:config", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", "@org_tensorflow//tensorflow/lite:framework", ] + selects.with_or({ ":gpu_inference_disabled": [], @@ -437,14 +437,14 @@ cc_library( srcs = ["tflite_tensors_to_classification_calculator.cc"], deps = [ ":tflite_tensors_to_classification_calculator_cc_proto", - "@com_google_absl//absl/container:node_hash_map", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:span", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:classification_cc_proto", "//mediapipe/framework/formats:location", "//mediapipe/framework/port:ret_check", "//mediapipe/util:resource_util", + "@com_google_absl//absl/container:node_hash_map", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:span", "@org_tensorflow//tensorflow/lite:framework", ] + select({ "//mediapipe:android": [ diff --git a/mediapipe/calculators/util/BUILD b/mediapipe/calculators/util/BUILD index 4293e4b37..dc670d5a0 100644 --- a/mediapipe/calculators/util/BUILD +++ b/mediapipe/calculators/util/BUILD @@ -246,7 +246,6 @@ cc_library( srcs = ["annotation_overlay_calculator.cc"], deps = [ ":annotation_overlay_calculator_cc_proto", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_options_cc_proto", "//mediapipe/framework/formats:image_format_cc_proto", @@ -261,6 +260,7 @@ cc_library( "//mediapipe/util:annotation_renderer", "//mediapipe/util:color_cc_proto", "//mediapipe/util:render_data_cc_proto", + "@com_google_absl//absl/strings", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ @@ -278,7 +278,6 @@ cc_library( srcs = ["detection_label_id_to_text_calculator.cc"], deps = [ ":detection_label_id_to_text_calculator_cc_proto", - "@com_google_absl//absl/container:node_hash_map", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:packet", "//mediapipe/framework/formats:detection_cc_proto", @@ -287,6 +286,7 @@ cc_library( "//mediapipe/framework/port:status", "//mediapipe/util:label_map_cc_proto", "//mediapipe/util:resource_util", + "@com_google_absl//absl/container:node_hash_map", ] + select({ "//mediapipe:android": [ "//mediapipe/util/android/file/base", @@ -309,12 +309,12 @@ cc_library( srcs = ["timed_box_list_id_to_label_calculator.cc"], deps = [ ":timed_box_list_id_to_label_calculator_cc_proto", - "@com_google_absl//absl/container:node_hash_map", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:packet", "//mediapipe/framework/port:status", "//mediapipe/util:resource_util", "//mediapipe/util/tracking:box_tracker_cc_proto", + "@com_google_absl//absl/container:node_hash_map", ] + select({ "//mediapipe:android": [ "//mediapipe/util/android/file/base", @@ -1020,13 +1020,13 @@ cc_library( srcs = ["top_k_scores_calculator.cc"], deps = [ ":top_k_scores_calculator_cc_proto", - "@com_google_absl//absl/container:node_hash_map", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:classification_cc_proto", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", "//mediapipe/util:resource_util", + "@com_google_absl//absl/container:node_hash_map", ] + select({ "//mediapipe:android": [ "//mediapipe/util/android/file/base", diff --git a/mediapipe/calculators/video/BUILD b/mediapipe/calculators/video/BUILD index a4ff2f8c0..52602ed48 100644 --- a/mediapipe/calculators/video/BUILD +++ b/mediapipe/calculators/video/BUILD @@ -308,8 +308,6 @@ cc_library( srcs = ["box_detector_calculator.cc"], deps = [ ":box_detector_calculator_cc_proto", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", "//mediapipe/framework:calculator_framework", "//mediapipe/framework/formats:image_frame", "//mediapipe/framework/formats:image_frame_opencv", @@ -327,6 +325,8 @@ cc_library( "//mediapipe/util/tracking:box_tracker_cc_proto", "//mediapipe/util/tracking:flow_packager_cc_proto", "//mediapipe/util/tracking:tracking_visualization_utilities", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", ] + select({ "//mediapipe:android": [ "//mediapipe/util/android/file/base", diff --git a/mediapipe/examples/ios/faceeffect/BUILD b/mediapipe/examples/ios/faceeffect/BUILD index 7d3a75cc6..1152bed33 100644 --- a/mediapipe/examples/ios/faceeffect/BUILD +++ b/mediapipe/examples/ios/faceeffect/BUILD @@ -75,14 +75,14 @@ objc_library( features = ["-layering_check"], deps = [ "//mediapipe/framework/formats:matrix_data_cc_proto", - "//third_party/apple_frameworks:AVFoundation", - "//third_party/apple_frameworks:CoreGraphics", - "//third_party/apple_frameworks:CoreMedia", - "//third_party/apple_frameworks:UIKit", "//mediapipe/modules/face_geometry/protos:face_geometry_cc_proto", "//mediapipe/objc:mediapipe_framework_ios", "//mediapipe/objc:mediapipe_input_sources_ios", "//mediapipe/objc:mediapipe_layer_renderer", + "//third_party/apple_frameworks:AVFoundation", + "//third_party/apple_frameworks:CoreGraphics", + "//third_party/apple_frameworks:CoreMedia", + "//third_party/apple_frameworks:UIKit", ] + select({ "//mediapipe:ios_i386": [], "//mediapipe:ios_x86_64": [], diff --git a/mediapipe/framework/formats/BUILD b/mediapipe/framework/formats/BUILD index bd0aa7f47..496094c5f 100644 --- a/mediapipe/framework/formats/BUILD +++ b/mediapipe/framework/formats/BUILD @@ -151,10 +151,6 @@ cc_library( hdrs = ["image_frame.h"], deps = [ ":image_format_cc_proto", - "@com_google_absl//absl/base", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", "//mediapipe/framework:port", "//mediapipe/framework/port:aligned_malloc_and_free", "//mediapipe/framework/port:core_proto", @@ -162,6 +158,10 @@ cc_library( "//mediapipe/framework/port:logging", "//mediapipe/framework/port:source_location", "//mediapipe/framework/tool:type_util", + "@com_google_absl//absl/base", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", ] + select({ "//conditions:default": [ ], @@ -201,12 +201,10 @@ cc_library( hdrs = ["location.h"], deps = [ ":location_data_cc_proto", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/strings", "//mediapipe/framework:port", "//mediapipe/framework:type_map", "//mediapipe/framework/formats/annotation:locus_cc_proto", + "//mediapipe/framework/formats/annotation:rasterization_cc_proto", "//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:point", @@ -215,8 +213,10 @@ cc_library( "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", "//mediapipe/framework/tool:status_util", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", "@com_google_protobuf//:protobuf", - "//mediapipe/framework/formats/annotation:rasterization_cc_proto", ] + select({ "//conditions:default": [ ], @@ -334,12 +334,12 @@ cc_library( deps = [ ":image_format_cc_proto", ":image_frame", - "@com_google_absl//absl/synchronization", "//mediapipe/framework:port", "//mediapipe/framework:type_map", "//mediapipe/framework/port:logging", "//mediapipe/gpu:gpu_buffer", "//mediapipe/gpu:gpu_buffer_format", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ "//mediapipe/gpu:gl_texture_buffer", @@ -361,10 +361,10 @@ cc_library( deps = [ ":image", ":image_frame_pool", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/synchronization", "//mediapipe/framework:port", "//mediapipe/framework/port:logging", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ "//mediapipe/gpu:gl_base", @@ -464,11 +464,11 @@ cc_library( ], }), deps = [ + "//mediapipe/framework:port", + "//mediapipe/framework/port:logging", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", "@com_google_absl//absl/synchronization", - "//mediapipe/framework:port", - "//mediapipe/framework/port:logging", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ diff --git a/mediapipe/framework/profiler/BUILD b/mediapipe/framework/profiler/BUILD index 38d72b265..53aeb1eaf 100644 --- a/mediapipe/framework/profiler/BUILD +++ b/mediapipe/framework/profiler/BUILD @@ -102,32 +102,32 @@ cc_library( ], visibility = ["//visibility:private"], deps = [ - ":profiler_resource_util", ":graph_tracer", - ":trace_buffer", + ":profiler_resource_util", ":sharded_map", + ":trace_buffer", + ":web_performance_profiling", "//mediapipe/framework:calculator_cc_proto", - "//mediapipe/framework:calculator_profile_cc_proto", - "//mediapipe/framework/port:file_helpers", - "//mediapipe/framework/port:integral_types", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/synchronization", - "@com_google_absl//absl/time", - "//mediapipe/framework/deps:clock", "//mediapipe/framework:calculator_context", + "//mediapipe/framework:calculator_profile_cc_proto", "//mediapipe/framework:executor", "//mediapipe/framework:validated_graph_config", - "//mediapipe/framework/tool:tag_map", - "//mediapipe/framework/tool:validate_name", + "//mediapipe/framework/deps:clock", + "//mediapipe/framework/port:advanced_proto_lite", + "//mediapipe/framework/port:file_helpers", + "//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:re2", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", - "//mediapipe/framework/port:advanced_proto_lite", "//mediapipe/framework/tool:name_util", - ":web_performance_profiling", + "//mediapipe/framework/tool:tag_map", + "//mediapipe/framework/tool:validate_name", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/synchronization", + "@com_google_absl//absl/time", + "@com_google_absl//absl/types:optional", ] + select({ "//conditions:default": [], }) + select({ @@ -314,12 +314,12 @@ cc_library( }), visibility = ["//visibility:private"], deps = [ - "@com_google_absl//absl/flags:flag", "//mediapipe/framework/deps:file_path", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", + "@com_google_absl//absl/flags:flag", ] + select({ "//conditions:default": [ "//mediapipe/framework/port:file_helpers", diff --git a/mediapipe/gpu/BUILD b/mediapipe/gpu/BUILD index d74e8ad34..2f7f7ec33 100644 --- a/mediapipe/gpu/BUILD +++ b/mediapipe/gpu/BUILD @@ -191,9 +191,9 @@ cc_library( ":gl_base", ":gl_thread_collector", ":gpu_buffer_format", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", "//mediapipe/framework:executor", + "//mediapipe/framework:mediapipe_profiling", + "//mediapipe/framework:timestamp", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", @@ -202,9 +202,9 @@ cc_library( "@com_google_absl//absl/base:dynamic_annotations", "@com_google_absl//absl/debugging:leak_check", "@com_google_absl//absl/memory", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/synchronization", - "//mediapipe/framework:mediapipe_profiling", - "//mediapipe/framework:timestamp", ] + select({ "//conditions:default": [], "//mediapipe:apple": [ @@ -289,11 +289,11 @@ cc_library( ":gpu_buffer_format", ":gpu_buffer_storage", ":gpu_buffer_storage_image_frame", + "//mediapipe/framework/formats:image_frame", + "//mediapipe/framework/port:logging", "@com_google_absl//absl/functional:bind_front", "@com_google_absl//absl/strings", "@com_google_absl//absl/synchronization", - "//mediapipe/framework/formats:image_frame", - "//mediapipe/framework/port:logging", ] + select({ "//conditions:default": [ ":gl_texture_buffer", @@ -324,10 +324,10 @@ cc_library( hdrs = ["gpu_buffer_format.h"], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/container:flat_hash_map", "//mediapipe/framework/deps:no_destructor", "//mediapipe/framework/formats:image_format_cc_proto", "//mediapipe/framework/port:logging", + "@com_google_absl//absl/container:flat_hash_map", ] + select({ "//conditions:default": [ ":gl_base", @@ -697,13 +697,13 @@ cc_library( ":gpu_buffer", ":gpu_shared_data_header", ":multi_pool", - "@com_google_absl//absl/hash", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/synchronization", "//mediapipe/framework:calculator_context", "//mediapipe/framework:calculator_node", "//mediapipe/framework/port:logging", "//mediapipe/util:resource_cache", + "@com_google_absl//absl/hash", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ ":gl_texture_buffer", @@ -794,9 +794,6 @@ cc_library( ":graph_support", ":image_frame_view", ":shader_util", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/synchronization", "//mediapipe/framework:calculator_context", "//mediapipe/framework:calculator_contract", "//mediapipe/framework:calculator_framework", @@ -814,6 +811,9 @@ cc_library( "//mediapipe/framework/port:map_util", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ ], @@ -1152,15 +1152,15 @@ objc_library( ], features = ["-layering_check"], deps = [ - ":metal_shared_resources", ":gl_scaler_calculator", ":gpu_buffer_to_image_frame_calculator", ":gpu_shared_data_internal", ":image_frame_to_gpu_buffer_calculator", + ":metal_shared_resources", + "//mediapipe/framework/port:threadpool", + "//mediapipe/framework/tool:source", "//mediapipe/objc:MPPGraphTestBase", "//mediapipe/objc:mediapipe_framework_ios", - "//mediapipe/framework/tool:source", - "//mediapipe/framework/port:threadpool", "@com_google_absl//absl/memory", ] + select({ "//mediapipe:ios_i386": [], diff --git a/mediapipe/java/com/google/mediapipe/framework/jni/BUILD b/mediapipe/java/com/google/mediapipe/framework/jni/BUILD index fa9ccffe9..b40391f49 100644 --- a/mediapipe/java/com/google/mediapipe/framework/jni/BUILD +++ b/mediapipe/java/com/google/mediapipe/framework/jni/BUILD @@ -84,10 +84,6 @@ cc_library( deps = [ ":class_registry", ":jni_util", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/synchronization", - "@eigen_archive//:eigen3", "//mediapipe/framework:calculator_cc_proto", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_profile_cc_proto", @@ -106,6 +102,10 @@ cc_library( "//mediapipe/framework/stream_handler:fixed_size_input_stream_handler", "//mediapipe/framework/tool:executor_util", "//mediapipe/framework/tool:name_util", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/synchronization", + "@eigen_archive//:eigen3", ] + select({ "//conditions:default": [ "//mediapipe/framework/port:file_helpers", @@ -116,13 +116,13 @@ cc_library( ], }) + select({ "//conditions:default": [ + "//mediapipe/gpu:egl_surface_holder", "//mediapipe/gpu:gl_calculator_helper", "//mediapipe/gpu:gl_quad_renderer", "//mediapipe/gpu:gl_surface_sink_calculator", "//mediapipe/gpu:gpu_buffer", "//mediapipe/gpu:gpu_shared_data_internal", "//mediapipe/gpu:graph_support", - "//mediapipe/gpu:egl_surface_holder", ], "//mediapipe/gpu:disable_gpu": [ "//mediapipe/gpu:gpu_shared_data_internal", @@ -137,9 +137,9 @@ cc_library( hdrs = ["jni_util.h"], deps = [ ":class_registry", - "@com_google_absl//absl/synchronization", "//mediapipe/framework/port:logging", "//mediapipe/framework/port:status", + "@com_google_absl//absl/synchronization", ] + select({ "//conditions:default": [ ], @@ -172,10 +172,10 @@ cc_library( ":class_registry", ":loose_headers", ":mediapipe_framework_jni", + "//mediapipe/framework/port:logging", "@com_google_absl//absl/container:node_hash_map", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", - "//mediapipe/framework/port:logging", ] + select({ "//conditions:default": [ ], diff --git a/mediapipe/model_maker/python/vision/object_detector/object_detector_test.py b/mediapipe/model_maker/python/vision/object_detector/object_detector_test.py index c33b431fb..3feb75f2e 100644 --- a/mediapipe/model_maker/python/vision/object_detector/object_detector_test.py +++ b/mediapipe/model_maker/python/vision/object_detector/object_detector_test.py @@ -14,6 +14,7 @@ import os import tempfile +import unittest # pylint:disable=unused-import from unittest import mock as unittest_mock from absl.testing import parameterized @@ -27,6 +28,7 @@ from mediapipe.model_maker.python.vision.object_detector import object_detector_ from mediapipe.tasks.python.test import test_utils as task_test_utils +@unittest.skip('b/275624089') class ObjectDetectorTest(tf.test.TestCase, parameterized.TestCase): def setUp(self): diff --git a/mediapipe/python/BUILD b/mediapipe/python/BUILD index a5b52a533..a9fd97cdd 100644 --- a/mediapipe/python/BUILD +++ b/mediapipe/python/BUILD @@ -90,13 +90,13 @@ cc_library( deps = [ "//mediapipe/tasks/cc/audio/audio_classifier:audio_classifier_graph", "//mediapipe/tasks/cc/audio/audio_embedder:audio_embedder_graph", + "//mediapipe/tasks/cc/vision/face_detector:face_detector_graph", + "//mediapipe/tasks/cc/vision/face_landmarker:face_landmarker_graph", "//mediapipe/tasks/cc/vision/gesture_recognizer:gesture_recognizer_graph", "//mediapipe/tasks/cc/vision/image_classifier:image_classifier_graph", "//mediapipe/tasks/cc/vision/image_embedder:image_embedder_graph", "//mediapipe/tasks/cc/vision/image_segmenter:image_segmenter_graph", "//mediapipe/tasks/cc/vision/object_detector:object_detector_graph", - "//mediapipe/tasks/cc/vision/face_detector:face_detector_graph", - "//mediapipe/tasks/cc/vision/face_landmarker:face_landmarker_graph", ] + select({ # TODO: Build text_classifier_graph and text_embedder_graph on Windows. "//mediapipe:windows": [], diff --git a/mediapipe/tasks/cc/core/BUILD b/mediapipe/tasks/cc/core/BUILD index fd07045c6..8b79aeaf5 100644 --- a/mediapipe/tasks/cc/core/BUILD +++ b/mediapipe/tasks/cc/core/BUILD @@ -55,15 +55,15 @@ cc_library( srcs = ["external_file_handler.cc"], hdrs = ["external_file_handler.h"], deps = [ + "//mediapipe/framework/port:integral_types", + "//mediapipe/framework/port:status", + "//mediapipe/tasks/cc:common", + "//mediapipe/tasks/cc/core/proto:external_file_cc_proto", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", - "//mediapipe/framework/port:integral_types", - "//mediapipe/framework/port:status", - "//mediapipe/tasks/cc:common", - "//mediapipe/tasks/cc/core/proto:external_file_cc_proto", ] + select({ "//mediapipe:windows": ["@bazel_tools//tools/cpp/runfiles"], "//conditions:default": [], diff --git a/mediapipe/tasks/cc/vision/face_stylizer/calculators/BUILD b/mediapipe/tasks/cc/vision/face_stylizer/calculators/BUILD index 3017e5799..4e070b43e 100644 --- a/mediapipe/tasks/cc/vision/face_stylizer/calculators/BUILD +++ b/mediapipe/tasks/cc/vision/face_stylizer/calculators/BUILD @@ -48,8 +48,6 @@ cc_library( }), deps = [ ":tensors_to_image_calculator_cc_proto", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", "//mediapipe/calculators/tensor:image_to_tensor_utils", "//mediapipe/framework:calculator_framework", "//mediapipe/framework:calculator_options_cc_proto", @@ -67,6 +65,8 @@ cc_library( "//mediapipe/framework/port:status", "//mediapipe/framework/port:vector", "//mediapipe/gpu:gpu_origin_cc_proto", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": ["tensor_to_image_calculator_gpu_deps"], diff --git a/mediapipe/tasks/cc/vision/interactive_segmenter/BUILD b/mediapipe/tasks/cc/vision/interactive_segmenter/BUILD index ea72d3d99..13de87491 100644 --- a/mediapipe/tasks/cc/vision/interactive_segmenter/BUILD +++ b/mediapipe/tasks/cc/vision/interactive_segmenter/BUILD @@ -46,7 +46,6 @@ cc_library( name = "interactive_segmenter_graph", srcs = ["interactive_segmenter_graph.cc"], deps = [ - "@com_google_absl//absl/strings", "//mediapipe/calculators/image:set_alpha_calculator", "//mediapipe/calculators/util:annotation_overlay_calculator", "//mediapipe/calculators/util:flat_color_image_calculator", @@ -65,6 +64,7 @@ cc_library( "//mediapipe/util:color_cc_proto", "//mediapipe/util:label_map_cc_proto", "//mediapipe/util:render_data_cc_proto", + "@com_google_absl//absl/strings", ] + select({ "//mediapipe/gpu:disable_gpu": [], "//conditions:default": [ diff --git a/mediapipe/tasks/java/com/google/mediapipe/tasks/core/BUILD b/mediapipe/tasks/java/com/google/mediapipe/tasks/core/BUILD index 5f7101776..df7fe5b11 100644 --- a/mediapipe/tasks/java/com/google/mediapipe/tasks/core/BUILD +++ b/mediapipe/tasks/java/com/google/mediapipe/tasks/core/BUILD @@ -54,10 +54,10 @@ load("//mediapipe/tasks/java/com/google/mediapipe/tasks:mediapipe_tasks_aar.bzl" mediapipe_tasks_core_aar( name = "tasks_core", srcs = glob(["**/*.java"]) + [ + "//mediapipe/java/com/google/mediapipe/framework/image:java_src", "//mediapipe/tasks/java/com/google/mediapipe/tasks/components/containers:java_src", "//mediapipe/tasks/java/com/google/mediapipe/tasks/components/processors:java_src", "//mediapipe/tasks/java/com/google/mediapipe/tasks/components/utils:java_src", - "//mediapipe/java/com/google/mediapipe/framework/image:java_src", ], manifest = "AndroidManifest.xml", ) diff --git a/mediapipe/util/BUILD b/mediapipe/util/BUILD index 9c9c19b2b..a01132a96 100644 --- a/mediapipe/util/BUILD +++ b/mediapipe/util/BUILD @@ -80,12 +80,12 @@ cc_library( hdrs = ["cpu_util.h"], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/algorithm:container", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/strings", "//mediapipe/framework/port:integral_types", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", + "@com_google_absl//absl/algorithm:container", + "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/strings", ] + select({ "//conditions:default": [], "//mediapipe:android": [ @@ -198,8 +198,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":resource_util_custom", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/strings:str_format", "//mediapipe/framework/deps:file_path", "//mediapipe/framework/port:file_helpers", "//mediapipe/framework/port:logging", @@ -207,6 +205,8 @@ cc_library( "//mediapipe/framework/port:singleton", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/strings:str_format", ] + select({ "//conditions:default": [ "@com_google_absl//absl/flags:flag", @@ -253,13 +253,13 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/strings:str_format", - "@com_google_absl//absl/types:variant", "//mediapipe/framework/formats:detection_cc_proto", "//mediapipe/framework/formats:location", "//mediapipe/framework/formats:location_opencv", "//mediapipe/framework/port:map_util", "//mediapipe/framework/port:status", + "@com_google_absl//absl/strings:str_format", + "@com_google_absl//absl/types:variant", ] + select({ "//conditions:default": [ "@org_tensorflow//tensorflow/core:framework", diff --git a/mediapipe/util/android/BUILD b/mediapipe/util/android/BUILD index 73ce5f233..726732ed1 100644 --- a/mediapipe/util/android/BUILD +++ b/mediapipe/util/android/BUILD @@ -34,12 +34,12 @@ cc_library( }), visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/strings", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:singleton", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", "//mediapipe/util/android/file/base", + "@com_google_absl//absl/strings", ] + select({ "//conditions:default": [], "//mediapipe:android": [ diff --git a/mediapipe/util/tflite/BUILD b/mediapipe/util/tflite/BUILD index 0dec0392a..a0bbdbf3f 100644 --- a/mediapipe/util/tflite/BUILD +++ b/mediapipe/util/tflite/BUILD @@ -97,10 +97,10 @@ cc_library( "//mediapipe:ios": [], "//mediapipe:macos": [], "//conditions:default": [ - "@com_google_absl//absl/strings", "//mediapipe/framework/port:ret_check", "//mediapipe/framework/port:status", "//mediapipe/framework/port:statusor", + "@com_google_absl//absl/strings", "@org_tensorflow//tensorflow/lite:framework", "@org_tensorflow//tensorflow/lite/delegates/gpu:api", "@org_tensorflow//tensorflow/lite/delegates/gpu/common:model", @@ -114,8 +114,8 @@ cc_library( ], "//conditions:default": [], }) + [ - "@com_google_absl//absl/status", "//mediapipe/framework:port", + "@com_google_absl//absl/status", "@org_tensorflow//tensorflow/lite/core/api", ], )