diff --git a/tensorflow/lite/micro/benchmarks/BUILD b/tensorflow/lite/micro/benchmarks/BUILD index 2b7dd14cc1b..23faaa3e476 100644 --- a/tensorflow/lite/micro/benchmarks/BUILD +++ b/tensorflow/lite/micro/benchmarks/BUILD @@ -58,7 +58,6 @@ cc_binary( ], deps = [ ":micro_benchmark", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/c:common", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", diff --git a/tensorflow/lite/micro/benchmarks/person_detection_benchmark.cc b/tensorflow/lite/micro/benchmarks/person_detection_benchmark.cc index 7b38708e91c..dc34059ee43 100644 --- a/tensorflow/lite/micro/benchmarks/person_detection_benchmark.cc +++ b/tensorflow/lite/micro/benchmarks/person_detection_benchmark.cc @@ -24,7 +24,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_utils.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" /* * Person Detection benchmark. Evaluates runtime performance of the visual diff --git a/tensorflow/lite/micro/examples/hello_world/BUILD b/tensorflow/lite/micro/examples/hello_world/BUILD index a6be6261906..34106b4a896 100644 --- a/tensorflow/lite/micro/examples/hello_world/BUILD +++ b/tensorflow/lite/micro/examples/hello_world/BUILD @@ -34,7 +34,6 @@ 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:op_resolvers", @@ -85,7 +84,6 @@ cc_binary( ":constants", ":model", ":output_handler", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:op_resolvers", diff --git a/tensorflow/lite/micro/examples/hello_world/hello_world_test.cc b/tensorflow/lite/micro/examples/hello_world/hello_world_test.cc index 6941677b64c..f726057d981 100644 --- a/tensorflow/lite/micro/examples/hello_world/hello_world_test.cc +++ b/tensorflow/lite/micro/examples/hello_world/hello_world_test.cc @@ -21,7 +21,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" TF_LITE_MICRO_TESTS_BEGIN diff --git a/tensorflow/lite/micro/examples/hello_world/main_functions.cc b/tensorflow/lite/micro/examples/hello_world/main_functions.cc index c91f8db9b78..0c8541fb2e1 100644 --- a/tensorflow/lite/micro/examples/hello_world/main_functions.cc +++ b/tensorflow/lite/micro/examples/hello_world/main_functions.cc @@ -22,7 +22,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_error_reporter.h" #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" // Globals, used for compatibility with Arduino-style sketches. namespace { diff --git a/tensorflow/lite/micro/examples/image_recognition_experimental/BUILD b/tensorflow/lite/micro/examples/image_recognition_experimental/BUILD index 094ed387063..2f707d9e8ef 100644 --- a/tensorflow/lite/micro/examples/image_recognition_experimental/BUILD +++ b/tensorflow/lite/micro/examples/image_recognition_experimental/BUILD @@ -35,7 +35,6 @@ tflite_micro_cc_test( ], deps = [ ":image_model_data", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:op_resolvers", diff --git a/tensorflow/lite/micro/examples/image_recognition_experimental/image_recognition_test.cc b/tensorflow/lite/micro/examples/image_recognition_experimental/image_recognition_test.cc index ff9ed498137..76d313bb8ad 100644 --- a/tensorflow/lite/micro/examples/image_recognition_experimental/image_recognition_test.cc +++ b/tensorflow/lite/micro/examples/image_recognition_experimental/image_recognition_test.cc @@ -21,7 +21,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" #define IMAGE_BYTES 3072 #define LABEL_BYTES 1 diff --git a/tensorflow/lite/micro/examples/image_recognition_experimental/main.cc b/tensorflow/lite/micro/examples/image_recognition_experimental/main.cc index c2a30280f62..4249309cebf 100644 --- a/tensorflow/lite/micro/examples/image_recognition_experimental/main.cc +++ b/tensorflow/lite/micro/examples/image_recognition_experimental/main.cc @@ -24,7 +24,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" #define NUM_OUT_CH 3 #define CNN_IMG_SIZE 32 diff --git a/tensorflow/lite/micro/examples/magic_wand/BUILD b/tensorflow/lite/micro/examples/magic_wand/BUILD index 8749b0f34a3..0f9c517e988 100644 --- a/tensorflow/lite/micro/examples/magic_wand/BUILD +++ b/tensorflow/lite/micro/examples/magic_wand/BUILD @@ -42,7 +42,6 @@ tflite_micro_cc_test( deps = [ ":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:op_resolvers", @@ -158,7 +157,6 @@ cc_binary( ":gesture_predictor", ":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:op_resolvers", diff --git a/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc b/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc index 920440509f7..bf561e1b25d 100644 --- a/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc +++ b/tensorflow/lite/micro/examples/magic_wand/magic_wand_test.cc @@ -21,7 +21,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" TF_LITE_MICRO_TESTS_BEGIN diff --git a/tensorflow/lite/micro/examples/magic_wand/main_functions.cc b/tensorflow/lite/micro/examples/magic_wand/main_functions.cc index 3c78ec23030..15abe0da0db 100644 --- a/tensorflow/lite/micro/examples/magic_wand/main_functions.cc +++ b/tensorflow/lite/micro/examples/magic_wand/main_functions.cc @@ -24,7 +24,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" // Globals, used for compatibility with Arduino-style sketches. namespace { diff --git a/tensorflow/lite/micro/examples/micro_speech/BUILD b/tensorflow/lite/micro/examples/micro_speech/BUILD index fbb23c49bcd..e7acd6552e4 100644 --- a/tensorflow/lite/micro/examples/micro_speech/BUILD +++ b/tensorflow/lite/micro/examples/micro_speech/BUILD @@ -50,7 +50,6 @@ tflite_micro_cc_test( "micro_speech_test.cc", ], deps = [ - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:op_resolvers", @@ -362,7 +361,6 @@ cc_binary( ":command_responder", ":feature_provider", ":recognize_commands", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:op_resolvers", @@ -384,7 +382,6 @@ cc_binary( ":command_responder", ":feature_provider", ":recognize_commands", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", "//tensorflow/lite/micro:op_resolvers", diff --git a/tensorflow/lite/micro/examples/micro_speech/apollo3/pushbutton_test.cc b/tensorflow/lite/micro/examples/micro_speech/apollo3/pushbutton_test.cc index a9ca638905f..f3200787a54 100644 --- a/tensorflow/lite/micro/examples/micro_speech/apollo3/pushbutton_test.cc +++ b/tensorflow/lite/micro/examples/micro_speech/apollo3/pushbutton_test.cc @@ -24,7 +24,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" extern int16_t captured_data[16000]; uint8_t g_silence_score = 0; diff --git a/tensorflow/lite/micro/examples/micro_speech/ceva/main_functions.cc b/tensorflow/lite/micro/examples/micro_speech/ceva/main_functions.cc index f4af2d8f467..31d151c476d 100644 --- a/tensorflow/lite/micro/examples/micro_speech/ceva/main_functions.cc +++ b/tensorflow/lite/micro/examples/micro_speech/ceva/main_functions.cc @@ -28,7 +28,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" extern int32_t g_latest_audio_timestamp; void setup_tf(); diff --git a/tensorflow/lite/micro/examples/micro_speech/main_functions.cc b/tensorflow/lite/micro/examples/micro_speech/main_functions.cc index 4e096fa1cd7..a0a858bbe83 100644 --- a/tensorflow/lite/micro/examples/micro_speech/main_functions.cc +++ b/tensorflow/lite/micro/examples/micro_speech/main_functions.cc @@ -25,7 +25,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" // Globals, used for compatibility with Arduino-style sketches. namespace { diff --git a/tensorflow/lite/micro/examples/micro_speech/micro_speech_test.cc b/tensorflow/lite/micro/examples/micro_speech/micro_speech_test.cc index b58515d1833..7fdbeaa6035 100644 --- a/tensorflow/lite/micro/examples/micro_speech/micro_speech_test.cc +++ b/tensorflow/lite/micro/examples/micro_speech/micro_speech_test.cc @@ -21,7 +21,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" TF_LITE_MICRO_TESTS_BEGIN diff --git a/tensorflow/lite/micro/examples/network_tester/network_tester_test.cc b/tensorflow/lite/micro/examples/network_tester/network_tester_test.cc index 1d945420b9a..73d942afd35 100644 --- a/tensorflow/lite/micro/examples/network_tester/network_tester_test.cc +++ b/tensorflow/lite/micro/examples/network_tester/network_tester_test.cc @@ -22,7 +22,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_utils.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" #ifndef TENSOR_ARENA_SIZE #define TENSOR_ARENA_SIZE (1024) diff --git a/tensorflow/lite/micro/examples/person_detection/BUILD b/tensorflow/lite/micro/examples/person_detection/BUILD index 774d09fcf2a..cf69ef9509b 100644 --- a/tensorflow/lite/micro/examples/person_detection/BUILD +++ b/tensorflow/lite/micro/examples/person_detection/BUILD @@ -63,7 +63,6 @@ tflite_micro_cc_test( ":model_settings", ":person_detect_model_data", ":simple_images_test_data", - "//tensorflow/lite:schema_fbs_version", "//tensorflow/lite/c:common", "//tensorflow/lite/micro:micro_error_reporter", "//tensorflow/lite/micro:micro_framework", @@ -142,7 +141,6 @@ cc_binary( ":image_provider", ":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:op_resolvers", diff --git a/tensorflow/lite/micro/examples/person_detection/main_functions.cc b/tensorflow/lite/micro/examples/person_detection/main_functions.cc index 770d9687ef7..b97d4e197a8 100644 --- a/tensorflow/lite/micro/examples/person_detection/main_functions.cc +++ b/tensorflow/lite/micro/examples/person_detection/main_functions.cc @@ -23,7 +23,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_interpreter.h" #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" // Globals, used for compatibility with Arduino-style sketches. namespace { diff --git a/tensorflow/lite/micro/examples/person_detection/person_detection_test.cc b/tensorflow/lite/micro/examples/person_detection/person_detection_test.cc index 97cef14661a..3d9d1cf236b 100644 --- a/tensorflow/lite/micro/examples/person_detection/person_detection_test.cc +++ b/tensorflow/lite/micro/examples/person_detection/person_detection_test.cc @@ -23,7 +23,6 @@ limitations under the License. #include "tensorflow/lite/micro/micro_mutable_op_resolver.h" #include "tensorflow/lite/micro/testing/micro_test.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/version.h" // Create an area of memory to use for input, output, and intermediate arrays. constexpr int tensor_arena_size = 136 * 1024; diff --git a/tensorflow/lite/micro/micro_interpreter.h b/tensorflow/lite/micro/micro_interpreter.h index 31720c8e82e..0021a377f43 100644 --- a/tensorflow/lite/micro/micro_interpreter.h +++ b/tensorflow/lite/micro/micro_interpreter.h @@ -28,6 +28,10 @@ limitations under the License. #include "tensorflow/lite/portable_type_to_tflitetype.h" #include "tensorflow/lite/schema/schema_generated.h" +// Copied from tensorflow/lite/version.h to avoid a dependency chain into +// tensorflow/core. +#define TFLITE_SCHEMA_VERSION (3) + namespace tflite { namespace internal { diff --git a/tensorflow/lite/micro/tools/make/Makefile b/tensorflow/lite/micro/tools/make/Makefile index 03b8e0d88f3..ec283f5bf77 100644 --- a/tensorflow/lite/micro/tools/make/Makefile +++ b/tensorflow/lite/micro/tools/make/Makefile @@ -387,7 +387,6 @@ $(wildcard tensorflow/lite/micro/benchmarks/*model_data.h) \ $(wildcard tensorflow/lite/micro/kernels/*.h) \ $(wildcard tensorflow/lite/micro/memory_planner/*.h) \ LICENSE \ -tensorflow/core/public/version.h \ tensorflow/lite/c/builtin_op_data.h \ tensorflow/lite/c/c_api_types.h \ tensorflow/lite/c/common.h \ @@ -455,8 +454,7 @@ tensorflow/lite/kernels/op_macros.h \ tensorflow/lite/kernels/padding.h \ tensorflow/lite/portable_type_to_tflitetype.h \ tensorflow/lite/schema/schema_generated.h \ -tensorflow/lite/schema/schema_utils.h \ -tensorflow/lite/version.h +tensorflow/lite/schema/schema_utils.h # TODO(b/165940489): Figure out how to avoid including fixed point # platform-specific headers.