Internal changes on cleanup.

PiperOrigin-RevId: 343332947
Change-Id: Ib6c6d9b1fae5092d4b7bdbada105b498f814e91b

tensorflow/lite/tools/BUILD

@@ -258,7 +258,7 @@ cc_library(
     srcs = ["command_line_flags.cc"],
     hdrs = ["command_line_flags.h"],
     copts = tflite_copts(),
-    deps = [":logging"],
+    deps = ["//tensorflow/lite/tools:logging"],
 )
 
 cc_test(
@@ -296,8 +296,8 @@ tf_cc_binary(
     srcs = ["list_flex_ops_main.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        ":command_line_flags",
         ":list_flex_ops",
+        "//tensorflow/lite/tools:command_line_flags",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -307,8 +307,8 @@ cc_library(
     srcs = ["list_flex_ops_main.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        ":command_line_flags",
         ":list_flex_ops",
+        "//tensorflow/lite/tools:command_line_flags",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -329,8 +329,8 @@ tf_cc_binary(
     srcs = ["list_flex_ops_main.cc"],
     visibility = ["//visibility:public"],
     deps = [
-        ":command_line_flags",
         ":list_flex_ops_no_kernel",
+        "//tensorflow/lite/tools:command_line_flags",
         "@com_google_absl//absl/strings",
     ],
 )

tensorflow/lite/tools/benchmark/BUILD

@@ -213,6 +213,7 @@ cc_library(
         ":benchmark_params",
         ":benchmark_utils",
         "//tensorflow/core/util:stats_calculator_portable",
+        "//tensorflow/lite:framework",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/profiling:memory_info",
         "//tensorflow/lite/profiling:time",

tensorflow/lite/tools/benchmark/android/BUILD

@@ -22,6 +22,10 @@ android_binary(
     # can't be built. We need to prevent the build system from trying to
     # use the target in that case.
     tags = ["manual"],
+    deps = [
+        ":hexagon_libs",
+        ":tensorflowlite_benchmark_native",
+    ],
 )
 
 tflite_jni_binary(

tensorflow/lite/tools/benchmark/experimental/firebase/android/BUILD

@@ -23,6 +23,10 @@ android_binary(
     # can't be built. We need to prevent the build system from trying to
     # use the target in that case.
     tags = ["manual"],
+    deps = [
+        ":hexagon_libs",
+        ":tensorflowlite_benchmark_firebase_native",
+    ],
 )
 
 tflite_jni_binary(

tensorflow/lite/tools/evaluation/stages/BUILD

@@ -180,6 +180,7 @@ cc_test(
     deps = [
         ":inference_profiler_stage",
         "//tensorflow/lite/c:common",
+        "//tensorflow/lite/delegates/nnapi:nnapi_delegate",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_config_cc_proto",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_stages_cc_proto",
         "@com_google_googletest//:gtest_main",

tensorflow/lite/tools/evaluation/tasks/coco_object_detection/BUILD

@@ -29,6 +29,7 @@ cc_library(
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/tools:command_line_flags",
         "//tensorflow/lite/tools:logging",
+        "//tensorflow/lite/tools/evaluation:evaluation_stage",
         "//tensorflow/lite/tools/evaluation:utils",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_config_cc_proto",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_stages_cc_proto",

tensorflow/lite/tools/evaluation/tasks/imagenet_image_classification/BUILD

@@ -17,6 +17,7 @@ cc_library(
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/tools:command_line_flags",
         "//tensorflow/lite/tools:logging",
+        "//tensorflow/lite/tools/evaluation:evaluation_stage",
         "//tensorflow/lite/tools/evaluation:utils",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_config_cc_proto",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_stages_cc_proto",

tensorflow/lite/tools/evaluation/tasks/inference_diff/BUILD

@@ -17,6 +17,7 @@ cc_library(
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/tools:command_line_flags",
         "//tensorflow/lite/tools:logging",
+        "//tensorflow/lite/tools/evaluation:evaluation_stage",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_config_cc_proto",
         "//tensorflow/lite/tools/evaluation/proto:evaluation_stages_cc_proto",
         "//tensorflow/lite/tools/evaluation/stages:inference_profiler_stage",

tensorflow/lite/tools/optimize/BUILD

@@ -43,13 +43,17 @@ tf_cc_test(
         "//tensorflow/lite/schema:schema_utils",
         "@com_google_absl//absl/memory",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
 cc_binary(
     name = "modify_model_interface_main",
     srcs = ["modify_model_interface_main.cc"],
-    deps = [":modify_model_interface"],
+    deps = [
+        ":modify_model_interface",
+        ":quantize_model",
+    ],
 )
 
 cc_library(
@@ -61,6 +65,7 @@ cc_library(
         "//tensorflow/lite:framework",
         "//tensorflow/lite/core/api",
         "//tensorflow/lite/schema:schema_fbs",
+        "@flatbuffers",
     ],
 )
 
@@ -77,7 +82,9 @@ tf_cc_test(
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
@@ -102,7 +109,9 @@ tf_cc_test(
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
@@ -112,7 +121,11 @@ cc_library(
     hdrs = ["quantization_wrapper.h"],
     deps = [
         ":quantization_wrapper_utils",
-        ":quantize_model",
+        "//tensorflow/lite:framework",
+        "//tensorflow/lite/core/api",
+        "//tensorflow/lite/schema:schema_fbs",
+        "//tensorflow/lite/tools/optimize:quantize_model",
+        "@flatbuffers",
     ],
 )
 
@@ -134,6 +147,7 @@ cc_library(
         "//tensorflow/lite/schema:schema_fbs",
         "//third_party/eigen3",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -151,6 +165,7 @@ cc_library(
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -169,6 +184,7 @@ tf_cc_test(
         "//tensorflow/lite:framework",
         "//tensorflow/lite/schema:schema_fbs",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
@@ -179,6 +195,7 @@ cc_library(
     compatible_with = get_compatible_with_cloud(),
     deps = [
         "//tensorflow/lite:framework",
+        "//tensorflow/lite/kernels/internal:types",
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
     ],
@@ -206,8 +223,11 @@ tf_cc_test(
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
         "//tensorflow/lite/testing:util",
+        "//third_party/eigen3",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
@@ -220,6 +240,7 @@ cc_library(
         ":quantization_utils",
         ":model_utils",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/container:flat_hash_map",
         "@flatbuffers",
         "//tensorflow/lite:framework",
@@ -238,10 +259,10 @@ tf_cc_test(
         "--test_model_file=$(location //tensorflow/lite/tools/optimize:testdata/single_conv_weights_min_0_max_plus_10.bin)",
     ],
     data = [
-        ":testdata/custom_op.bin",
-        ":testdata/quantized_with_gather.bin",
-        ":testdata/single_conv_weights_min_0_max_plus_10.bin",
-        ":testdata/weight_shared_between_convs.bin",
+        "//tensorflow/lite/tools/optimize:testdata/custom_op.bin",
+        "//tensorflow/lite/tools/optimize:testdata/quantized_with_gather.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_conv_weights_min_0_max_plus_10.bin",
+        "//tensorflow/lite/tools/optimize:testdata/weight_shared_between_convs.bin",
     ],
     tags = [
         "tflite_not_portable_android",
@@ -266,8 +287,10 @@ cc_library(
     srcs = ["test_util.cc"],
     hdrs = ["test_util.h"],
     deps = [
+        "//tensorflow/lite:framework",
         "//tensorflow/lite/core/api",
         "@com_google_googletest//:gtest",
+        "@flatbuffers",
     ],
 )
 
@@ -295,32 +318,32 @@ tf_cc_test(
         "--test_model_file=$(location //tensorflow/lite/tools/optimize:testdata/single_conv_weights_min_0_max_plus_10.bin)",
     ],
     data = [
-        ":testdata/add_with_const_input.bin",
-        ":testdata/argmax.bin",
-        ":testdata/concat.bin",
-        ":testdata/fc.bin",
-        ":testdata/lstm_calibrated.bin",
-        ":testdata/lstm_calibrated2.bin",
-        ":testdata/lstm_quantized.bin",
-        ":testdata/lstm_quantized2.bin",
-        ":testdata/maximum.bin",
-        ":testdata/minimum.bin",
-        ":testdata/mixed.bin",
-        ":testdata/mixed16x8.bin",
-        ":testdata/multi_input_add_reshape.bin",
-        ":testdata/pack.bin",
-        ":testdata/single_avg_pool_min_minus_5_max_plus_5.bin",
-        ":testdata/single_conv_no_bias.bin",
-        ":testdata/single_conv_weights_min_0_max_plus_10.bin",
-        ":testdata/single_conv_weights_min_minus_127_max_plus_127.bin",
-        ":testdata/single_softmax_min_minus_5_max_plus_5.bin",
-        ":testdata/split.bin",
-        ":testdata/svdf_calibrated.bin",
-        ":testdata/svdf_quantized.bin",
-        ":testdata/transpose.bin",
-        ":testdata/unidirectional_sequence_lstm_calibrated.bin",
-        ":testdata/unidirectional_sequence_lstm_quantized.bin",
-        ":testdata/unpack.bin",
+        "//tensorflow/lite/tools/optimize:testdata/add_with_const_input.bin",
+        "//tensorflow/lite/tools/optimize:testdata/argmax.bin",
+        "//tensorflow/lite/tools/optimize:testdata/concat.bin",
+        "//tensorflow/lite/tools/optimize:testdata/fc.bin",
+        "//tensorflow/lite/tools/optimize:testdata/lstm_calibrated.bin",
+        "//tensorflow/lite/tools/optimize:testdata/lstm_calibrated2.bin",
+        "//tensorflow/lite/tools/optimize:testdata/lstm_quantized.bin",
+        "//tensorflow/lite/tools/optimize:testdata/lstm_quantized2.bin",
+        "//tensorflow/lite/tools/optimize:testdata/maximum.bin",
+        "//tensorflow/lite/tools/optimize:testdata/minimum.bin",
+        "//tensorflow/lite/tools/optimize:testdata/mixed.bin",
+        "//tensorflow/lite/tools/optimize:testdata/mixed16x8.bin",
+        "//tensorflow/lite/tools/optimize:testdata/multi_input_add_reshape.bin",
+        "//tensorflow/lite/tools/optimize:testdata/pack.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_avg_pool_min_minus_5_max_plus_5.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_conv_no_bias.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_conv_weights_min_0_max_plus_10.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_conv_weights_min_minus_127_max_plus_127.bin",
+        "//tensorflow/lite/tools/optimize:testdata/single_softmax_min_minus_5_max_plus_5.bin",
+        "//tensorflow/lite/tools/optimize:testdata/split.bin",
+        "//tensorflow/lite/tools/optimize:testdata/svdf_calibrated.bin",
+        "//tensorflow/lite/tools/optimize:testdata/svdf_quantized.bin",
+        "//tensorflow/lite/tools/optimize:testdata/transpose.bin",
+        "//tensorflow/lite/tools/optimize:testdata/unidirectional_sequence_lstm_calibrated.bin",
+        "//tensorflow/lite/tools/optimize:testdata/unidirectional_sequence_lstm_quantized.bin",
+        "//tensorflow/lite/tools/optimize:testdata/unpack.bin",
     ],
     tags = [
         "tflite_not_portable_android",

tensorflow/lite/tools/optimize/calibration/BUILD

@@ -70,7 +70,9 @@ cc_library(
         "//tensorflow/lite/kernels:kernel_util",
         "//tensorflow/lite/schema:schema_fbs",
         "//tensorflow/lite/schema:schema_utils",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@flatbuffers",
     ],
 )
@@ -99,6 +101,7 @@ tf_cc_test(
         "//tensorflow/lite/kernels:builtin_ops",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -125,6 +128,7 @@ cc_test(
     deps = [
         ":logging_op_resolver",
         "//tensorflow/lite:framework",
+        "//tensorflow/lite/kernels:builtin_ops",
         "@com_google_googletest//:gtest",
     ],
 )
@@ -139,6 +143,7 @@ cc_library(
         "//tensorflow/lite:framework",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -148,6 +153,7 @@ cc_library(
     hdrs = ["calibration_logger.h"],
     copts = tflite_copts(),
     deps = [
+        "//tensorflow/lite:framework",
         "//tensorflow/lite:minimal_logging",
         "//tensorflow/lite/c:common",
         "//tensorflow/lite/core/api",

tensorflow/lite/tools/optimize/python/BUILD

@@ -26,6 +26,7 @@ py_library(
     deps = [
         ":_pywrap_modify_model_interface",
         ":modify_model_interface_constants",
+        "//tensorflow:tensorflow_py",
         "//tensorflow/lite/python:schema_py",
     ],
 )

tensorflow/lite/tools/signature/BUILD

@@ -81,7 +81,7 @@ py_library(
     srcs_version = "PY2AND3",
     deps = [
         ":_pywrap_signature_def_util_wrapper",
-        "//tensorflow/core/protobuf:meta_graph_pyclif_pb2",
+        "//tensorflow/core:protos_all_py",
     ],
 )
 
@@ -98,7 +98,7 @@ py_test(
     deps = [
         ":signature_def_utils",
         "//tensorflow:tensorflow_py",
-        "//tensorflow/core/protobuf:meta_graph_pyclif_pb2",
+        "//tensorflow/core:protos_all_py",
     ],
 )
 

tensorflow/lite/tools/versioning/BUILD

@@ -43,6 +43,7 @@ tf_cc_test(
         ":versioning",
         "//tensorflow/lite/kernels:builtin_ops",
         "//tensorflow/lite/schema:schema_fbs",
+        "//tensorflow/lite/schema:schema_fbs_with_mutable",
         "@com_google_googletest//:gtest_main",
     ],
 )