Relocate tensorflow/lite/schema and extra_rules.bzl into tensorflow/lite/micro

python/tflite_micro/BUILD

@@ -4,15 +4,15 @@ load("@rules_python//python:packaging.bzl", "py_package", "py_wheel")
 load("@tflm_pip_deps//:requirements.bzl", "requirement")
 load("//python:py_namespace.bzl", "py_namespace")
 load("//python:py_rules.bzl", "tflm_py_library", "tflm_py_test", "tflm_whl_test")
-load(
-    "//tensorflow:extra_rules.bzl",
-    "tflm_python_op_resolver_friends",
-)
 load(
     "//tensorflow/lite/micro:build_def.bzl",
     "INCOMPATIBLE_WITH_WINDOWS",
     "tflm_cc_library",
 )
+load(
+    "//tensorflow/lite/micro:extra_rules.bzl",
+    "tflm_python_op_resolver_friends",
+)
 load("//tools:expand_stamp_vars.bzl", "expand_stamp_vars")
 
 package(

python/tflite_micro/compression_utils.h

@@ -18,7 +18,7 @@ limitations under the License.
 
 #include <cstring>
 
-#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/micro/schema/schema_generated.h"
 
 namespace tflite {
 

tensorflow/lite/micro/BUILD

@@ -43,7 +43,7 @@ tflm_cc_library(
         ":micro_compatibility",
         ":micro_log",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
-        "//tensorflow/lite/schema:schema_fbs",
+        "//tensorflow/lite/micro/schema:schema_fbs",
     ],
 )
 
@@ -88,7 +88,6 @@ tflm_cc_library(
         ":op_resolvers",
         ":portable_type_to_tflitetype",
         "//tensorflow/lite/micro/kernels/internal:tensor",
-        "//tensorflow/lite/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -207,7 +206,6 @@ tflm_cc_library(
         ":micro_profiler",
         ":micro_resource_variable",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
-        "//tensorflow/lite/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -221,7 +219,6 @@ tflm_cc_library(
         ":micro_common",
         ":micro_graph",
         ":test_helpers",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )
 
@@ -253,7 +250,6 @@ tflm_cc_library(
         "//tensorflow/lite/micro/memory_planner:greedy_memory_planner",
         "//tensorflow/lite/micro/memory_planner:linear_memory_planner",
         "//tensorflow/lite/micro/memory_planner:micro_memory_planner",
-        "//tensorflow/lite/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -273,7 +269,7 @@ tflm_cc_library(
     deps = [
         ":micro_common",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
-        "//tensorflow/lite/schema:schema_fbs",
+        "//tensorflow/lite/micro/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -287,7 +283,7 @@ tflm_cc_library(
         ":micro_common",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
         "//tensorflow/lite/micro/kernels/internal:tensor",
-        "//tensorflow/lite/schema:schema_fbs",
+        "//tensorflow/lite/micro/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -313,7 +309,6 @@ tflm_cc_library(
         "//tensorflow/lite/micro/kernels:kernel_util",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
         "//tensorflow/lite/micro/kernels/internal:tensor",
-        "//tensorflow/lite/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ],
 )
@@ -336,7 +331,6 @@ tflm_cc_library(
         "//tensorflow/lite/micro/kernels:micro_ops",
         "//tensorflow/lite/micro/kernels:op_macros",
         "//tensorflow/lite/micro/kernels/internal:compatibility",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )
 

tensorflow/lite/micro/benchmarks/BUILD

@@ -103,6 +103,5 @@ tflm_cc_binary(
         "//tensorflow/lite/micro/examples/person_detection:model_settings",
         "//tensorflow/lite/micro/examples/person_detection:person_detect_model_data",
         "//tensorflow/lite/micro/examples/person_detection:simple_images_test_data",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )

tensorflow/lite/micro/benchmarks/person_detection_benchmark.cc

@@ -27,7 +27,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_utils.h"
 #include "tensorflow/lite/micro/models/person_detect_model_data.h"
 #include "tensorflow/lite/micro/system_setup.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 /*
  * Person Detection benchmark.  Evaluates runtime performance of the visual

tensorflow/lite/micro/examples/dtln/dtln_test.cc

@@ -20,7 +20,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
 #include "tensorflow/lite/micro/testing/micro_test_v2.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 TEST(DtlnTest, TestInvoke) {
   MicroPrintf(

tensorflow/lite/micro/examples/hello_world/BUILD

@@ -37,7 +37,6 @@ tflm_cc_test(
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro:recording_allocators",
         "//tensorflow/lite/micro/testing:micro_test",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )
 

tensorflow/lite/micro/examples/hello_world/hello_world_test.cc

@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_profiler.h"
 #include "tensorflow/lite/micro/recording_micro_interpreter.h"
 #include "tensorflow/lite/micro/system_setup.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace {
 using HelloWorldOpResolver = tflite::MicroMutableOpResolver<1>;

tensorflow/lite/micro/examples/micro_speech/BUILD

@@ -184,7 +184,6 @@ tflm_cc_test(
         "//tensorflow/lite/micro:micro_log",
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro/testing:micro_test",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )
 

tensorflow/lite/micro/examples/network_tester/network_tester_test.cc

@@ -21,7 +21,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
 #include "tensorflow/lite/micro/micro_utils.h"
 #include "tensorflow/lite/micro/testing/micro_test_v2.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 #ifdef ETHOS_U
 #include "tensorflow/lite/micro/examples/person_detection/testdata/person_image_data.h"

tensorflow/lite/micro/examples/person_detection/BUILD

@@ -86,7 +86,6 @@ tflm_cc_test(
         "//tensorflow/lite/micro:micro_log",
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro/testing:micro_test",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )
 
@@ -158,6 +157,5 @@ tflm_cc_binary(
         "//tensorflow/lite/micro:micro_log",
         "//tensorflow/lite/micro:op_resolvers",
         "//tensorflow/lite/micro:system_setup",
-        "//tensorflow/lite/schema:schema_fbs",
     ],
 )

tensorflow/lite/micro/examples/person_detection/main_functions.cc

@@ -23,7 +23,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
 #include "tensorflow/lite/micro/models/person_detect_model_data.h"
 #include "tensorflow/lite/micro/system_setup.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 // Globals, used for compatibility with Arduino-style sketches.
 namespace {

tensorflow/lite/micro/examples/person_detection/person_detection_test.cc

@@ -22,7 +22,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_mutable_op_resolver.h"
 #include "tensorflow/lite/micro/models/person_detect_model_data.h"
 #include "tensorflow/lite/micro/testing/micro_test_v2.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 // Create an area of memory to use for input, output, and intermediate arrays.
 #if defined(XTENSA) && defined(VISION_P6)

tensorflow/lite/micro/flatbuffer_conversions.cc

@@ -33,7 +33,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/compatibility.h"
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_log.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/flatbuffer_conversions.h

@@ -32,7 +32,7 @@ limitations under the License.
 #include <type_traits>
 
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/micro/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/flatbuffer_utils.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include "flatbuffers/flatbuffers.h"
 #include "flatbuffers/flexbuffers.h"
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/micro/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/kernels/BUILD

@@ -1,13 +1,4 @@
 load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
-load(
-    "//tensorflow:extra_rules.bzl",
-    "tflm_kernel_friends",
-    "xtensa_fusion_f1_config",
-    "xtensa_hifi_3_config",
-    "xtensa_hifi_3z_config",
-    "xtensa_hifi_5_config",
-    "xtensa_vision_p6_config",
-)
 load(
     "//tensorflow/lite/micro:build_def.bzl",
     "INCOMPATIBLE_WITH_WINDOWS",
@@ -16,6 +7,15 @@ load(
     "tflm_copts",
     "tflm_kernel_cc_library",
 )
+load(
+    "//tensorflow/lite/micro:extra_rules.bzl",
+    "tflm_kernel_friends",
+    "xtensa_fusion_f1_config",
+    "xtensa_hifi_3_config",
+    "xtensa_hifi_3z_config",
+    "xtensa_hifi_5_config",
+    "xtensa_vision_p6_config",
+)
 
 package(
     features = [
@@ -441,7 +441,6 @@ tflm_kernel_cc_library(
         "//tensorflow/lite/micro/kernels/internal:tensor",
         "//tensorflow/lite/micro/kernels/internal:tensor_utils_no_eigen",
         "//tensorflow/lite/micro/kernels/internal:types",
-        "//tensorflow/lite/schema:schema_fbs",
         "@flatbuffers//:runtime_cc",
     ] + select({
         xtensa_fusion_f1_config(): ["//third_party/xtensa/nnlib_hifi4:nnlib_hifi4_lib"],

tensorflow/lite/micro/kernels/assign_variable.cc

@@ -26,7 +26,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_resource_variable.h"
 #include "tensorflow/lite/micro/micro_utils.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/kernels/call_once.cc

@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_context.h"
 #include "tensorflow/lite/micro/micro_graph.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/kernels/if.cc

@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_context.h"
 #include "tensorflow/lite/micro/micro_graph.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/kernels/read_variable.cc

@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_graph.h"
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_resource_variable.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/kernels/var_handle.cc

@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_graph.h"
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_resource_variable.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/memory_helpers.cc

@@ -22,7 +22,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/flatbuffer_conversions.h"
 #include "tensorflow/lite/micro/kernels/internal/compatibility.h"
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/memory_helpers.h

@@ -19,7 +19,7 @@ limitations under the License.
 #include <cstdint>
 
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
+#include "tensorflow/lite/micro/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/micro_allocation_info.h

@@ -19,7 +19,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/flatbuffer_utils.h"
 #include "tensorflow/lite/micro/micro_allocator.h"
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/micro_allocator.cc

@@ -34,7 +34,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_arena_constants.h"
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_log.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 #ifdef USE_TFLM_COMPRESSION
 

tensorflow/lite/micro/micro_allocator.h

@@ -24,7 +24,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/flatbuffer_utils.h"
 #include "tensorflow/lite/micro/memory_planner/micro_memory_planner.h"
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 #ifdef USE_TFLM_COMPRESSION
 

tensorflow/lite/micro/micro_interpreter.cc

@@ -28,7 +28,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_op_resolver.h"
 #include "tensorflow/lite/micro/micro_profiler_interface.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/micro_interpreter.h

@@ -33,7 +33,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_op_resolver.h"
 #include "tensorflow/lite/micro/micro_profiler_interface.h"
 #include "tensorflow/lite/micro/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.

tensorflow/lite/micro/micro_interpreter_graph.cc

@@ -25,7 +25,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_context.h"
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_profiler.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 #ifdef USE_TFLM_COMPRESSION
 

tensorflow/lite/micro/micro_interpreter_graph.h

@@ -21,7 +21,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_graph.h"
 #include "tensorflow/lite/micro/micro_profiler_interface.h"
 #include "tensorflow/lite/micro/micro_resource_variable.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/micro_mutable_op_resolver.h

@@ -42,7 +42,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_log.h"
 #include "tensorflow/lite/micro/micro_op_resolver.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/micro_op_resolver.h

@@ -17,7 +17,6 @@ limitations under the License.
 
 #include "tensorflow/lite/micro/flatbuffer_conversions.h"
 #include "tensorflow/lite/micro/micro_common.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {

tensorflow/lite/micro/mock_micro_graph.h

@@ -19,7 +19,6 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_allocator.h"
 #include "tensorflow/lite/micro/micro_common.h"
 #include "tensorflow/lite/micro/micro_graph.h"
-#include "tensorflow/lite/schema/schema_generated.h"
 
 namespace tflite {
 namespace micro {