From 580219546f81b50a0e627d29d8e36ab2245578a5 Mon Sep 17 00:00:00 2001 From: Nat Jeffries Date: Tue, 26 May 2020 12:29:06 -0700 Subject: [PATCH] Clean up micro build rules and split out micro_error_reporter and micro_debug_log from micro_framework. PiperOrigin-RevId: 313245894 Change-Id: Ib6332590887b6f3d0ab7d78ccd71a0011b720408 --- tensorflow/lite/micro/BUILD | 37 ++++++++++++++++--- tensorflow/lite/micro/benchmarks/BUILD | 2 + .../lite/micro/examples/hello_world/BUILD | 4 +- .../lite/micro/examples/magic_wand/BUILD | 7 +++- .../lite/micro/examples/micro_speech/BUILD | 27 ++++++++++---- .../micro_speech/micro_features/BUILD | 3 +- .../micro/examples/person_detection/BUILD | 7 ++-- .../person_detection_experimental/BUILD | 6 ++- tensorflow/lite/micro/kernels/BUILD | 36 ++---------------- tensorflow/lite/micro/testing/BUILD | 4 +- tensorflow/lite/micro/tools/make/Makefile | 1 + 11 files changed, 77 insertions(+), 57 deletions(-) diff --git a/tensorflow/lite/micro/BUILD b/tensorflow/lite/micro/BUILD index 67471bc64a6..3b05aee30f4 100644 --- a/tensorflow/lite/micro/BUILD +++ b/tensorflow/lite/micro/BUILD @@ -25,20 +25,16 @@ cc_library( cc_library( name = "micro_framework", srcs = [ - "debug_log.cc", "memory_helpers.cc", "micro_allocator.cc", - "micro_error_reporter.cc", "micro_interpreter.cc", "micro_optional_debug_tools.cc", "simple_memory_allocator.cc", "test_helpers.cc", ], hdrs = [ - "debug_log.h", "memory_helpers.h", "micro_allocator.h", - "micro_error_reporter.h", "micro_interpreter.h", "micro_mutable_op_resolver.h", "micro_optional_debug_tools.h", @@ -49,7 +45,6 @@ cc_library( copts = micro_copts(), deps = [ ":micro_compatibility", - ":micro_string", ":micro_utils", "//tensorflow/lite:type_to_tflitetype", "//tensorflow/lite/c:common", @@ -63,6 +58,36 @@ cc_library( ], ) +cc_library( + name = "debug_log", + srcs = [ + "debug_log.cc", + ], + hdrs = [ + "debug_log.h", + ], + build_for_embedded = True, + copts = micro_copts(), +) + +cc_library( + name = "micro_error_reporter", + srcs = [ + "micro_error_reporter.cc", + ], + hdrs = [ + "micro_error_reporter.h", + ], + build_for_embedded = True, + copts = micro_copts(), + deps = [ + ":debug_log", + ":micro_compatibility", + ":micro_string", + "//tensorflow/lite/core/api", + ], +) + cc_library( name = "micro_string", srcs = [ @@ -111,7 +136,7 @@ tflite_micro_cc_test( "micro_error_reporter_test.cc", ], deps = [ - ":micro_framework", + ":micro_error_reporter", ], ) diff --git a/tensorflow/lite/micro/benchmarks/BUILD b/tensorflow/lite/micro/benchmarks/BUILD index 4af3267d769..73b288d2bc1 100644 --- a/tensorflow/lite/micro/benchmarks/BUILD +++ b/tensorflow/lite/micro/benchmarks/BUILD @@ -46,6 +46,7 @@ cc_binary( deps = [ ":keyword_scrambled_model_data", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:micro_ops", "//tensorflow/lite/micro/testing:micro_benchmark", @@ -58,6 +59,7 @@ cc_binary( deps = [ "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:micro_utils", "//tensorflow/lite/micro/examples/person_detection:model_settings", diff --git a/tensorflow/lite/micro/examples/hello_world/BUILD b/tensorflow/lite/micro/examples/hello_world/BUILD index 8da319f3095..4488c192abb 100644 --- a/tensorflow/lite/micro/examples/hello_world/BUILD +++ b/tensorflow/lite/micro/examples/hello_world/BUILD @@ -35,6 +35,7 @@ tflite_micro_cc_test( deps = [ ":model", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:all_ops_resolver", "//tensorflow/lite/micro/kernels:micro_ops", @@ -54,7 +55,7 @@ cc_library( copts = micro_copts(), deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -86,6 +87,7 @@ cc_binary( ":model", ":output_handler", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:all_ops_resolver", "//tensorflow/lite/schema:schema_fbs", diff --git a/tensorflow/lite/micro/examples/magic_wand/BUILD b/tensorflow/lite/micro/examples/magic_wand/BUILD index 7d6f3cdcecd..b0be47c1eeb 100644 --- a/tensorflow/lite/micro/examples/magic_wand/BUILD +++ b/tensorflow/lite/micro/examples/magic_wand/BUILD @@ -41,6 +41,7 @@ tflite_micro_cc_test( ":magic_wand_model_data", ":sample_feature_data", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:all_ops_resolver", "//tensorflow/lite/micro/kernels:micro_ops", @@ -66,7 +67,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -78,6 +79,7 @@ tflite_micro_cc_test( deps = [ ":accelerometer_handler", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -119,7 +121,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -155,6 +157,7 @@ cc_binary( ":magic_wand_model_data", ":output_handler", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:micro_ops", "//tensorflow/lite/schema:schema_fbs", diff --git a/tensorflow/lite/micro/examples/micro_speech/BUILD b/tensorflow/lite/micro/examples/micro_speech/BUILD index e0e1ca4ad10..b487b895f7a 100644 --- a/tensorflow/lite/micro/examples/micro_speech/BUILD +++ b/tensorflow/lite/micro/examples/micro_speech/BUILD @@ -50,6 +50,7 @@ tflite_micro_cc_test( ], deps = [ "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_features_test_data", "//tensorflow/lite/micro/examples/micro_speech/micro_features:model", @@ -107,7 +108,7 @@ cc_library( deps = [ ":simple_model_settings", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -122,6 +123,7 @@ tflite_micro_cc_test( ":simple_features_generator_test_data", ":simple_model_settings", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -138,7 +140,7 @@ cc_library( deps = [ ":simple_model_settings", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -153,6 +155,7 @@ tflite_micro_cc_test( ":simple_features_generator_test_data", ":simple_model_settings", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -168,7 +171,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", ], ) @@ -184,7 +187,7 @@ cc_library( deps = [ ":audio_large_sample_test_data", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", ], ) @@ -197,6 +200,7 @@ tflite_micro_cc_test( deps = [ ":audio_provider", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", "//tensorflow/lite/micro/testing:micro_test", @@ -212,6 +216,7 @@ tflite_micro_cc_test( ":audio_large_sample_test_data", ":audio_provider_mock", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", "//tensorflow/lite/micro/testing:micro_test", @@ -229,7 +234,7 @@ cc_library( deps = [ ":audio_provider", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_features_generator", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", ], @@ -244,6 +249,7 @@ tflite_micro_cc_test( ":audio_provider", ":feature_provider", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", "//tensorflow/lite/micro/testing:micro_test", @@ -261,7 +267,7 @@ cc_library( deps = [ ":audio_provider_mock", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_features_generator", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", ], @@ -275,6 +281,7 @@ tflite_micro_cc_test( deps = [ ":feature_provider_mock", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_features_test_data", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", @@ -292,7 +299,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", ], ) @@ -308,6 +315,7 @@ tflite_micro_cc_test( deps = [ ":recognize_commands", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -323,7 +331,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -335,6 +343,7 @@ tflite_micro_cc_test( deps = [ ":command_responder", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -353,6 +362,7 @@ cc_binary( ":feature_provider", ":recognize_commands", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", "//tensorflow/lite/micro/examples/micro_speech/micro_features:model", @@ -374,6 +384,7 @@ cc_binary( ":feature_provider", ":recognize_commands", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech/micro_features:micro_model_settings", "//tensorflow/lite/micro/examples/micro_speech/micro_features:model", diff --git a/tensorflow/lite/micro/examples/micro_speech/micro_features/BUILD b/tensorflow/lite/micro/examples/micro_speech/micro_features/BUILD index 71010493102..0aa7ff14f73 100644 --- a/tensorflow/lite/micro/examples/micro_speech/micro_features/BUILD +++ b/tensorflow/lite/micro/examples/micro_speech/micro_features/BUILD @@ -59,7 +59,7 @@ cc_library( ":micro_model_settings", "//tensorflow/lite/c:common", "//tensorflow/lite/experimental/microfrontend/lib:frontend", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -85,6 +85,7 @@ tflite_micro_cc_test( ":micro_features_generator_test_data", ":micro_model_settings", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/examples/micro_speech:audio_sample_test_data", "//tensorflow/lite/micro/testing:micro_test", diff --git a/tensorflow/lite/micro/examples/person_detection/BUILD b/tensorflow/lite/micro/examples/person_detection/BUILD index cb9fdb80c33..75c1bf61fa8 100644 --- a/tensorflow/lite/micro/examples/person_detection/BUILD +++ b/tensorflow/lite/micro/examples/person_detection/BUILD @@ -56,7 +56,7 @@ cc_library( deps = [ ":model_settings", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -69,7 +69,7 @@ tflite_micro_cc_test( ":image_provider", ":model_settings", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -84,7 +84,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -112,6 +112,7 @@ cc_binary( ":model_settings", ":person_detect_model_data", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:micro_ops", "//tensorflow/lite/schema:schema_fbs", diff --git a/tensorflow/lite/micro/examples/person_detection_experimental/BUILD b/tensorflow/lite/micro/examples/person_detection_experimental/BUILD index cb9fdb80c33..49f10c814cb 100644 --- a/tensorflow/lite/micro/examples/person_detection_experimental/BUILD +++ b/tensorflow/lite/micro/examples/person_detection_experimental/BUILD @@ -56,7 +56,7 @@ cc_library( deps = [ ":model_settings", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -69,6 +69,7 @@ tflite_micro_cc_test( ":image_provider", ":model_settings", "//tensorflow/lite/c:common", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], @@ -84,7 +85,7 @@ cc_library( ], deps = [ "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", ], ) @@ -112,6 +113,7 @@ cc_binary( ":model_settings", ":person_detect_model_data", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/kernels:micro_ops", "//tensorflow/lite/schema:schema_fbs", diff --git a/tensorflow/lite/micro/kernels/BUILD b/tensorflow/lite/micro/kernels/BUILD index 50a0a4f9190..b6c6054d604 100644 --- a/tensorflow/lite/micro/kernels/BUILD +++ b/tensorflow/lite/micro/kernels/BUILD @@ -201,7 +201,7 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:debug_log", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -214,7 +214,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -228,7 +227,6 @@ tflite_micro_cc_test( ":all_ops_resolver", "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:tensor", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -242,7 +240,6 @@ tflite_micro_cc_test( ":portable_optimized_ops_resolver", "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:tensor", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -269,7 +266,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -282,7 +278,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -295,7 +290,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -308,7 +302,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:micro_utils", "//tensorflow/lite/micro/testing:micro_test", ], @@ -322,7 +315,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -335,7 +327,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -348,7 +339,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -361,7 +351,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -374,7 +363,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -387,7 +375,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -400,7 +387,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -412,9 +398,7 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_utils", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -426,9 +410,7 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_utils", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -441,7 +423,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -454,7 +435,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -467,7 +447,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -480,7 +459,7 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:debug_log", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -493,7 +472,7 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:debug_log", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -506,7 +485,7 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:debug_log", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -552,7 +531,6 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_utils", "//tensorflow/lite/c:common", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", @@ -566,7 +544,6 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_utils", "//tensorflow/lite/c:common", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", @@ -602,7 +579,6 @@ tflite_micro_cc_test( deps = [ ":all_ops_resolver", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -614,9 +590,7 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_utils", "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro/testing:micro_test", ], ) @@ -666,7 +640,6 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_ops", "//tensorflow/lite/c:common", "//tensorflow/lite/micro/testing:micro_test", ], @@ -679,7 +652,6 @@ tflite_micro_cc_test( ], deps = [ ":all_ops_resolver", - ":micro_ops", "//tensorflow/lite/c:common", "//tensorflow/lite/micro/testing:micro_test", ], diff --git a/tensorflow/lite/micro/testing/BUILD b/tensorflow/lite/micro/testing/BUILD index 245e919bb05..8db93c6eeac 100644 --- a/tensorflow/lite/micro/testing/BUILD +++ b/tensorflow/lite/micro/testing/BUILD @@ -22,6 +22,7 @@ cc_library( deps = [ "//tensorflow/lite/c:common", "//tensorflow/lite/core/api", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:micro_utils", ], @@ -43,8 +44,7 @@ cc_library( "micro_benchmark.h", ], deps = [ - "//tensorflow/lite/c:common", - "//tensorflow/lite/micro:micro_framework", + "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_time", ], ) diff --git a/tensorflow/lite/micro/tools/make/Makefile b/tensorflow/lite/micro/tools/make/Makefile index a0a32728baf..13761cca28b 100644 --- a/tensorflow/lite/micro/tools/make/Makefile +++ b/tensorflow/lite/micro/tools/make/Makefile @@ -139,6 +139,7 @@ tensorflow/lite/c/common.h \ tensorflow/lite/core/api/error_reporter.h \ tensorflow/lite/core/api/flatbuffer_conversions.h \ tensorflow/lite/core/api/op_resolver.h \ +tensorflow/lite/core/api/profiler.h \ tensorflow/lite/core/api/tensor_utils.h \ tensorflow/lite/kernels/internal/common.h \ tensorflow/lite/kernels/internal/compatibility.h \