From 2a96849f478627ad03b8f20f8c71e85d6d7480e3 Mon Sep 17 00:00:00 2001 From: Karim Nosir Date: Mon, 15 Jun 2020 18:38:58 -0700 Subject: [PATCH] Update source files with used includes. PiperOrigin-RevId: 316589177 Change-Id: I0aba0ed1cf9ff478e7890fa53a7749bf844bd26d --- tensorflow/lite/kernels/BUILD | 406 +++++++++--------- .../lite/kernels/acceleration_test_util.cc | 10 +- .../lite/kernels/acceleration_test_util.h | 2 +- .../acceleration_test_util_internal.cc | 8 + .../kernels/acceleration_test_util_internal.h | 4 +- .../acceleration_test_util_internal_test.cc | 2 + tensorflow/lite/kernels/activations.cc | 12 +- tensorflow/lite/kernels/activations_test.cc | 18 +- tensorflow/lite/kernels/add.cc | 12 +- tensorflow/lite/kernels/add_n.cc | 2 + tensorflow/lite/kernels/add_n_test.cc | 7 +- tensorflow/lite/kernels/add_test.cc | 10 +- tensorflow/lite/kernels/arg_min_max.cc | 8 +- tensorflow/lite/kernels/arg_min_max_test.cc | 11 +- tensorflow/lite/kernels/assign_variable.cc | 6 +- tensorflow/lite/kernels/audio_spectrogram.cc | 9 +- .../lite/kernels/audio_spectrogram_test.cc | 5 +- tensorflow/lite/kernels/basic_rnn_test.cc | 7 +- tensorflow/lite/kernels/batch_matmul.cc | 6 + tensorflow/lite/kernels/batch_matmul_test.cc | 12 +- tensorflow/lite/kernels/batch_to_space_nd.cc | 8 +- .../lite/kernels/batch_to_space_nd_test.cc | 9 +- .../kernels/bidirectional_sequence_lstm.cc | 3 + .../bidirectional_sequence_lstm_test.cc | 9 +- .../kernels/bidirectional_sequence_rnn.cc | 1 + .../bidirectional_sequence_rnn_test.cc | 11 +- tensorflow/lite/kernels/cast.cc | 6 +- tensorflow/lite/kernels/cast_test.cc | 11 +- tensorflow/lite/kernels/ceil.cc | 1 + tensorflow/lite/kernels/ceil_test.cc | 8 +- tensorflow/lite/kernels/comparisons.cc | 9 + tensorflow/lite/kernels/comparisons_test.cc | 13 +- tensorflow/lite/kernels/concatenation.cc | 13 +- tensorflow/lite/kernels/concatenation_test.cc | 13 +- tensorflow/lite/kernels/conv.cc | 13 +- tensorflow/lite/kernels/conv_test.cc | 15 +- .../lite/kernels/cpu_backend_context.cc | 4 + tensorflow/lite/kernels/cpu_backend_context.h | 1 + tensorflow/lite/kernels/cpu_backend_gemm.h | 1 + .../kernels/cpu_backend_gemm_custom_gemv.h | 5 + .../lite/kernels/cpu_backend_gemm_gemmlowp.h | 4 +- .../lite/kernels/cpu_backend_gemm_ruy.h | 2 +- .../lite/kernels/cpu_backend_gemm_test.cc | 9 +- .../kernels/cpu_backend_threadpool_test.cc | 2 + tensorflow/lite/kernels/custom_ops_register.h | 2 +- tensorflow/lite/kernels/densify.cc | 5 +- tensorflow/lite/kernels/densify_test.cc | 8 +- tensorflow/lite/kernels/depth_to_space.cc | 5 +- .../lite/kernels/depth_to_space_test.cc | 11 +- tensorflow/lite/kernels/depthwise_conv.cc | 15 +- .../kernels/depthwise_conv_hybrid_test.cc | 15 +- .../lite/kernels/depthwise_conv_test.cc | 14 +- tensorflow/lite/kernels/dequantize.cc | 8 +- tensorflow/lite/kernels/dequantize.h | 7 +- tensorflow/lite/kernels/dequantize_test.cc | 9 +- .../lite/kernels/detection_postprocess.cc | 10 +- .../kernels/detection_postprocess_test.cc | 9 +- tensorflow/lite/kernels/div.cc | 9 +- tensorflow/lite/kernels/div_test.cc | 10 +- tensorflow/lite/kernels/eigen_support.cc | 3 + tensorflow/lite/kernels/eigen_support_test.cc | 3 +- tensorflow/lite/kernels/elementwise.cc | 4 + tensorflow/lite/kernels/elementwise_test.cc | 8 +- tensorflow/lite/kernels/embedding_lookup.cc | 12 +- .../lite/kernels/embedding_lookup_sparse.cc | 3 +- .../kernels/embedding_lookup_sparse_test.cc | 7 +- .../lite/kernels/embedding_lookup_test.cc | 9 +- tensorflow/lite/kernels/exp.cc | 7 +- tensorflow/lite/kernels/exp_test.cc | 11 +- tensorflow/lite/kernels/expand_dims.cc | 6 +- tensorflow/lite/kernels/expand_dims_test.cc | 14 +- tensorflow/lite/kernels/fake_quant.cc | 7 +- tensorflow/lite/kernels/fake_quant_test.cc | 9 +- tensorflow/lite/kernels/fill.cc | 4 +- tensorflow/lite/kernels/fill_test.cc | 12 +- tensorflow/lite/kernels/floor.cc | 1 + tensorflow/lite/kernels/floor_div.cc | 9 +- tensorflow/lite/kernels/floor_div_test.cc | 9 +- tensorflow/lite/kernels/floor_mod.cc | 7 +- tensorflow/lite/kernels/floor_mod_test.cc | 9 +- tensorflow/lite/kernels/floor_test.cc | 8 +- tensorflow/lite/kernels/fully_connected.cc | 1 - .../lite/kernels/fully_connected_test.cc | 15 +- tensorflow/lite/kernels/gather.cc | 6 +- tensorflow/lite/kernels/gather_nd.cc | 6 +- tensorflow/lite/kernels/gather_nd_test.cc | 13 +- tensorflow/lite/kernels/gather_test.cc | 14 +- tensorflow/lite/kernels/hashtable/BUILD | 2 +- tensorflow/lite/kernels/hashtable_lookup.cc | 9 +- .../lite/kernels/hashtable_lookup_test.cc | 11 +- tensorflow/lite/kernels/if.cc | 4 + tensorflow/lite/kernels/if_test.cc | 9 +- .../kernels/internal/optimized/im2col_utils.h | 2 + .../internal/optimized/integer_ops/add.h | 5 + .../internal/optimized/integer_ops/conv.h | 1 + .../optimized/integer_ops/depthwise_conv.h | 7 + .../optimized/integer_ops/fully_connected.h | 4 +- .../internal/optimized/integer_ops/mul.h | 5 + .../internal/optimized/integer_ops/pooling.h | 13 +- .../internal/per_channel_dequantize_test.cc | 1 + .../kernels/internal/reference/batch_matmul.h | 5 +- .../lite/kernels/internal/reference/densify.h | 2 + .../internal/reference/non_max_suppression.h | 2 +- .../kernels/internal/reference/quantize.h | 4 + .../internal/reference/strided_slice.h | 2 + .../lite/kernels/internal/reference/sub.h | 8 +- .../lite/kernels/internal/reference/svdf.h | 3 + tensorflow/lite/kernels/kernel_util.cc | 7 +- tensorflow/lite/kernels/kernel_util.h | 4 +- tensorflow/lite/kernels/kernel_util_test.cc | 10 + tensorflow/lite/kernels/l2norm.cc | 5 +- tensorflow/lite/kernels/l2norm_test.cc | 11 +- .../lite/kernels/local_response_norm.cc | 3 +- .../lite/kernels/local_response_norm_test.cc | 9 +- tensorflow/lite/kernels/log_softmax_test.cc | 8 +- tensorflow/lite/kernels/logical.cc | 5 +- tensorflow/lite/kernels/logical_test.cc | 9 +- tensorflow/lite/kernels/lsh_projection.cc | 10 +- .../lite/kernels/lsh_projection_test.cc | 7 +- tensorflow/lite/kernels/lstm_eval.cc | 5 + tensorflow/lite/kernels/lstm_eval.h | 1 - tensorflow/lite/kernels/lstm_eval_test.cc | 12 +- tensorflow/lite/kernels/lstm_test.cc | 8 +- tensorflow/lite/kernels/matrix_diag.cc | 7 +- tensorflow/lite/kernels/matrix_diag_test.cc | 10 +- tensorflow/lite/kernels/matrix_set_diag.cc | 7 +- .../lite/kernels/matrix_set_diag_test.cc | 10 +- tensorflow/lite/kernels/maximum_minimum.cc | 10 +- .../lite/kernels/maximum_minimum_test.cc | 11 +- tensorflow/lite/kernels/mfcc.cc | 9 +- tensorflow/lite/kernels/mfcc_test.cc | 6 +- tensorflow/lite/kernels/mirror_pad.cc | 6 +- tensorflow/lite/kernels/mirror_pad_test.cc | 7 +- tensorflow/lite/kernels/mul.cc | 10 +- tensorflow/lite/kernels/mul_test.cc | 11 +- tensorflow/lite/kernels/neg.cc | 3 + tensorflow/lite/kernels/neg_test.cc | 11 +- .../lite/kernels/non_max_suppression.cc | 8 +- .../lite/kernels/non_max_suppression_test.cc | 9 +- tensorflow/lite/kernels/numeric_verify.cc | 9 +- .../lite/kernels/numeric_verify_test.cc | 6 +- tensorflow/lite/kernels/one_hot.cc | 4 +- tensorflow/lite/kernels/one_hot_test.cc | 7 +- tensorflow/lite/kernels/op_macros.h | 2 - .../lite/kernels/optional_tensor_test.cc | 10 +- tensorflow/lite/kernels/pack.cc | 4 + tensorflow/lite/kernels/pack_test.cc | 11 +- tensorflow/lite/kernels/pad.cc | 11 +- tensorflow/lite/kernels/pad_test.cc | 8 +- tensorflow/lite/kernels/pooling.cc | 13 +- tensorflow/lite/kernels/pooling_test.cc | 11 +- tensorflow/lite/kernels/pow.cc | 5 +- tensorflow/lite/kernels/pow_test.cc | 10 +- .../lite/kernels/quant_basic_lstm_test.cc | 7 +- tensorflow/lite/kernels/quantize.cc | 1 + tensorflow/lite/kernels/quantize_test.cc | 7 +- tensorflow/lite/kernels/range.cc | 8 +- tensorflow/lite/kernels/range_test.cc | 8 +- tensorflow/lite/kernels/rank.cc | 5 +- tensorflow/lite/kernels/rank_test.cc | 8 +- tensorflow/lite/kernels/read_variable.cc | 5 +- tensorflow/lite/kernels/reduce.cc | 9 +- tensorflow/lite/kernels/reduce_test.cc | 10 +- tensorflow/lite/kernels/register.cc | 2 + tensorflow/lite/kernels/register.h | 1 - tensorflow/lite/kernels/register_ref.cc | 4 + tensorflow/lite/kernels/register_ref.h | 2 +- tensorflow/lite/kernels/reshape.cc | 2 +- tensorflow/lite/kernels/reshape_test.cc | 7 +- tensorflow/lite/kernels/reshape_test_common.h | 8 + tensorflow/lite/kernels/resize_bilinear.cc | 7 +- .../lite/kernels/resize_bilinear_test.cc | 10 +- .../lite/kernels/resize_nearest_neighbor.cc | 9 +- .../kernels/resize_nearest_neighbor_test.cc | 10 +- tensorflow/lite/kernels/reverse.cc | 4 +- tensorflow/lite/kernels/reverse_sequence.cc | 3 + .../lite/kernels/reverse_sequence_test.cc | 9 +- tensorflow/lite/kernels/reverse_test.cc | 9 +- tensorflow/lite/kernels/rfft2d.cc | 12 +- tensorflow/lite/kernels/rfft2d_test.cc | 8 +- tensorflow/lite/kernels/round.cc | 3 + tensorflow/lite/kernels/round_test.cc | 7 +- tensorflow/lite/kernels/scatter_nd.cc | 7 +- tensorflow/lite/kernels/scatter_nd_test.cc | 12 +- tensorflow/lite/kernels/segment_sum.cc | 4 +- tensorflow/lite/kernels/segment_sum_test.cc | 8 +- tensorflow/lite/kernels/select.cc | 6 +- tensorflow/lite/kernels/select_test.cc | 10 +- tensorflow/lite/kernels/shape.cc | 5 +- tensorflow/lite/kernels/shape_test.cc | 7 +- tensorflow/lite/kernels/skip_gram.cc | 2 - tensorflow/lite/kernels/skip_gram_test.cc | 7 +- tensorflow/lite/kernels/slice.cc | 12 +- tensorflow/lite/kernels/slice_test.cc | 11 +- tensorflow/lite/kernels/softmax_test.cc | 11 +- tensorflow/lite/kernels/space_to_batch_nd.cc | 9 +- .../lite/kernels/space_to_batch_nd_test.cc | 10 +- tensorflow/lite/kernels/space_to_depth.cc | 5 +- .../lite/kernels/space_to_depth_test.cc | 10 +- tensorflow/lite/kernels/sparse_to_dense.cc | 12 +- .../lite/kernels/sparse_to_dense_test.cc | 11 +- tensorflow/lite/kernels/split.cc | 7 +- tensorflow/lite/kernels/split_test.cc | 12 +- tensorflow/lite/kernels/split_v.cc | 5 +- tensorflow/lite/kernels/split_v_test.cc | 11 +- tensorflow/lite/kernels/squared_difference.cc | 8 +- .../lite/kernels/squared_difference_test.cc | 10 +- tensorflow/lite/kernels/squeeze.cc | 3 - tensorflow/lite/kernels/squeeze_test.cc | 11 +- tensorflow/lite/kernels/strided_slice.cc | 8 +- tensorflow/lite/kernels/strided_slice_test.cc | 10 +- tensorflow/lite/kernels/sub.cc | 11 +- tensorflow/lite/kernels/sub_test.cc | 10 +- tensorflow/lite/kernels/subgraph_test_util.cc | 13 +- tensorflow/lite/kernels/subgraph_test_util.h | 5 + .../lite/kernels/subgraph_test_util_test.cc | 8 +- tensorflow/lite/kernels/svdf.cc | 1 + tensorflow/lite/kernels/svdf_test.cc | 10 +- tensorflow/lite/kernels/test_util.cc | 23 +- tensorflow/lite/kernels/test_util.h | 24 +- tensorflow/lite/kernels/test_util_test.cc | 6 + tensorflow/lite/kernels/tile.cc | 11 +- tensorflow/lite/kernels/tile_test.cc | 13 +- tensorflow/lite/kernels/topk_v2.cc | 11 +- tensorflow/lite/kernels/topk_v2_test.cc | 12 +- tensorflow/lite/kernels/transpose.cc | 9 +- tensorflow/lite/kernels/transpose_conv.cc | 13 +- .../lite/kernels/transpose_conv_test.cc | 16 +- tensorflow/lite/kernels/transpose_test.cc | 13 +- .../kernels/unidirectional_sequence_lstm.cc | 2 + .../unidirectional_sequence_lstm_test.cc | 6 +- .../unidirectional_sequence_rnn_test.cc | 7 +- tensorflow/lite/kernels/unique.cc | 6 + tensorflow/lite/kernels/unique_test.cc | 9 +- tensorflow/lite/kernels/unpack.cc | 4 + tensorflow/lite/kernels/unpack_test.cc | 12 +- tensorflow/lite/kernels/variable_ops_test.cc | 4 +- tensorflow/lite/kernels/where.cc | 2 + tensorflow/lite/kernels/where_test.cc | 8 +- tensorflow/lite/kernels/while.cc | 3 + tensorflow/lite/kernels/while_test.cc | 10 +- tensorflow/lite/kernels/zeros_like.cc | 4 + tensorflow/lite/kernels/zeros_like_test.cc | 9 +- .../lite/micro/kernels/cmsis-nn/pooling.cc | 1 + 244 files changed, 1457 insertions(+), 809 deletions(-) diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index aad79ffbc89..b16a85c65d8 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -115,10 +115,11 @@ cc_test( size = "small", srcs = ["optional_tensor_test.cc"], deps = [ - ":builtin_ops", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -158,7 +159,6 @@ cc_test( ], deps = [ ":acceleration_test_util_internal", - "@com_google_absl//absl/types:optional", "@com_google_googletest//:gtest_main", ], ) @@ -175,8 +175,11 @@ cc_library( "//tensorflow/lite:framework", "//tensorflow/lite:minimal_logging", "//tensorflow/lite:schema_fbs_version", + "//tensorflow/lite:string", "//tensorflow/lite:string_util", + "//tensorflow/lite:type_to_tflitetype", "//tensorflow/lite/c:common", + "//tensorflow/lite/core/api", "//tensorflow/lite/delegates/nnapi:acceleration_test_util", "//tensorflow/lite/delegates/nnapi:nnapi_delegate", "//tensorflow/lite/kernels/internal:tensor_utils", @@ -187,6 +190,7 @@ cc_library( "//tensorflow/lite/tools/optimize/sparsity:format_converter", "//tensorflow/lite/tools/versioning", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -217,6 +221,7 @@ cc_library( "//tensorflow/lite:arena_planner", "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:optimized", + "//third_party/eigen3", ], ) @@ -226,7 +231,9 @@ cc_test( srcs = ["eigen_support_test.cc"], deps = [ ":eigen_support", + "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:optimized", + "//third_party/eigen3", "@com_google_googletest//:gtest", ], ) @@ -291,6 +298,7 @@ cc_library( # gemmlowp_context_ and ruy_context_ members. "@ruy//ruy:context", "@gemmlowp", + "//tensorflow/lite/c:common", "//tensorflow/lite:external_cpu_backend_context", ], ) @@ -333,17 +341,18 @@ cc_library( "cpu_backend_gemm_eigen.cc", "cpu_backend_gemm_eigen.h", "cpu_backend_gemm_gemmlowp.h", - "cpu_backend_gemm_ruy.h", ], hdrs = [ "cpu_backend_gemm.h", "cpu_backend_gemm_params.h", + "cpu_backend_gemm_ruy.h", ], copts = tflite_copts(), deps = [ ":tflite_with_ruy_only", "//tensorflow/lite/kernels/internal:common", "//tensorflow/lite/kernels/internal:compatibility", + "//tensorflow/lite/kernels/internal:cpu_check", "//tensorflow/lite/kernels/internal:types", ":cpu_backend_context", ":cpu_backend_threadpool", @@ -369,6 +378,7 @@ cc_test( ":cpu_backend_context", ":cpu_backend_gemm", "@com_google_googletest//:gtest", + "@ruy//ruy:matrix", # ruy:reference_mul provides the reference implementation # that this test compares against. "@ruy//ruy:reference_mul", @@ -382,6 +392,7 @@ cc_library( ], build_for_embedded = True, copts = tflite_copts(), + deps = ["//tensorflow/lite/micro:debug_log"], ) cc_library( @@ -408,6 +419,7 @@ cc_test( srcs = ["kernel_util_test.cc"], deps = [ ":kernel_util", + "//tensorflow/lite/c:common", "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], @@ -569,7 +581,12 @@ cc_library( ], copts = tflite_copts() + tf_opts_nortti_if_android() + EXTRA_EIGEN_COPTS, visibility = ["//visibility:private"], - deps = BUILTIN_KERNEL_DEPS + ["@farmhash_archive//:farmhash"], + deps = BUILTIN_KERNEL_DEPS + [ + "@ruy//ruy/profiler:instrumentation", + "//tensorflow/lite/kernels/internal:cppmath", + "//tensorflow/lite:string", + "@farmhash_archive//:farmhash", + ], ) # Creates a target where Ruy is unconditionally enabled along with caching @@ -583,7 +600,12 @@ cc_library( ], copts = tflite_copts() + tf_opts_nortti_if_android() + EXTRA_EIGEN_COPTS, visibility = ["//visibility:private"], - deps = BUILTIN_KERNEL_DEPS + ["@farmhash_archive//:farmhash"] + [":tflite_with_ruy_only_and_caching_enabled"], + deps = BUILTIN_KERNEL_DEPS + [ + "@ruy//ruy/profiler:instrumentation", + "//tensorflow/lite/kernels/internal:cppmath", + "//tensorflow/lite:string", + "@farmhash_archive//:farmhash", + ] + [":tflite_with_ruy_only_and_caching_enabled"], ) cc_library( @@ -611,7 +633,6 @@ cc_test( ], deps = [ ":test_main", - ":test_util", ":variable_op_kernels", # buildcleaner: keep "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:tensor", @@ -632,6 +653,7 @@ cc_library( "//tensorflow/lite/kernels/hashtable:hashtable_op_kernels", "//tensorflow/lite/kernels/internal:kernel_utils", "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/kernels/internal:types", "//third_party/fft2d:fft2d_headers", "@fft2d", "@ruy//ruy/profiler:instrumentation", @@ -681,6 +703,7 @@ cc_library( ":builtin_op_kernels", "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", ], alwayslink = 1, ) @@ -697,6 +720,7 @@ cc_library( ":builtin_op_kernels", "//tensorflow/lite:framework_lib", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -713,6 +737,7 @@ cc_library( ":builtin_op_kernels_ruy_and_caching", "//tensorflow/lite:framework_lib", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -728,6 +753,7 @@ cc_library( "//tensorflow/lite:framework", "//tensorflow/lite:util", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -736,10 +762,10 @@ cc_test( size = "small", srcs = ["audio_spectrogram_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -750,10 +776,10 @@ cc_test( size = "small", srcs = ["mfcc_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -764,10 +790,10 @@ cc_test( size = "small", srcs = ["detection_postprocess_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -782,12 +808,15 @@ cc_test( "tflite_xnnpack", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/core/api", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -800,11 +829,11 @@ cc_test( "tflite_xnnpack", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -813,11 +842,11 @@ cc_test( size = "small", srcs = ["add_n_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -827,11 +856,11 @@ cc_test( srcs = ["arg_min_max_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -841,11 +870,11 @@ cc_test( srcs = ["div_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -855,11 +884,11 @@ cc_test( srcs = ["sub_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -869,13 +898,15 @@ cc_test( srcs = ["transpose_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/kernels/internal:compatibility", "//tensorflow/lite/kernels/internal:reference", "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -884,11 +915,11 @@ cc_test( size = "small", srcs = ["space_to_batch_nd_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -898,11 +929,12 @@ cc_test( srcs = ["batch_to_space_nd_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -911,11 +943,11 @@ cc_test( size = "small", srcs = ["batch_matmul_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -925,11 +957,11 @@ cc_test( srcs = ["cast_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -939,11 +971,11 @@ cc_test( srcs = ["concatenation_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -953,10 +985,11 @@ cc_test( srcs = ["conv_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -968,15 +1001,11 @@ cc_test( srcs = ["densify_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:types", "//tensorflow/lite/schema:schema_fbs", - "//tensorflow/lite/tools/optimize/sparsity:format_converter", - "//third_party/eigen3", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -987,13 +1016,16 @@ cc_test( size = "small", srcs = ["depthwise_conv_hybrid_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/core/api", "//tensorflow/lite/kernels/internal:test_util", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1003,13 +1035,16 @@ cc_test( srcs = ["depthwise_conv_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/core/api", "//tensorflow/lite/kernels/internal:test_util", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1019,14 +1054,16 @@ cc_test( srcs = ["dequantize_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/core/api", "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "//third_party/eigen3", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1036,11 +1073,11 @@ cc_test( srcs = ["numeric_verify_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "//third_party/eigen3", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", @@ -1053,11 +1090,11 @@ cc_test( srcs = ["basic_rnn_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1067,12 +1104,11 @@ cc_test( srcs = ["bidirectional_sequence_lstm_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1082,10 +1118,9 @@ cc_test( srcs = ["floor_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1098,10 +1133,9 @@ cc_test( "tflite_not_portable_ios", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1114,10 +1148,9 @@ cc_test( "tflite_not_portable_ios", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1128,10 +1161,9 @@ cc_test( srcs = ["elementwise_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1142,11 +1174,11 @@ cc_test( srcs = ["unidirectional_sequence_lstm_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1155,11 +1187,11 @@ cc_test( size = "small", srcs = ["bidirectional_sequence_rnn_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1169,11 +1201,11 @@ cc_test( srcs = ["unidirectional_sequence_rnn_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1184,11 +1216,11 @@ cc_test( # TODO(b/143912164): Enable NNAPI test when fix nnapi. # tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1198,11 +1230,11 @@ cc_test( srcs = ["exp_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1211,11 +1243,11 @@ cc_test( size = "small", srcs = ["fake_quant_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1225,10 +1257,9 @@ cc_test( srcs = ["maximum_minimum_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1239,11 +1270,11 @@ cc_test( srcs = ["reduce_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1256,11 +1287,11 @@ cc_test( "tflite_xnnpack", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1270,11 +1301,12 @@ cc_test( srcs = ["pad_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1286,6 +1318,8 @@ cc_library( ], deps = [ ":test_util", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", ], ) @@ -1295,11 +1329,10 @@ cc_test( srcs = ["reshape_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":reshape_test_common", ":test_main", - ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", "@com_google_googletest//:gtest", ], ) @@ -1310,12 +1343,13 @@ cc_test( srcs = ["gather_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1324,12 +1358,13 @@ cc_test( size = "small", srcs = ["gather_nd_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1338,12 +1373,12 @@ cc_test( size = "small", srcs = ["scatter_nd_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1353,11 +1388,10 @@ cc_test( srcs = ["topk_v2_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1368,11 +1402,11 @@ cc_test( srcs = ["resize_bilinear_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1382,11 +1416,11 @@ cc_test( srcs = ["resize_nearest_neighbor_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1396,11 +1430,11 @@ cc_test( srcs = ["svdf_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1410,11 +1444,11 @@ cc_test( srcs = ["embedding_lookup_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1425,12 +1459,13 @@ cc_test( srcs = ["embedding_lookup_sparse_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1444,9 +1479,13 @@ cc_test( ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/core/api", "//tensorflow/lite/kernels/internal:tensor_utils", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1456,11 +1495,11 @@ cc_test( srcs = ["local_response_norm_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1473,11 +1512,11 @@ cc_test( "tflite_xnnpack", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1490,12 +1529,13 @@ cc_test( "tflite_xnnpack", ], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1505,12 +1545,13 @@ cc_test( srcs = ["log_softmax_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:reference_base", + "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1520,11 +1561,11 @@ cc_test( srcs = ["lsh_projection_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1534,12 +1575,13 @@ cc_test( srcs = ["hashtable_lookup_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite:string_util", "//tensorflow/lite/kernels/internal:tensor", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1550,11 +1592,12 @@ cc_test( srcs = ["lstm_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1563,11 +1606,9 @@ cc_test( size = "small", srcs = ["lstm_eval_test.cc"], deps = [ - ":builtin_ops", + ":cpu_backend_context", ":lstm_eval", ":test_main", - ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", "@com_google_googletest//:gtest", ], @@ -1578,12 +1619,14 @@ cc_test( size = "small", srcs = ["skip_gram_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite:string_util", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1593,11 +1636,11 @@ cc_test( srcs = ["space_to_depth_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1607,11 +1650,11 @@ cc_test( srcs = ["depth_to_space_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1621,11 +1664,11 @@ cc_test( srcs = ["split_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1634,11 +1677,11 @@ cc_test( size = "small", srcs = ["split_v_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1648,11 +1691,11 @@ cc_test( srcs = ["squeeze_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1662,10 +1705,9 @@ cc_test( srcs = ["strided_slice_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1676,11 +1718,11 @@ cc_test( srcs = ["tile_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1693,11 +1735,12 @@ cc_test( ], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1707,11 +1750,11 @@ cc_test( srcs = ["neg_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1723,11 +1766,11 @@ cc_test( ], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1739,10 +1782,10 @@ cc_test( ], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1753,10 +1796,11 @@ cc_test( srcs = ["transpose_conv_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", "@com_google_absl//absl/memory", "@com_google_googletest//:gtest", ], @@ -1768,11 +1812,11 @@ cc_test( srcs = ["expand_dims_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1782,11 +1826,10 @@ cc_test( size = "small", srcs = ["sparse_to_dense_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1796,11 +1839,11 @@ cc_test( size = "small", srcs = ["shape_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1810,12 +1853,13 @@ cc_test( size = "small", srcs = ["rank_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1825,12 +1869,11 @@ cc_test( srcs = ["pow_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", "//tensorflow/lite/kernels/internal:test_util", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1840,11 +1883,10 @@ cc_test( size = "small", srcs = ["pack_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1854,10 +1896,10 @@ cc_test( size = "small", srcs = ["one_hot_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1868,12 +1910,12 @@ cc_test( srcs = ["logical_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1882,11 +1924,9 @@ cc_test( size = "small", srcs = ["unpack_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1896,11 +1936,9 @@ cc_test( size = "small", srcs = ["floor_div_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1910,12 +1948,11 @@ cc_test( size = "small", srcs = ["where_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1924,12 +1961,12 @@ cc_test( size = "small", srcs = ["zeros_like_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1938,11 +1975,9 @@ cc_test( size = "small", srcs = ["floor_mod_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1952,11 +1987,9 @@ cc_test( size = "small", srcs = ["range_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -1966,12 +1999,11 @@ cc_test( size = "small", srcs = ["squared_difference_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:builtin_op_data", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -1981,15 +2013,11 @@ cc_test( srcs = ["if_test.cc"], tags = ["tflite_not_portable_ios"], deps = [ - ":builtin_ops", ":kernel_util", ":subgraph_test_util", ":test_main", - ":test_util", - "//tensorflow/lite:builtin_op_data", "//tensorflow/lite:framework", "@com_google_googletest//:gtest", - "@flatbuffers", ], ) @@ -1999,15 +2027,10 @@ cc_test( srcs = ["while_test.cc"], tags = ["tflite_not_portable_ios"], deps = [ - ":builtin_ops", - ":kernel_util", ":subgraph_test_util", ":test_main", - ":test_util", - "//tensorflow/lite:builtin_op_data", "//tensorflow/lite:framework", "@com_google_googletest//:gtest", - "@flatbuffers", ], ) @@ -2017,10 +2040,10 @@ cc_test( srcs = ["fill_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite:string", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2029,10 +2052,9 @@ cc_test( name = "unique_test", srcs = ["unique_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2042,10 +2064,9 @@ cc_test( size = "small", srcs = ["reverse_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2059,6 +2080,8 @@ cc_test( ":test_util", "//tensorflow/lite:framework", "//tensorflow/lite/c:common", + "//tensorflow/lite/schema:schema_fbs", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -2068,11 +2091,11 @@ cc_test( size = "small", srcs = ["non_max_suppression_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -2092,10 +2115,9 @@ cc_test( name = "mirror_pad_test", srcs = ["mirror_pad_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2111,6 +2133,7 @@ cc_library( ":test_util", "//tensorflow/lite:builtin_op_data", "//tensorflow/lite:framework", + "//tensorflow/lite/c:common", "@com_google_googletest//:gtest", "@flatbuffers", ], @@ -2123,8 +2146,8 @@ cc_test( deps = [ ":kernel_util", ":subgraph_test_util", - ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/testing:util", "@com_google_googletest//:gtest", ], ) @@ -2134,10 +2157,9 @@ cc_test( size = "small", srcs = ["reverse_sequence_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2147,10 +2169,10 @@ cc_test( size = "small", srcs = ["matrix_diag_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2161,12 +2183,12 @@ cc_test( srcs = ["quantize_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", "//tensorflow/lite/kernels/internal:types", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -2175,10 +2197,10 @@ cc_test( size = "small", srcs = ["matrix_set_diag_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) @@ -2189,12 +2211,11 @@ cc_test( srcs = ["quant_basic_lstm_test.cc"], tags = ["tflite_nnapi"], deps = [ - ":builtin_ops", - ":kernel_util", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", + "@flatbuffers", ], ) @@ -2202,10 +2223,9 @@ cc_test( name = "segment_sum_test", srcs = ["segment_sum_test.cc"], deps = [ - ":builtin_ops", ":test_main", ":test_util", - "//tensorflow/lite:framework", + "//tensorflow/lite/schema:schema_fbs", "@com_google_googletest//:gtest", ], ) diff --git a/tensorflow/lite/kernels/acceleration_test_util.cc b/tensorflow/lite/kernels/acceleration_test_util.cc index 0dffd22fa26..741c34d9672 100644 --- a/tensorflow/lite/kernels/acceleration_test_util.cc +++ b/tensorflow/lite/kernels/acceleration_test_util.cc @@ -14,19 +14,11 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/acceleration_test_util.h" -#include -#include -#include -#include -#include -#include #include #include -#include +#include #include "absl/types/optional.h" -#include "tensorflow/lite/kernels/acceleration_test_util_internal.h" -#include "tensorflow/lite/minimal_logging.h" namespace tflite { diff --git a/tensorflow/lite/kernels/acceleration_test_util.h b/tensorflow/lite/kernels/acceleration_test_util.h index 75b5d79c8c4..a6a88d5f131 100644 --- a/tensorflow/lite/kernels/acceleration_test_util.h +++ b/tensorflow/lite/kernels/acceleration_test_util.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_ACCELERATION_TEST_UTIL_H_ #define TENSORFLOW_LITE_KERNELS_ACCELERATION_TEST_UTIL_H_ -#include +#include namespace tflite { diff --git a/tensorflow/lite/kernels/acceleration_test_util_internal.cc b/tensorflow/lite/kernels/acceleration_test_util_internal.cc index f4a1f5cdc87..a6ad8234f59 100644 --- a/tensorflow/lite/kernels/acceleration_test_util_internal.cc +++ b/tensorflow/lite/kernels/acceleration_test_util_internal.cc @@ -14,6 +14,14 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/acceleration_test_util_internal.h" +#include + +#include +#include +#include +#include +#include + namespace tflite { void ReadAccelerationConfig( diff --git a/tensorflow/lite/kernels/acceleration_test_util_internal.h b/tensorflow/lite/kernels/acceleration_test_util_internal.h index 8999af7e7ad..24fc2383f9e 100644 --- a/tensorflow/lite/kernels/acceleration_test_util_internal.h +++ b/tensorflow/lite/kernels/acceleration_test_util_internal.h @@ -18,14 +18,12 @@ limitations under the License. #include #include #include -#include +#include #include -#include #include #include "absl/types/optional.h" #include "re2/re2.h" -#include "tensorflow/lite/minimal_logging.h" namespace tflite { diff --git a/tensorflow/lite/kernels/acceleration_test_util_internal_test.cc b/tensorflow/lite/kernels/acceleration_test_util_internal_test.cc index 71e0c9e9912..82d21fd9332 100644 --- a/tensorflow/lite/kernels/acceleration_test_util_internal_test.cc +++ b/tensorflow/lite/kernels/acceleration_test_util_internal_test.cc @@ -14,7 +14,9 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/acceleration_test_util_internal.h" +#include #include +#include #include #include diff --git a/tensorflow/lite/kernels/activations.cc b/tensorflow/lite/kernels/activations.cc index 749a0d69ef9..2b2428f3f92 100644 --- a/tensorflow/lite/kernels/activations.cc +++ b/tensorflow/lite/kernels/activations.cc @@ -12,25 +12,35 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include #include #include +#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/internal/common.h" #include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/cppmath.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/binary_function.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/log_softmax.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/logistic.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/tanh.h" #include "tensorflow/lite/kernels/internal/reference/logistic.h" +#include "tensorflow/lite/kernels/internal/reference/prelu.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/reference/softmax.h" +#include "tensorflow/lite/kernels/internal/reference/tanh.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #if __aarch64__ && __clang__ #include diff --git a/tensorflow/lite/kernels/activations_test.cc b/tensorflow/lite/kernels/activations_test.cc index 5a679147469..50b1c041e34 100644 --- a/tensorflow/lite/kernels/activations_test.cc +++ b/tensorflow/lite/kernels/activations_test.cc @@ -12,16 +12,28 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include + +#include +#include #include +#include +#include #include +#include +#include +#include #include #include "absl/memory/memory.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { diff --git a/tensorflow/lite/kernels/add.cc b/tensorflow/lite/kernels/add.cc index d9b8c87eeb7..279f6aa12ce 100644 --- a/tensorflow/lite/kernels/add.cc +++ b/tensorflow/lite/kernels/add.cc @@ -14,16 +14,26 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/optimized/integer_ops/add.h" +#include +#include + +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/add.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/add.h" +#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/add_n.cc b/tensorflow/lite/kernels/add_n.cc index 5f6437fe331..7b4d52c5272 100644 --- a/tensorflow/lite/kernels/add_n.cc +++ b/tensorflow/lite/kernels/add_n.cc @@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" diff --git a/tensorflow/lite/kernels/add_n_test.cc b/tensorflow/lite/kernels/add_n_test.cc index ac6ccec2b66..4db646ace9c 100644 --- a/tensorflow/lite/kernels/add_n_test.cc +++ b/tensorflow/lite/kernels/add_n_test.cc @@ -12,13 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/add_test.cc b/tensorflow/lite/kernels/add_test.cc index 267b80564c9..bb883dd9b05 100644 --- a/tensorflow/lite/kernels/add_test.cc +++ b/tensorflow/lite/kernels/add_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/arg_min_max.cc b/tensorflow/lite/kernels/arg_min_max.cc index e99f59ba703..4a3902ac57c 100644 --- a/tensorflow/lite/kernels/arg_min_max.cc +++ b/tensorflow/lite/kernels/arg_min_max.cc @@ -12,13 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include "tensorflow/lite/kernels/internal/reference/arg_min_max.h" + +#include + +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/arg_min_max_test.cc b/tensorflow/lite/kernels/arg_min_max_test.cc index d028bac3fb2..957d3473b8d 100644 --- a/tensorflow/lite/kernels/arg_min_max_test.cc +++ b/tensorflow/lite/kernels/arg_min_max_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/assign_variable.cc b/tensorflow/lite/kernels/assign_variable.cc index 41ddcdda6f7..4cb4e08e43a 100644 --- a/tensorflow/lite/kernels/assign_variable.cc +++ b/tensorflow/lite/kernels/assign_variable.cc @@ -13,17 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/core/subgraph.h" #include "tensorflow/lite/experimental/resource/resource_variable.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/audio_spectrogram.cc b/tensorflow/lite/kernels/audio_spectrogram.cc index 99457ea11b1..29c9eeef3d0 100644 --- a/tensorflow/lite/kernels/audio_spectrogram.cc +++ b/tensorflow/lite/kernels/audio_spectrogram.cc @@ -13,15 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include +#include + +#include + #include "flatbuffers/flexbuffers.h" // from @flatbuffers -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/spectrogram.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/audio_spectrogram_test.cc b/tensorflow/lite/kernels/audio_spectrogram_test.cc index 0f4182ea728..cdb77303748 100644 --- a/tensorflow/lite/kernels/audio_spectrogram_test.cc +++ b/tensorflow/lite/kernels/audio_spectrogram_test.cc @@ -13,16 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include #include #include #include "flatbuffers/flexbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/basic_rnn_test.cc b/tensorflow/lite/kernels/basic_rnn_test.cc index f7cbaa5a814..2146d086c9a 100644 --- a/tensorflow/lite/kernels/basic_rnn_test.cc +++ b/tensorflow/lite/kernels/basic_rnn_test.cc @@ -14,17 +14,14 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite RNN op. -#include #include -#include #include #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/batch_matmul.cc b/tensorflow/lite/kernels/batch_matmul.cc index 9cbad101bab..d2115f96e1c 100644 --- a/tensorflow/lite/kernels/batch_matmul.cc +++ b/tensorflow/lite/kernels/batch_matmul.cc @@ -15,15 +15,21 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/reference/batch_matmul.h" +#include + +#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/batch_matmul.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/tensor_utils.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" diff --git a/tensorflow/lite/kernels/batch_matmul_test.cc b/tensorflow/lite/kernels/batch_matmul_test.cc index aec031015c0..5e52479f49b 100644 --- a/tensorflow/lite/kernels/batch_matmul_test.cc +++ b/tensorflow/lite/kernels/batch_matmul_test.cc @@ -12,12 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/batch_to_space_nd.cc b/tensorflow/lite/kernels/batch_to_space_nd.cc index d7d796ebec1..9d6492e0fcb 100644 --- a/tensorflow/lite/kernels/batch_to_space_nd.cc +++ b/tensorflow/lite/kernels/batch_to_space_nd.cc @@ -12,17 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/batch_to_space_nd_test.cc b/tensorflow/lite/kernels/batch_to_space_nd_test.cc index cffa1036c84..e675faafd74 100644 --- a/tensorflow/lite/kernels/batch_to_space_nd_test.cc +++ b/tensorflow/lite/kernels/batch_to_space_nd_test.cc @@ -13,11 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc b/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc index 8ccc7a68eb7..a984ff5124f 100644 --- a/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_lstm.cc @@ -13,6 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include #include #include "tensorflow/lite/c/builtin_op_data.h" diff --git a/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc index c468c4c09fb..3a52de130e3 100644 --- a/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc @@ -14,17 +14,12 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite Bidirectional LSTM op. -#include -#include -#include +#include #include -#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" #include "tensorflow/lite/schema/schema_generated.h" namespace tflite { diff --git a/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc b/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc index 58a2ef9c1ea..abaf6df9fa8 100644 --- a/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_rnn.cc @@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include #include #include diff --git a/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc b/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc index 4a7cc9a016d..870b99d7437 100644 --- a/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_rnn_test.cc @@ -14,15 +14,18 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite Bidirectional RNN op. -#include +#include +#include +#include +#include +#include #include #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/cast.cc b/tensorflow/lite/kernels/cast.cc index a24dadb5279..415f1270328 100644 --- a/tensorflow/lite/kernels/cast.cc +++ b/tensorflow/lite/kernels/cast.cc @@ -12,18 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include - #include #include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" -#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/cast_test.cc b/tensorflow/lite/kernels/cast_test.cc index 8f1cb44f1c9..a615edbd085 100644 --- a/tensorflow/lite/kernels/cast_test.cc +++ b/tensorflow/lite/kernels/cast_test.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/ceil.cc b/tensorflow/lite/kernels/ceil.cc index 3b1df4f6c2f..9914dbe09ce 100644 --- a/tensorflow/lite/kernels/ceil.cc +++ b/tensorflow/lite/kernels/ceil.cc @@ -16,6 +16,7 @@ limitations under the License. #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/ceil_test.cc b/tensorflow/lite/kernels/ceil_test.cc index 36486087fcf..bb23a5b6197 100644 --- a/tensorflow/lite/kernels/ceil_test.cc +++ b/tensorflow/lite/kernels/ceil_test.cc @@ -13,11 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/comparisons.cc b/tensorflow/lite/kernels/comparisons.cc index 91dbc447c35..7d1c6b7804e 100644 --- a/tensorflow/lite/kernels/comparisons.cc +++ b/tensorflow/lite/kernels/comparisons.cc @@ -12,10 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include "tensorflow/lite/kernels/internal/reference/comparisons.h" + +#include + #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/comparisons_test.cc b/tensorflow/lite/kernels/comparisons_test.cc index 986600ccd1a..f8cf6dee74c 100644 --- a/tensorflow/lite/kernels/comparisons_test.cc +++ b/tensorflow/lite/kernels/comparisons_test.cc @@ -12,11 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/concatenation.cc b/tensorflow/lite/kernels/concatenation.cc index 8beb962b1b1..61748e5ce58 100644 --- a/tensorflow/lite/kernels/concatenation.cc +++ b/tensorflow/lite/kernels/concatenation.cc @@ -12,20 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include -#include -#include -#include -#include +#include "tensorflow/lite/kernels/internal/reference/concatenation.h" + +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/concatenation_test.cc b/tensorflow/lite/kernels/concatenation_test.cc index 8f4abe0bcda..4e362598aae 100644 --- a/tensorflow/lite/kernels/concatenation_test.cc +++ b/tensorflow/lite/kernels/concatenation_test.cc @@ -12,13 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/conv.cc b/tensorflow/lite/kernels/conv.cc index 1d610b2e068..fa6caff5baa 100644 --- a/tensorflow/lite/kernels/conv.cc +++ b/tensorflow/lite/kernels/conv.cc @@ -14,19 +14,17 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/optimized/integer_ops/conv.h" -#include -#include -#include +#include + #include -#include -#include -#include -#include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/eigen_support.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" // b/131835803 forces us to include multithreaded_conv.h before optimized_ops.h #ifndef TFLITE_WITH_RUY_ONLY #include "tensorflow/lite/kernels/internal/optimized/multithreaded_conv.h" @@ -39,7 +37,6 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/kernels/padding.h" namespace tflite { diff --git a/tensorflow/lite/kernels/conv_test.cc b/tensorflow/lite/kernels/conv_test.cc index ef1d5366255..a1fd34eb1cb 100644 --- a/tensorflow/lite/kernels/conv_test.cc +++ b/tensorflow/lite/kernels/conv_test.cc @@ -12,15 +12,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include "absl/memory/memory.h" #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { diff --git a/tensorflow/lite/kernels/cpu_backend_context.cc b/tensorflow/lite/kernels/cpu_backend_context.cc index 7a16bed0ead..a99d08769ea 100644 --- a/tensorflow/lite/kernels/cpu_backend_context.cc +++ b/tensorflow/lite/kernels/cpu_backend_context.cc @@ -15,8 +15,12 @@ limitations under the License. #include "tensorflow/lite/kernels/cpu_backend_context.h" +#include + #include "public/gemmlowp.h" #include "ruy/context.h" // from @ruy +#include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/external_cpu_backend_context.h" #include "tensorflow/lite/kernels/op_macros.h" namespace { diff --git a/tensorflow/lite/kernels/cpu_backend_context.h b/tensorflow/lite/kernels/cpu_backend_context.h index b4973feb56f..19ef88bf8e3 100644 --- a/tensorflow/lite/kernels/cpu_backend_context.h +++ b/tensorflow/lite/kernels/cpu_backend_context.h @@ -20,6 +20,7 @@ limitations under the License. #include "public/gemmlowp.h" #include "ruy/context.h" // from @ruy +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/external_cpu_backend_context.h" namespace tflite { diff --git a/tensorflow/lite/kernels/cpu_backend_gemm.h b/tensorflow/lite/kernels/cpu_backend_gemm.h index 8e324c8b515..f4d20d8970a 100644 --- a/tensorflow/lite/kernels/cpu_backend_gemm.h +++ b/tensorflow/lite/kernels/cpu_backend_gemm.h @@ -18,6 +18,7 @@ limitations under the License. #include +#include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_custom_gemv.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" diff --git a/tensorflow/lite/kernels/cpu_backend_gemm_custom_gemv.h b/tensorflow/lite/kernels/cpu_backend_gemm_custom_gemv.h index 1c3c0ca39c4..224f8ecea41 100644 --- a/tensorflow/lite/kernels/cpu_backend_gemm_custom_gemv.h +++ b/tensorflow/lite/kernels/cpu_backend_gemm_custom_gemv.h @@ -32,6 +32,9 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_CPU_BACKEND_GEMM_CUSTOM_GEMV_H_ #define TENSORFLOW_LITE_KERNELS_CPU_BACKEND_GEMM_CUSTOM_GEMV_H_ +#include + +#include #include #include @@ -40,6 +43,8 @@ limitations under the License. #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" #include "tensorflow/lite/kernels/cpu_backend_threadpool.h" #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" namespace tflite { namespace cpu_backend_gemm { diff --git a/tensorflow/lite/kernels/cpu_backend_gemm_gemmlowp.h b/tensorflow/lite/kernels/cpu_backend_gemm_gemmlowp.h index 1e1074523ab..77d37aac291 100644 --- a/tensorflow/lite/kernels/cpu_backend_gemm_gemmlowp.h +++ b/tensorflow/lite/kernels/cpu_backend_gemm_gemmlowp.h @@ -16,13 +16,15 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_CPU_BACKEND_GEMM_GEMMLOWP_H_ #define TENSORFLOW_LITE_KERNELS_CPU_BACKEND_GEMM_GEMMLOWP_H_ +#include + +#include "tensorflow/lite/kernels/internal/compatibility.h" #ifndef TFLITE_WITH_RUY_ONLY #include #include #include "public/gemmlowp.h" -#include "ruy/ruy.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_ruy.h" diff --git a/tensorflow/lite/kernels/cpu_backend_gemm_ruy.h b/tensorflow/lite/kernels/cpu_backend_gemm_ruy.h index 8aaedb6a13a..07ae2ff08b7 100644 --- a/tensorflow/lite/kernels/cpu_backend_gemm_ruy.h +++ b/tensorflow/lite/kernels/cpu_backend_gemm_ruy.h @@ -17,10 +17,10 @@ limitations under the License. #define TENSORFLOW_LITE_KERNELS_CPU_BACKEND_GEMM_RUY_H_ #include "ruy/matrix.h" // from @ruy -#include "ruy/path.h" // from @ruy #include "ruy/ruy.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" namespace tflite { namespace cpu_backend_gemm { diff --git a/tensorflow/lite/kernels/cpu_backend_gemm_test.cc b/tensorflow/lite/kernels/cpu_backend_gemm_test.cc index 20334947dde..d79d1357696 100644 --- a/tensorflow/lite/kernels/cpu_backend_gemm_test.cc +++ b/tensorflow/lite/kernels/cpu_backend_gemm_test.cc @@ -15,19 +15,26 @@ limitations under the License. #include "tensorflow/lite/kernels/cpu_backend_gemm.h" +#include +#include +#include + #include -#include +#include #include #include #include #include #include #include +#include #include +#include "ruy/matrix.h" // from @ruy #include "ruy/reference_mul.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" +#include "tensorflow/lite/kernels/cpu_backend_gemm_ruy.h" namespace tflite { diff --git a/tensorflow/lite/kernels/cpu_backend_threadpool_test.cc b/tensorflow/lite/kernels/cpu_backend_threadpool_test.cc index 5089323070a..fafe4c40067 100644 --- a/tensorflow/lite/kernels/cpu_backend_threadpool_test.cc +++ b/tensorflow/lite/kernels/cpu_backend_threadpool_test.cc @@ -15,6 +15,8 @@ limitations under the License. #include "tensorflow/lite/kernels/cpu_backend_threadpool.h" +#include + #include #include "tensorflow/lite/kernels/cpu_backend_context.h" diff --git a/tensorflow/lite/kernels/custom_ops_register.h b/tensorflow/lite/kernels/custom_ops_register.h index ca9fac81889..3abc893243b 100644 --- a/tensorflow/lite/kernels/custom_ops_register.h +++ b/tensorflow/lite/kernels/custom_ops_register.h @@ -15,7 +15,7 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_CUSTOM_OPS_REGISTER_H_ #define TENSORFLOW_LITE_KERNELS_CUSTOM_OPS_REGISTER_H_ -#include "tensorflow/lite/context.h" +#include "tensorflow/lite/c/common.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/densify.cc b/tensorflow/lite/kernels/densify.cc index 0c2742d8696..cc3ac67464d 100644 --- a/tensorflow/lite/kernels/densify.cc +++ b/tensorflow/lite/kernels/densify.cc @@ -14,16 +14,13 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/reference/densify.h" -#include +#include #include -#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/densify_test.cc b/tensorflow/lite/kernels/densify_test.cc index 5cb90932069..d453606cf2e 100644 --- a/tensorflow/lite/kernels/densify_test.cc +++ b/tensorflow/lite/kernels/densify_test.cc @@ -14,18 +14,16 @@ limitations under the License. ==============================================================================*/ #include #include +#include +#include +#include #include #include "absl/memory/memory.h" -#include "third_party/eigen3/Eigen/Core" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/types.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" #include "tensorflow/lite/schema/schema_generated.h" -#include "tensorflow/lite/tools/optimize/sparsity/format_converter.h" namespace tflite { diff --git a/tensorflow/lite/kernels/depth_to_space.cc b/tensorflow/lite/kernels/depth_to_space.cc index d6fe8c7ab1c..8a81ea932bf 100644 --- a/tensorflow/lite/kernels/depth_to_space.cc +++ b/tensorflow/lite/kernels/depth_to_space.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/depth_to_space_test.cc b/tensorflow/lite/kernels/depth_to_space_test.cc index 8d59a1ad82f..4429faf9909 100644 --- a/tensorflow/lite/kernels/depth_to_space_test.cc +++ b/tensorflow/lite/kernels/depth_to_space_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/depthwise_conv.cc b/tensorflow/lite/kernels/depthwise_conv.cc index 8500b5cd39b..1897d14a065 100644 --- a/tensorflow/lite/kernels/depthwise_conv.cc +++ b/tensorflow/lite/kernels/depthwise_conv.cc @@ -15,27 +15,28 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h" -#include -#include -#include -#include -#include -#include +#include +#include + +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" #include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_multithread.h" #include "tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv_hybrid.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/depthwiseconv_float.h" #include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/depthwise_conv.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/kernels/padding.h" namespace tflite { diff --git a/tensorflow/lite/kernels/depthwise_conv_hybrid_test.cc b/tensorflow/lite/kernels/depthwise_conv_hybrid_test.cc index 09cd7cec4d7..c5158eac3d0 100644 --- a/tensorflow/lite/kernels/depthwise_conv_hybrid_test.cc +++ b/tensorflow/lite/kernels/depthwise_conv_hybrid_test.cc @@ -12,18 +12,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + #include #include -#include +#include +#include +#include +#include +#include #include #include "absl/memory/memory.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/test_util.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { diff --git a/tensorflow/lite/kernels/depthwise_conv_test.cc b/tensorflow/lite/kernels/depthwise_conv_test.cc index 5d85eac4aa9..f410476d983 100644 --- a/tensorflow/lite/kernels/depthwise_conv_test.cc +++ b/tensorflow/lite/kernels/depthwise_conv_test.cc @@ -12,17 +12,25 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + #include #include +#include +#include +#include +#include +#include #include #include "absl/memory/memory.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/test_util.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { diff --git a/tensorflow/lite/kernels/dequantize.cc b/tensorflow/lite/kernels/dequantize.cc index 272662d9c48..a2a1bd495cf 100644 --- a/tensorflow/lite/kernels/dequantize.cc +++ b/tensorflow/lite/kernels/dequantize.cc @@ -14,15 +14,11 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/dequantize.h" -#include +#include -#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/dequantize.h b/tensorflow/lite/kernels/dequantize.h index 3d9e7ccb135..30739eb2c57 100644 --- a/tensorflow/lite/kernels/dequantize.h +++ b/tensorflow/lite/kernels/dequantize.h @@ -15,16 +15,17 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_DEQUANTIZE_H_ #define TENSORFLOW_LITE_KERNELS_DEQUANTIZE_H_ +#include + #include "third_party/eigen3/Eigen/Core" -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/dequantize.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/dequantize.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/dequantize_test.cc b/tensorflow/lite/kernels/dequantize_test.cc index f55a23e138d..da795474400 100644 --- a/tensorflow/lite/kernels/dequantize_test.cc +++ b/tensorflow/lite/kernels/dequantize_test.cc @@ -13,15 +13,20 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include +#include +#include +#include +#include #include #include "absl/memory/memory.h" #include "third_party/eigen3/Eigen/Core" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/types.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { diff --git a/tensorflow/lite/kernels/detection_postprocess.cc b/tensorflow/lite/kernels/detection_postprocess.cc index 5d848bc9eab..c0b5b2ddf7c 100644 --- a/tensorflow/lite/kernels/detection_postprocess.cc +++ b/tensorflow/lite/kernels/detection_postprocess.cc @@ -12,19 +12,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include +#include +#include #include #include #include "flatbuffers/flexbuffers.h" // from @flatbuffers -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/detection_postprocess_test.cc b/tensorflow/lite/kernels/detection_postprocess_test.cc index 348ea45a515..cf0d3ba2f3d 100644 --- a/tensorflow/lite/kernels/detection_postprocess_test.cc +++ b/tensorflow/lite/kernels/detection_postprocess_test.cc @@ -12,16 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include +#include + +#include #include +#include #include #include "flatbuffers/flexbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/div.cc b/tensorflow/lite/kernels/div.cc index 731fb3c2fe2..cdd02277ec9 100644 --- a/tensorflow/lite/kernels/div.cc +++ b/tensorflow/lite/kernels/div.cc @@ -12,15 +12,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/div_test.cc b/tensorflow/lite/kernels/div_test.cc index e72565f84a0..b1a691d2452 100644 --- a/tensorflow/lite/kernels/div_test.cc +++ b/tensorflow/lite/kernels/div_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/eigen_support.cc b/tensorflow/lite/kernels/eigen_support.cc index 3f71b0a20fc..c911222f26e 100644 --- a/tensorflow/lite/kernels/eigen_support.cc +++ b/tensorflow/lite/kernels/eigen_support.cc @@ -14,9 +14,12 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/eigen_support.h" +#include +#include #include #include "tensorflow/lite/arena_planner.h" +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" #include "tensorflow/lite/kernels/op_macros.h" diff --git a/tensorflow/lite/kernels/eigen_support_test.cc b/tensorflow/lite/kernels/eigen_support_test.cc index a8c8dc0a5e4..08b58446c16 100644 --- a/tensorflow/lite/kernels/eigen_support_test.cc +++ b/tensorflow/lite/kernels/eigen_support_test.cc @@ -15,9 +15,10 @@ limitations under the License. #include "tensorflow/lite/kernels/eigen_support.h" -#include +#include #include +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/eigen_spatial_convolutions.h" namespace tflite { diff --git a/tensorflow/lite/kernels/elementwise.cc b/tensorflow/lite/kernels/elementwise.cc index 78ded8f932c..95b791be3f2 100644 --- a/tensorflow/lite/kernels/elementwise.cc +++ b/tensorflow/lite/kernels/elementwise.cc @@ -13,11 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/elementwise_test.cc b/tensorflow/lite/kernels/elementwise_test.cc index ec00d3e071d..9495be0e590 100644 --- a/tensorflow/lite/kernels/elementwise_test.cc +++ b/tensorflow/lite/kernels/elementwise_test.cc @@ -13,11 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/embedding_lookup.cc b/tensorflow/lite/kernels/embedding_lookup.cc index 0334c0daf84..36e0737c7e2 100644 --- a/tensorflow/lite/kernels/embedding_lookup.cc +++ b/tensorflow/lite/kernels/embedding_lookup.cc @@ -29,19 +29,13 @@ limitations under the License. // When indices are out of bound, the ops will not succeed. // -#include -#include -#include -#include -#include -#include -#include +#include + +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/embedding_lookup_sparse.cc b/tensorflow/lite/kernels/embedding_lookup_sparse.cc index 8ecf427d4c1..92574817e3b 100644 --- a/tensorflow/lite/kernels/embedding_lookup_sparse.cc +++ b/tensorflow/lite/kernels/embedding_lookup_sparse.cc @@ -62,6 +62,8 @@ limitations under the License. // // When indices are out of bound, the op will not succeed. +#include + #include #include @@ -70,7 +72,6 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc b/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc index 1714ff52e70..d9b2d523297 100644 --- a/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc +++ b/tensorflow/lite/kernels/embedding_lookup_sparse_test.cc @@ -15,15 +15,18 @@ limitations under the License. // Unit test for TFLite sparse lookup op. #include +#include +#include +#include #include #include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/embedding_lookup_test.cc b/tensorflow/lite/kernels/embedding_lookup_test.cc index 58e77afeeef..cbca3af0e8e 100644 --- a/tensorflow/lite/kernels/embedding_lookup_test.cc +++ b/tensorflow/lite/kernels/embedding_lookup_test.cc @@ -14,17 +14,20 @@ License. ==============================================================================*/ // Unit test for TFLite Lookup op. +#include + +#include #include -#include +#include #include #include #include #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor.h" -#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/exp.cc b/tensorflow/lite/kernels/exp.cc index b53d2f9f56a..764ae6ce7a3 100644 --- a/tensorflow/lite/kernels/exp.cc +++ b/tensorflow/lite/kernels/exp.cc @@ -12,16 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include - -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/exp_test.cc b/tensorflow/lite/kernels/exp_test.cc index b6f73169c4b..97cb591d353 100644 --- a/tensorflow/lite/kernels/exp_test.cc +++ b/tensorflow/lite/kernels/exp_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/expand_dims.cc b/tensorflow/lite/kernels/expand_dims.cc index 5c7bd167425..721ab3d510a 100644 --- a/tensorflow/lite/kernels/expand_dims.cc +++ b/tensorflow/lite/kernels/expand_dims.cc @@ -1,4 +1,5 @@ +#include /* Copyright 2017 The TensorFlow Authors. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,14 +16,11 @@ limitations under the License. ==============================================================================*/ #include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/expand_dims_test.cc b/tensorflow/lite/kernels/expand_dims_test.cc index 5bb1d76f00f..6d231d4cb63 100644 --- a/tensorflow/lite/kernels/expand_dims_test.cc +++ b/tensorflow/lite/kernels/expand_dims_test.cc @@ -1,4 +1,3 @@ - /* Copyright 2017 The TensorFlow Authors. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,12 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/fake_quant.cc b/tensorflow/lite/kernels/fake_quant.cc index 79ce8416a0a..e8ea090c7b3 100644 --- a/tensorflow/lite/kernels/fake_quant.cc +++ b/tensorflow/lite/kernels/fake_quant.cc @@ -12,16 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include - -#include - #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/fake_quant_test.cc b/tensorflow/lite/kernels/fake_quant_test.cc index 3a2dc258fe2..94c03ff1fbd 100644 --- a/tensorflow/lite/kernels/fake_quant_test.cc +++ b/tensorflow/lite/kernels/fake_quant_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/fill.cc b/tensorflow/lite/kernels/fill.cc index 19ff1de4939..68ec3e9eca3 100644 --- a/tensorflow/lite/kernels/fill.cc +++ b/tensorflow/lite/kernels/fill.cc @@ -13,12 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" +#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/fill_test.cc b/tensorflow/lite/kernels/fill_test.cc index 0717a31b9d7..4fc753ba36a 100644 --- a/tensorflow/lite/kernels/fill_test.cc +++ b/tensorflow/lite/kernels/fill_test.cc @@ -12,11 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/floor.cc b/tensorflow/lite/kernels/floor.cc index a01a3199ffc..2e341218700 100644 --- a/tensorflow/lite/kernels/floor.cc +++ b/tensorflow/lite/kernels/floor.cc @@ -18,6 +18,7 @@ limitations under the License. #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/floor_div.cc b/tensorflow/lite/kernels/floor_div.cc index 05b6d9cfeae..5677dc4d9b7 100644 --- a/tensorflow/lite/kernels/floor_div.cc +++ b/tensorflow/lite/kernels/floor_div.cc @@ -12,11 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include +#include + +#include + #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/reference/binary_function.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/floor_div_test.cc b/tensorflow/lite/kernels/floor_div_test.cc index b7dcb3babe2..d219f8913ce 100644 --- a/tensorflow/lite/kernels/floor_div_test.cc +++ b/tensorflow/lite/kernels/floor_div_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/floor_mod.cc b/tensorflow/lite/kernels/floor_mod.cc index a91ab7f07ab..a4bc9fa9841 100644 --- a/tensorflow/lite/kernels/floor_mod.cc +++ b/tensorflow/lite/kernels/floor_mod.cc @@ -12,14 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include +#include +#include #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/reference/binary_function.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" // TODO(b/117523611): We should factor out a binary_op and put binary ops there. namespace tflite { diff --git a/tensorflow/lite/kernels/floor_mod_test.cc b/tensorflow/lite/kernels/floor_mod_test.cc index f96988a855a..33b3834c972 100644 --- a/tensorflow/lite/kernels/floor_mod_test.cc +++ b/tensorflow/lite/kernels/floor_mod_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/floor_test.cc b/tensorflow/lite/kernels/floor_test.cc index e66158ba7ba..8602786f439 100644 --- a/tensorflow/lite/kernels/floor_test.cc +++ b/tensorflow/lite/kernels/floor_test.cc @@ -13,11 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/fully_connected.cc b/tensorflow/lite/kernels/fully_connected.cc index 37ccf8459bb..a1893878232 100644 --- a/tensorflow/lite/kernels/fully_connected.cc +++ b/tensorflow/lite/kernels/fully_connected.cc @@ -22,7 +22,6 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" -#include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/optimized/sparse_ops/fully_connected.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" diff --git a/tensorflow/lite/kernels/fully_connected_test.cc b/tensorflow/lite/kernels/fully_connected_test.cc index 364d54b0c8e..7f02ed079bd 100644 --- a/tensorflow/lite/kernels/fully_connected_test.cc +++ b/tensorflow/lite/kernels/fully_connected_test.cc @@ -16,19 +16,28 @@ limitations under the License. #include "tensorflow/lite/kernels/fully_connected.h" +#include +#include + +#include #include -#include +#include +#include +#include #include +#include #include #include #include #include "absl/memory/memory.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/gather.cc b/tensorflow/lite/kernels/gather.cc index b1485397291..1de49f7c486 100644 --- a/tensorflow/lite/kernels/gather.cc +++ b/tensorflow/lite/kernels/gather.cc @@ -12,14 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/gather_nd.cc b/tensorflow/lite/kernels/gather_nd.cc index 4ca0864b94f..fd31b8c4ddd 100644 --- a/tensorflow/lite/kernels/gather_nd.cc +++ b/tensorflow/lite/kernels/gather_nd.cc @@ -12,12 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/gather_nd_test.cc b/tensorflow/lite/kernels/gather_nd_test.cc index 7e2714dac5e..33dce89917d 100644 --- a/tensorflow/lite/kernels/gather_nd_test.cc +++ b/tensorflow/lite/kernels/gather_nd_test.cc @@ -12,13 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + #include #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/gather_test.cc b/tensorflow/lite/kernels/gather_test.cc index 483b59fb533..01be7f01935 100644 --- a/tensorflow/lite/kernels/gather_test.cc +++ b/tensorflow/lite/kernels/gather_test.cc @@ -12,12 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/hashtable/BUILD b/tensorflow/lite/kernels/hashtable/BUILD index 4ec3abe77ee..d141abf4f95 100644 --- a/tensorflow/lite/kernels/hashtable/BUILD +++ b/tensorflow/lite/kernels/hashtable/BUILD @@ -25,7 +25,6 @@ cc_library( "//tensorflow/lite/core/api", "//tensorflow/lite/experimental/resource", "//tensorflow/lite/kernels:kernel_util", - "//tensorflow/lite/kernels:op_macros", "//tensorflow/lite/kernels/internal:tensor", "//tensorflow/lite/schema:schema_fbs", "@flatbuffers", @@ -49,6 +48,7 @@ cc_test( "//tensorflow/lite/testing:util", "@com_google_absl//absl/memory", "@com_google_absl//absl/strings", + "@com_google_googletest//:gtest", "@flatbuffers", ], ) diff --git a/tensorflow/lite/kernels/hashtable_lookup.cc b/tensorflow/lite/kernels/hashtable_lookup.cc index a432dcb8e22..65e50fe41c2 100644 --- a/tensorflow/lite/kernels/hashtable_lookup.cc +++ b/tensorflow/lite/kernels/hashtable_lookup.cc @@ -31,18 +31,13 @@ limitations under the License. // Each item indicates whether the corresponding lookup has a returned value. // 0 for missing key, 1 for found key. -#include -#include -#include +#include + #include #include -#include -#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/hashtable_lookup_test.cc b/tensorflow/lite/kernels/hashtable_lookup_test.cc index 638d82ea167..8f90de3a71a 100644 --- a/tensorflow/lite/kernels/hashtable_lookup_test.cc +++ b/tensorflow/lite/kernels/hashtable_lookup_test.cc @@ -14,16 +14,21 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite Lookup op. -#include +#include + +#include +#include +#include +#include #include #include #include #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" #include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/if.cc b/tensorflow/lite/kernels/if.cc index 731b9d4c82f..d3f92a92b08 100644 --- a/tensorflow/lite/kernels/if.cc +++ b/tensorflow/lite/kernels/if.cc @@ -13,7 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/kernels/if_test.cc b/tensorflow/lite/kernels/if_test.cc index c81300e5d1d..0bef77ef7a7 100644 --- a/tensorflow/lite/kernels/if_test.cc +++ b/tensorflow/lite/kernels/if_test.cc @@ -13,14 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "flatbuffers/flexbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/subgraph_test_util.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/lite/kernels/internal/optimized/im2col_utils.h b/tensorflow/lite/kernels/internal/optimized/im2col_utils.h index 42aa4825771..ca4ce6bbea3 100644 --- a/tensorflow/lite/kernels/internal/optimized/im2col_utils.h +++ b/tensorflow/lite/kernels/internal/optimized/im2col_utils.h @@ -15,6 +15,8 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_IM2COL_UTILS_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_IM2COL_UTILS_H_ +#include + #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/add.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/add.h index 44479d93a31..a63763b755a 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/add.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/add.h @@ -15,9 +15,14 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_ADD_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_ADD_H_ +#include + +#include "fixedpoint/fixedpoint.h" #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/add.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/conv.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/conv.h index 61f848c888e..c426ceb3a67 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/conv.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/conv.h @@ -20,6 +20,7 @@ limitations under the License. #include "tensorflow/lite/kernels/cpu_backend_gemm.h" #include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/im2col_utils.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h index 0ff153da977..c84e7dc04d9 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv.h @@ -15,13 +15,20 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_DEPTHWISE_CONV_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_DEPTHWISE_CONV_H_ +#include + +#include +#include + #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_threadpool.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" #include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h" #include "tensorflow/lite/kernels/internal/optimized/depthwiseconv_uint8_3x3_filter.h" #include "tensorflow/lite/kernels/internal/optimized/integer_ops/depthwise_conv_3x3_filter.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/depthwiseconv_uint8.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h index 8de99c1a564..d234c5bb4a1 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/fully_connected.h @@ -18,9 +18,11 @@ limitations under the License. #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/cpu_backend_gemm.h" -#include "tensorflow/lite/kernels/cpu_backend_threadpool.h" +#include "tensorflow/lite/kernels/cpu_backend_gemm_params.h" #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/fully_connected.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { namespace optimized_integer_ops { diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/mul.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/mul.h index 15c3d291ec3..45c27ab026a 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/mul.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/mul.h @@ -15,9 +15,14 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_MUL_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_MUL_H_ +#include + +#include "fixedpoint/fixedpoint.h" #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/mul.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/optimized/integer_ops/pooling.h b/tensorflow/lite/kernels/internal/optimized/integer_ops/pooling.h index 060845f4a10..f2696500ab9 100644 --- a/tensorflow/lite/kernels/internal/optimized/integer_ops/pooling.h +++ b/tensorflow/lite/kernels/internal/optimized/integer_ops/pooling.h @@ -15,23 +15,16 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_POOLING_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_OPTIMIZED_INTEGER_OPS_POOLING_H_ -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include "fixedpoint/fixedpoint.h" #include "ruy/profiler/instrumentation.h" // from @ruy +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/cppmath.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" #include "tensorflow/lite/kernels/internal/optimized/im2col_utils.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/pooling.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" diff --git a/tensorflow/lite/kernels/internal/per_channel_dequantize_test.cc b/tensorflow/lite/kernels/internal/per_channel_dequantize_test.cc index 3ad125b86e4..89710b99b95 100644 --- a/tensorflow/lite/kernels/internal/per_channel_dequantize_test.cc +++ b/tensorflow/lite/kernels/internal/per_channel_dequantize_test.cc @@ -15,6 +15,7 @@ limitations under the License. #include #include +#include #include #include "tensorflow/lite/kernels/internal/reference/dequantize.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/reference/batch_matmul.h b/tensorflow/lite/kernels/internal/reference/batch_matmul.h index c8d6d6a0e29..1394bd9da64 100644 --- a/tensorflow/lite/kernels/internal/reference/batch_matmul.h +++ b/tensorflow/lite/kernels/internal/reference/batch_matmul.h @@ -15,8 +15,11 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_BATCH_MATMUL_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_BATCH_MATMUL_H_ -#include "tensorflow/lite/c/common.h" +#include +#include + #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/reference/portable_tensor_utils_impl.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/reference/densify.h b/tensorflow/lite/kernels/internal/reference/densify.h index d1fd488700a..71a9a26cc09 100644 --- a/tensorflow/lite/kernels/internal/reference/densify.h +++ b/tensorflow/lite/kernels/internal/reference/densify.h @@ -15,6 +15,8 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DENSIFY_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_DENSIFY_H_ +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/common.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/reference/non_max_suppression.h b/tensorflow/lite/kernels/internal/reference/non_max_suppression.h index 5d3823788ef..64c27c174fa 100644 --- a/tensorflow/lite/kernels/internal/reference/non_max_suppression.h +++ b/tensorflow/lite/kernels/internal/reference/non_max_suppression.h @@ -17,7 +17,7 @@ limitations under the License. #include #include -#include +#include #include namespace tflite { diff --git a/tensorflow/lite/kernels/internal/reference/quantize.h b/tensorflow/lite/kernels/internal/reference/quantize.h index 58d19c0a14c..d36db06f2e0 100644 --- a/tensorflow/lite/kernels/internal/reference/quantize.h +++ b/tensorflow/lite/kernels/internal/reference/quantize.h @@ -15,7 +15,11 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_QUANTIZE_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_QUANTIZE_H_ +#include +#include + #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/cppmath.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/internal/reference/strided_slice.h b/tensorflow/lite/kernels/internal/reference/strided_slice.h index ba6d4c22554..8b6f0c13da1 100644 --- a/tensorflow/lite/kernels/internal/reference/strided_slice.h +++ b/tensorflow/lite/kernels/internal/reference/strided_slice.h @@ -16,8 +16,10 @@ limitations under the License. #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_STRIDED_SLICE_H_ #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/strided_slice_logic.h" #include "tensorflow/lite/kernels/internal/types.h" + namespace tflite { namespace reference_ops { diff --git a/tensorflow/lite/kernels/internal/reference/sub.h b/tensorflow/lite/kernels/internal/reference/sub.h index 48d03de02ee..6191eaac558 100644 --- a/tensorflow/lite/kernels/internal/reference/sub.h +++ b/tensorflow/lite/kernels/internal/reference/sub.h @@ -15,9 +15,15 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SUB_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SUB_H_ -#include "fixedpoint/fixedpoint.h" +#include + +#include +#include + #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/kernels/internal/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/types.h" namespace tflite { diff --git a/tensorflow/lite/kernels/internal/reference/svdf.h b/tensorflow/lite/kernels/internal/reference/svdf.h index f03c0392ff4..ffa46b8f422 100644 --- a/tensorflow/lite/kernels/internal/reference/svdf.h +++ b/tensorflow/lite/kernels/internal/reference/svdf.h @@ -15,7 +15,10 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SVDF_H_ #define TENSORFLOW_LITE_KERNELS_INTERNAL_REFERENCE_SVDF_H_ +#include + #include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/kernels/kernel_util.cc b/tensorflow/lite/kernels/kernel_util.cc index ded536ab3a7..032726a7860 100644 --- a/tensorflow/lite/kernels/kernel_util.cc +++ b/tensorflow/lite/kernels/kernel_util.cc @@ -14,10 +14,15 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/kernel_util.h" +#include +#include + #include -#include +#include #include +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/cppmath.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" diff --git a/tensorflow/lite/kernels/kernel_util.h b/tensorflow/lite/kernels/kernel_util.h index d57234afa77..6fc69fa1629 100644 --- a/tensorflow/lite/kernels/kernel_util.h +++ b/tensorflow/lite/kernels/kernel_util.h @@ -15,10 +15,10 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_KERNEL_UTIL_H_ #define TENSORFLOW_LITE_KERNELS_KERNEL_UTIL_H_ -#include +#include + #include -#include "flatbuffers/flatbuffers.h" #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/kernels/kernel_util_test.cc b/tensorflow/lite/kernels/kernel_util_test.cc index 7a7467ee0d4..db0cc3cb39c 100644 --- a/tensorflow/lite/kernels/kernel_util_test.cc +++ b/tensorflow/lite/kernels/kernel_util_test.cc @@ -14,8 +14,18 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/kernel_util.h" +#include +#include +#include +#include + +#include +#include + #include #include +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/testing/util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/l2norm.cc b/tensorflow/lite/kernels/l2norm.cc index ab009f337de..a7fb35ed594 100644 --- a/tensorflow/lite/kernels/l2norm.cc +++ b/tensorflow/lite/kernels/l2norm.cc @@ -14,12 +14,15 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/l2normalization.h" +#include "tensorflow/lite/kernels/internal/reference/l2normalization.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/l2norm_test.cc b/tensorflow/lite/kernels/l2norm_test.cc index e4793dc5c74..968bcc556b3 100644 --- a/tensorflow/lite/kernels/l2norm_test.cc +++ b/tensorflow/lite/kernels/l2norm_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/local_response_norm.cc b/tensorflow/lite/kernels/local_response_norm.cc index 85d0796cc1c..f4b996c45a1 100644 --- a/tensorflow/lite/kernels/local_response_norm.cc +++ b/tensorflow/lite/kernels/local_response_norm.cc @@ -17,8 +17,9 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/local_response_norm_test.cc b/tensorflow/lite/kernels/local_response_norm_test.cc index 701da5ceb3d..353cce3db8a 100644 --- a/tensorflow/lite/kernels/local_response_norm_test.cc +++ b/tensorflow/lite/kernels/local_response_norm_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/log_softmax_test.cc b/tensorflow/lite/kernels/log_softmax_test.cc index bc265915279..a65ee528a30 100644 --- a/tensorflow/lite/kernels/log_softmax_test.cc +++ b/tensorflow/lite/kernels/log_softmax_test.cc @@ -14,17 +14,17 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite LOG_SOFTMAX op. -#include +#include #include #include #include #include -#include "tensorflow/lite/interpreter.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/logical.cc b/tensorflow/lite/kernels/logical.cc index 397964cfd19..ec650dd4210 100644 --- a/tensorflow/lite/kernels/logical.cc +++ b/tensorflow/lite/kernels/logical.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/reference/binary_function.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/logical_test.cc b/tensorflow/lite/kernels/logical_test.cc index 276d5d91cd1..cd85e320069 100644 --- a/tensorflow/lite/kernels/logical_test.cc +++ b/tensorflow/lite/kernels/logical_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/lsh_projection.cc b/tensorflow/lite/kernels/lsh_projection.cc index 68d0719c4e2..b809748c59c 100644 --- a/tensorflow/lite/kernels/lsh_projection.cc +++ b/tensorflow/lite/kernels/lsh_projection.cc @@ -50,20 +50,16 @@ limitations under the License. // Output.Dim == { Tensor[0].Dim[0] * Tensor[0].Dim[1] } // A flattened tensor represents projected bit vectors. -#include -#include -#include -#include +#include +#include + #include -#include -#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include namespace tflite { diff --git a/tensorflow/lite/kernels/lsh_projection_test.cc b/tensorflow/lite/kernels/lsh_projection_test.cc index 1b75992de6d..008a5c45aaa 100644 --- a/tensorflow/lite/kernels/lsh_projection_test.cc +++ b/tensorflow/lite/kernels/lsh_projection_test.cc @@ -13,13 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include #include +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/lstm_eval.cc b/tensorflow/lite/kernels/lstm_eval.cc index 7fa3d85687c..b285ed1030f 100644 --- a/tensorflow/lite/kernels/lstm_eval.cc +++ b/tensorflow/lite/kernels/lstm_eval.cc @@ -14,8 +14,13 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/lstm_eval.h" +#include +#include + #include #include +#include +#include #include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/c/builtin_op_data.h" diff --git a/tensorflow/lite/kernels/lstm_eval.h b/tensorflow/lite/kernels/lstm_eval.h index 877cfd70a89..91f47b18df6 100644 --- a/tensorflow/lite/kernels/lstm_eval.h +++ b/tensorflow/lite/kernels/lstm_eval.h @@ -17,7 +17,6 @@ limitations under the License. #include #include -#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/kernels/lstm_eval_test.cc b/tensorflow/lite/kernels/lstm_eval_test.cc index 885ae250ae7..baf2e5e83df 100644 --- a/tensorflow/lite/kernels/lstm_eval_test.cc +++ b/tensorflow/lite/kernels/lstm_eval_test.cc @@ -14,17 +14,17 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/lstm_eval.h" +#include +#include + #include -#include +#include #include -#include #include +#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/kernels/cpu_backend_context.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/lstm_test.cc b/tensorflow/lite/kernels/lstm_test.cc index 74ec8d324c6..ba5ee6508cc 100644 --- a/tensorflow/lite/kernels/lstm_test.cc +++ b/tensorflow/lite/kernels/lstm_test.cc @@ -17,15 +17,17 @@ limitations under the License. // TODO(alanchiao): add unit test with invalid input dimensions for this and its // variants. -#include +#include + +#include #include #include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/matrix_diag.cc b/tensorflow/lite/kernels/matrix_diag.cc index a4137c1e0b7..c921650926f 100644 --- a/tensorflow/lite/kernels/matrix_diag.cc +++ b/tensorflow/lite/kernels/matrix_diag.cc @@ -12,17 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/matrix_diag_test.cc b/tensorflow/lite/kernels/matrix_diag_test.cc index 09a72e9b726..d0c2a45b3b3 100644 --- a/tensorflow/lite/kernels/matrix_diag_test.cc +++ b/tensorflow/lite/kernels/matrix_diag_test.cc @@ -12,10 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include +#include #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/matrix_set_diag.cc b/tensorflow/lite/kernels/matrix_set_diag.cc index 4602ca0228c..e9c17f985d3 100644 --- a/tensorflow/lite/kernels/matrix_set_diag.cc +++ b/tensorflow/lite/kernels/matrix_set_diag.cc @@ -12,17 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/matrix_set_diag_test.cc b/tensorflow/lite/kernels/matrix_set_diag_test.cc index 46b314735b3..8fdb381f2b9 100644 --- a/tensorflow/lite/kernels/matrix_set_diag_test.cc +++ b/tensorflow/lite/kernels/matrix_set_diag_test.cc @@ -12,10 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include +#include #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/maximum_minimum.cc b/tensorflow/lite/kernels/maximum_minimum.cc index cad86acd8dd..ae1920e53db 100644 --- a/tensorflow/lite/kernels/maximum_minimum.cc +++ b/tensorflow/lite/kernels/maximum_minimum.cc @@ -12,17 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include "tensorflow/lite/kernels/internal/reference/maximum_minimum.h" -#include +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/maximum_minimum_test.cc b/tensorflow/lite/kernels/maximum_minimum_test.cc index b22435d3e97..2c036e369bd 100644 --- a/tensorflow/lite/kernels/maximum_minimum_test.cc +++ b/tensorflow/lite/kernels/maximum_minimum_test.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/mfcc.cc b/tensorflow/lite/kernels/mfcc.cc index cba7cb132eb..5fe5b948a87 100644 --- a/tensorflow/lite/kernels/mfcc.cc +++ b/tensorflow/lite/kernels/mfcc.cc @@ -14,16 +14,21 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/mfcc.h" +#include +#include + +#include + #include "flatbuffers/flexbuffers.h" // from @flatbuffers -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/mfcc_dct.h" #include "tensorflow/lite/kernels/internal/mfcc_mel_filterbank.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/mfcc_test.cc b/tensorflow/lite/kernels/mfcc_test.cc index a6b769ccd37..abe9b7b9dad 100644 --- a/tensorflow/lite/kernels/mfcc_test.cc +++ b/tensorflow/lite/kernels/mfcc_test.cc @@ -13,16 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include #include +#include #include #include "flatbuffers/flexbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/mirror_pad.cc b/tensorflow/lite/kernels/mirror_pad.cc index 17756113069..8f4f02f7848 100644 --- a/tensorflow/lite/kernels/mirror_pad.cc +++ b/tensorflow/lite/kernels/mirror_pad.cc @@ -13,9 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include #include +#include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" @@ -26,7 +31,6 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/mirror_pad_test.cc b/tensorflow/lite/kernels/mirror_pad_test.cc index 91e48fa68aa..fc8a7e68c49 100644 --- a/tensorflow/lite/kernels/mirror_pad_test.cc +++ b/tensorflow/lite/kernels/mirror_pad_test.cc @@ -12,11 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/mul.cc b/tensorflow/lite/kernels/mul.cc index 4140a1ac5b2..0ab378e278d 100644 --- a/tensorflow/lite/kernels/mul.cc +++ b/tensorflow/lite/kernels/mul.cc @@ -14,16 +14,24 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/optimized/integer_ops/mul.h" +#include +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/mul.h" +#include "tensorflow/lite/kernels/internal/reference/mul.h" +#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/mul_test.cc b/tensorflow/lite/kernels/mul_test.cc index db8dca9f4b3..9499fd40bea 100644 --- a/tensorflow/lite/kernels/mul_test.cc +++ b/tensorflow/lite/kernels/mul_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/neg.cc b/tensorflow/lite/kernels/neg.cc index 135f888a9e5..4a4ce8fcbd5 100644 --- a/tensorflow/lite/kernels/neg.cc +++ b/tensorflow/lite/kernels/neg.cc @@ -15,9 +15,12 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/reference/neg.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/neg_test.cc b/tensorflow/lite/kernels/neg_test.cc index 0cdf5161628..87326846ddd 100644 --- a/tensorflow/lite/kernels/neg_test.cc +++ b/tensorflow/lite/kernels/neg_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/non_max_suppression.cc b/tensorflow/lite/kernels/non_max_suppression.cc index f57ee1bc5d2..d6e13cdbd33 100644 --- a/tensorflow/lite/kernels/non_max_suppression.cc +++ b/tensorflow/lite/kernels/non_max_suppression.cc @@ -14,16 +14,12 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/reference/non_max_suppression.h" -#include +#include -#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/non_max_suppression_test.cc b/tensorflow/lite/kernels/non_max_suppression_test.cc index 454bb5a0959..9b7baa147e5 100644 --- a/tensorflow/lite/kernels/non_max_suppression_test.cc +++ b/tensorflow/lite/kernels/non_max_suppression_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/numeric_verify.cc b/tensorflow/lite/kernels/numeric_verify.cc index fa6324086e1..bbd2448ece0 100644 --- a/tensorflow/lite/kernels/numeric_verify.cc +++ b/tensorflow/lite/kernels/numeric_verify.cc @@ -12,25 +12,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include #include -#include #include #include #include -#include "third_party/eigen3/Eigen/Core" -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/dequantize.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/dequantize.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/numeric_verify_test.cc b/tensorflow/lite/kernels/numeric_verify_test.cc index 7dcf2436b32..9fb2e559c37 100644 --- a/tensorflow/lite/kernels/numeric_verify_test.cc +++ b/tensorflow/lite/kernels/numeric_verify_test.cc @@ -12,17 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include #include +#include #include #include "absl/memory/memory.h" #include "third_party/eigen3/Eigen/Core" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/types.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { diff --git a/tensorflow/lite/kernels/one_hot.cc b/tensorflow/lite/kernels/one_hot.cc index 750d6dac2ef..76d53c6396f 100644 --- a/tensorflow/lite/kernels/one_hot.cc +++ b/tensorflow/lite/kernels/one_hot.cc @@ -12,11 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/one_hot_test.cc b/tensorflow/lite/kernels/one_hot_test.cc index 96b549cb6eb..e94854612ab 100644 --- a/tensorflow/lite/kernels/one_hot_test.cc +++ b/tensorflow/lite/kernels/one_hot_test.cc @@ -13,13 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include +#include #include #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/op_macros.h b/tensorflow/lite/kernels/op_macros.h index 8c1a6b1be16..5c190f1c595 100644 --- a/tensorflow/lite/kernels/op_macros.h +++ b/tensorflow/lite/kernels/op_macros.h @@ -20,7 +20,6 @@ limitations under the License. #ifdef TF_LITE_MCU_DEBUG_LOG #include "tensorflow/lite/micro/debug_log.h" -#include "tensorflow/lite/micro/micro_error_reporter.h" #define DEBUG_LOG(x) \ do { \ @@ -37,7 +36,6 @@ inline void InfiniteLoop() { #else // TF_LITE_MCU_DEBUG_LOG -#include #include #include diff --git a/tensorflow/lite/kernels/optional_tensor_test.cc b/tensorflow/lite/kernels/optional_tensor_test.cc index a09f8601589..26d619276aa 100644 --- a/tensorflow/lite/kernels/optional_tensor_test.cc +++ b/tensorflow/lite/kernels/optional_tensor_test.cc @@ -14,16 +14,14 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite LSTM op. -#include -#include +#include #include -#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/pack.cc b/tensorflow/lite/kernels/pack.cc index ebc3381dae8..fc7a87692c4 100644 --- a/tensorflow/lite/kernels/pack.cc +++ b/tensorflow/lite/kernels/pack.cc @@ -13,10 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/pack_test.cc b/tensorflow/lite/kernels/pack_test.cc index bc6758c7249..c15a0b7fe1f 100644 --- a/tensorflow/lite/kernels/pack_test.cc +++ b/tensorflow/lite/kernels/pack_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/pad.cc b/tensorflow/lite/kernels/pad.cc index cc735e4eede..2239511b60a 100644 --- a/tensorflow/lite/kernels/pad.cc +++ b/tensorflow/lite/kernels/pad.cc @@ -12,17 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include "tensorflow/lite/kernels/internal/reference/pad.h" -#include +#include + +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/pad_test.cc b/tensorflow/lite/kernels/pad_test.cc index 6e1e00cc3b8..983642298be 100644 --- a/tensorflow/lite/kernels/pad_test.cc +++ b/tensorflow/lite/kernels/pad_test.cc @@ -13,11 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include +#include +#include + +#include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/pooling.cc b/tensorflow/lite/kernels/pooling.cc index 0dcb667e901..1dc5cbb6199 100644 --- a/tensorflow/lite/kernels/pooling.cc +++ b/tensorflow/lite/kernels/pooling.cc @@ -14,21 +14,22 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/optimized/integer_ops/pooling.h" -#include -#include -#include +#include +#include + #include -#include -#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/pooling.h" +#include "tensorflow/lite/kernels/internal/reference/pooling.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/kernels/padding.h" namespace tflite { diff --git a/tensorflow/lite/kernels/pooling_test.cc b/tensorflow/lite/kernels/pooling_test.cc index e609f04e21d..e614fedccfd 100644 --- a/tensorflow/lite/kernels/pooling_test.cc +++ b/tensorflow/lite/kernels/pooling_test.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/pow.cc b/tensorflow/lite/kernels/pow.cc index 8b72e7c0418..a76c77a3f9f 100644 --- a/tensorflow/lite/kernels/pow.cc +++ b/tensorflow/lite/kernels/pow.cc @@ -12,12 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/pow_test.cc b/tensorflow/lite/kernels/pow_test.cc index e106cbb1b91..fa7b6d2ef9a 100644 --- a/tensorflow/lite/kernels/pow_test.cc +++ b/tensorflow/lite/kernels/pow_test.cc @@ -12,12 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/test_util.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/quant_basic_lstm_test.cc b/tensorflow/lite/kernels/quant_basic_lstm_test.cc index 0baae569d24..3e081c221c5 100644 --- a/tensorflow/lite/kernels/quant_basic_lstm_test.cc +++ b/tensorflow/lite/kernels/quant_basic_lstm_test.cc @@ -14,16 +14,13 @@ limitations under the License. ==============================================================================*/ #include #include -#include #include #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/quantize.cc b/tensorflow/lite/kernels/quantize.cc index 21cc73278a0..1779500e6a2 100644 --- a/tensorflow/lite/kernels/quantize.cc +++ b/tensorflow/lite/kernels/quantize.cc @@ -21,6 +21,7 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" +#include "tensorflow/lite/kernels/internal/reference/requantize.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/types.h" diff --git a/tensorflow/lite/kernels/quantize_test.cc b/tensorflow/lite/kernels/quantize_test.cc index cfd9c1f434e..d7392b3e3ea 100644 --- a/tensorflow/lite/kernels/quantize_test.cc +++ b/tensorflow/lite/kernels/quantize_test.cc @@ -13,13 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include +#include +#include #include -#include "tensorflow/lite/interpreter.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/internal/types.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/range.cc b/tensorflow/lite/kernels/range.cc index ae6db1b601f..55cc543d745 100644 --- a/tensorflow/lite/kernels/range.cc +++ b/tensorflow/lite/kernels/range.cc @@ -13,7 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include +#include +#include + +#include +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" diff --git a/tensorflow/lite/kernels/range_test.cc b/tensorflow/lite/kernels/range_test.cc index 7de4fe3cb76..52f7231def9 100644 --- a/tensorflow/lite/kernels/range_test.cc +++ b/tensorflow/lite/kernels/range_test.cc @@ -12,11 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/rank.cc b/tensorflow/lite/kernels/rank.cc index 53fd92f1682..2202f6dd953 100644 --- a/tensorflow/lite/kernels/rank.cc +++ b/tensorflow/lite/kernels/rank.cc @@ -12,11 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/rank_test.cc b/tensorflow/lite/kernels/rank_test.cc index 5373a0a66fe..760560c5a92 100644 --- a/tensorflow/lite/kernels/rank_test.cc +++ b/tensorflow/lite/kernels/rank_test.cc @@ -13,13 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include +#include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/read_variable.cc b/tensorflow/lite/kernels/read_variable.cc index f4762303b8b..ad6e8d43858 100644 --- a/tensorflow/lite/kernels/read_variable.cc +++ b/tensorflow/lite/kernels/read_variable.cc @@ -13,17 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include #include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/core/subgraph.h" #include "tensorflow/lite/experimental/resource/resource_variable.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/reduce.cc b/tensorflow/lite/kernels/reduce.cc index f0222a08fe3..af42b2a369c 100644 --- a/tensorflow/lite/kernels/reduce.cc +++ b/tensorflow/lite/kernels/reduce.cc @@ -12,16 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include "tensorflow/lite/kernels/internal/reference/reduce.h" + +#include #include #include -#include +#include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/integer_ops/mean.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/mean.h" @@ -30,7 +34,6 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/reduce_test.cc b/tensorflow/lite/kernels/reduce_test.cc index ddbd5106063..2c83369ea37 100644 --- a/tensorflow/lite/kernels/reduce_test.cc +++ b/tensorflow/lite/kernels/reduce_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/register.cc b/tensorflow/lite/kernels/register.cc index 8ca58e6a309..90688a2aa1f 100644 --- a/tensorflow/lite/kernels/register.cc +++ b/tensorflow/lite/kernels/register.cc @@ -15,7 +15,9 @@ limitations under the License. #include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/builtin_op_kernels.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/register.h b/tensorflow/lite/kernels/register.h index 3e5bd298baf..a2a41ea9428 100644 --- a/tensorflow/lite/kernels/register.h +++ b/tensorflow/lite/kernels/register.h @@ -15,7 +15,6 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_REGISTER_H_ #define TENSORFLOW_LITE_KERNELS_REGISTER_H_ -#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/model.h" #include "tensorflow/lite/mutable_op_resolver.h" diff --git a/tensorflow/lite/kernels/register_ref.cc b/tensorflow/lite/kernels/register_ref.cc index 426f8a8e896..233520e2165 100644 --- a/tensorflow/lite/kernels/register_ref.cc +++ b/tensorflow/lite/kernels/register_ref.cc @@ -14,6 +14,10 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/register_ref.h" + +#include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/mutable_op_resolver.h" +#include "tensorflow/lite/schema/schema_generated.h" #include "tensorflow/lite/util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/register_ref.h b/tensorflow/lite/kernels/register_ref.h index 5d9cb2c0b95..406fad89673 100644 --- a/tensorflow/lite/kernels/register_ref.h +++ b/tensorflow/lite/kernels/register_ref.h @@ -16,8 +16,8 @@ limitations under the License. #define TENSORFLOW_LITE_KERNELS_REGISTER_REF_H_ #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/model.h" #include "tensorflow/lite/mutable_op_resolver.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/reshape.cc b/tensorflow/lite/kernels/reshape.cc index 6afc3c8a670..ab6f0d8577d 100644 --- a/tensorflow/lite/kernels/reshape.cc +++ b/tensorflow/lite/kernels/reshape.cc @@ -12,6 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include #include #include @@ -20,7 +21,6 @@ limitations under the License. #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/reshape_test.cc b/tensorflow/lite/kernels/reshape_test.cc index 310d594698c..09f8ce6a3d5 100644 --- a/tensorflow/lite/kernels/reshape_test.cc +++ b/tensorflow/lite/kernels/reshape_test.cc @@ -12,14 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include #include #include #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/reshape_test_common.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/reshape_test_common.h b/tensorflow/lite/kernels/reshape_test_common.h index 9dbf028e7be..662c163b7c0 100644 --- a/tensorflow/lite/kernels/reshape_test_common.h +++ b/tensorflow/lite/kernels/reshape_test_common.h @@ -15,7 +15,15 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_RESHAPE_TEST_COMMON_H_ #define TENSORFLOW_LITE_KERNELS_RESHAPE_TEST_COMMON_H_ +#include + +#include +#include +#include + #include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { // There are three ways to specify the output shape of a Reshape diff --git a/tensorflow/lite/kernels/resize_bilinear.cc b/tensorflow/lite/kernels/resize_bilinear.cc index dfd58255491..b0488a0b464 100644 --- a/tensorflow/lite/kernels/resize_bilinear.cc +++ b/tensorflow/lite/kernels/resize_bilinear.cc @@ -12,13 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/resize_bilinear_test.cc b/tensorflow/lite/kernels/resize_bilinear_test.cc index d4d414ae29c..6dedc0d169d 100644 --- a/tensorflow/lite/kernels/resize_bilinear_test.cc +++ b/tensorflow/lite/kernels/resize_bilinear_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/resize_nearest_neighbor.cc b/tensorflow/lite/kernels/resize_nearest_neighbor.cc index 1b58e5245ee..fff45ac13cc 100644 --- a/tensorflow/lite/kernels/resize_nearest_neighbor.cc +++ b/tensorflow/lite/kernels/resize_nearest_neighbor.cc @@ -12,13 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include "tensorflow/lite/kernels/internal/reference/resize_nearest_neighbor.h" + +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc b/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc index 656bd6ee750..b22ad48afb9 100644 --- a/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc +++ b/tensorflow/lite/kernels/resize_nearest_neighbor_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/reverse.cc b/tensorflow/lite/kernels/reverse.cc index 760236ad6a7..9ce845b4b7b 100644 --- a/tensorflow/lite/kernels/reverse.cc +++ b/tensorflow/lite/kernels/reverse.cc @@ -13,10 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/reverse_sequence.cc b/tensorflow/lite/kernels/reverse_sequence.cc index 8e976cccd90..7390876d39b 100644 --- a/tensorflow/lite/kernels/reverse_sequence.cc +++ b/tensorflow/lite/kernels/reverse_sequence.cc @@ -13,10 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/reverse_sequence_test.cc b/tensorflow/lite/kernels/reverse_sequence_test.cc index f1fefdd4856..3d9dcdc0b69 100644 --- a/tensorflow/lite/kernels/reverse_sequence_test.cc +++ b/tensorflow/lite/kernels/reverse_sequence_test.cc @@ -12,10 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include + +#include + +#include #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/reverse_test.cc b/tensorflow/lite/kernels/reverse_test.cc index 02101ab172c..f1fcf67fd42 100644 --- a/tensorflow/lite/kernels/reverse_test.cc +++ b/tensorflow/lite/kernels/reverse_test.cc @@ -12,10 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include + +#include + +#include #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/rfft2d.cc b/tensorflow/lite/kernels/rfft2d.cc index fa201153daf..9aeee53f637 100644 --- a/tensorflow/lite/kernels/rfft2d.cc +++ b/tensorflow/lite/kernels/rfft2d.cc @@ -13,13 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include +#include +#include + +#include +#include + #include "third_party/fft2d/fft2d.h" #include "ruy/profiler/instrumentation.h" // from @ruy -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/rfft2d_test.cc b/tensorflow/lite/kernels/rfft2d_test.cc index d4b6a0a9d83..e9b23bacf0c 100644 --- a/tensorflow/lite/kernels/rfft2d_test.cc +++ b/tensorflow/lite/kernels/rfft2d_test.cc @@ -13,13 +13,17 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + +#include +#include #include #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/custom_ops_register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/round.cc b/tensorflow/lite/kernels/round.cc index fd16605abeb..341d2880705 100644 --- a/tensorflow/lite/kernels/round.cc +++ b/tensorflow/lite/kernels/round.cc @@ -13,9 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include "tensorflow/lite/kernels/internal/reference/round.h" + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/round_test.cc b/tensorflow/lite/kernels/round_test.cc index baa614347d2..3402014f25f 100644 --- a/tensorflow/lite/kernels/round_test.cc +++ b/tensorflow/lite/kernels/round_test.cc @@ -13,11 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/scatter_nd.cc b/tensorflow/lite/kernels/scatter_nd.cc index 32f83357f8c..4e904f66692 100644 --- a/tensorflow/lite/kernels/scatter_nd.cc +++ b/tensorflow/lite/kernels/scatter_nd.cc @@ -13,14 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/context.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/scatter_nd_test.cc b/tensorflow/lite/kernels/scatter_nd_test.cc index e25ba9b93f3..9fdf176fe1f 100644 --- a/tensorflow/lite/kernels/scatter_nd_test.cc +++ b/tensorflow/lite/kernels/scatter_nd_test.cc @@ -12,13 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + +#include +#include + #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/segment_sum.cc b/tensorflow/lite/kernels/segment_sum.cc index db8aa688ebe..8185359321e 100644 --- a/tensorflow/lite/kernels/segment_sum.cc +++ b/tensorflow/lite/kernels/segment_sum.cc @@ -13,10 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/segment_sum_test.cc b/tensorflow/lite/kernels/segment_sum_test.cc index d083feb44aa..ec531ffd92d 100644 --- a/tensorflow/lite/kernels/segment_sum_test.cc +++ b/tensorflow/lite/kernels/segment_sum_test.cc @@ -12,11 +12,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/select.cc b/tensorflow/lite/kernels/select.cc index 89fac10c869..281425253c5 100644 --- a/tensorflow/lite/kernels/select.cc +++ b/tensorflow/lite/kernels/select.cc @@ -12,12 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" -#include "tensorflow/lite/string_util.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/select_test.cc b/tensorflow/lite/kernels/select_test.cc index 36935b0b6dc..56ed994d805 100644 --- a/tensorflow/lite/kernels/select_test.cc +++ b/tensorflow/lite/kernels/select_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/shape.cc b/tensorflow/lite/kernels/shape.cc index d979f083f70..afeadc38c20 100644 --- a/tensorflow/lite/kernels/shape.cc +++ b/tensorflow/lite/kernels/shape.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/shape_test.cc b/tensorflow/lite/kernels/shape_test.cc index 3eeb83f5000..292b40ab7cc 100644 --- a/tensorflow/lite/kernels/shape_test.cc +++ b/tensorflow/lite/kernels/shape_test.cc @@ -13,13 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include +#include #include #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/skip_gram.cc b/tensorflow/lite/kernels/skip_gram.cc index 3eb415a55a8..8348a25bba7 100644 --- a/tensorflow/lite/kernels/skip_gram.cc +++ b/tensorflow/lite/kernels/skip_gram.cc @@ -31,13 +31,11 @@ limitations under the License. #include -#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/skip_gram_test.cc b/tensorflow/lite/kernels/skip_gram_test.cc index 12d631660ee..9a5b541c077 100644 --- a/tensorflow/lite/kernels/skip_gram_test.cc +++ b/tensorflow/lite/kernels/skip_gram_test.cc @@ -13,13 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include #include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" #include "tensorflow/lite/string_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/slice.cc b/tensorflow/lite/kernels/slice.cc index 1d2cc588abc..c99e1b573b9 100644 --- a/tensorflow/lite/kernels/slice.cc +++ b/tensorflow/lite/kernels/slice.cc @@ -13,17 +13,21 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include +#include +#include #include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/slice_test.cc b/tensorflow/lite/kernels/slice_test.cc index 1a31ae44a5d..f950f3346ab 100644 --- a/tensorflow/lite/kernels/slice_test.cc +++ b/tensorflow/lite/kernels/slice_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/softmax_test.cc b/tensorflow/lite/kernels/softmax_test.cc index 79f3608fe9a..b8e3b3076b3 100644 --- a/tensorflow/lite/kernels/softmax_test.cc +++ b/tensorflow/lite/kernels/softmax_test.cc @@ -14,17 +14,18 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite SOFTMAX op. -#include +#include "tensorflow/lite/kernels/internal/reference/softmax.h" + +#include #include #include -#include #include -#include "tensorflow/lite/interpreter.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" -#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/space_to_batch_nd.cc b/tensorflow/lite/kernels/space_to_batch_nd.cc index e8756ef5f2e..7fc58e7ee6b 100644 --- a/tensorflow/lite/kernels/space_to_batch_nd.cc +++ b/tensorflow/lite/kernels/space_to_batch_nd.cc @@ -12,17 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/space_to_batch_nd_test.cc b/tensorflow/lite/kernels/space_to_batch_nd_test.cc index d34989f0fb7..0591265f73b 100644 --- a/tensorflow/lite/kernels/space_to_batch_nd_test.cc +++ b/tensorflow/lite/kernels/space_to_batch_nd_test.cc @@ -13,11 +13,15 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/space_to_depth.cc b/tensorflow/lite/kernels/space_to_depth.cc index 527b7c83adb..e4c7efaaf99 100644 --- a/tensorflow/lite/kernels/space_to_depth.cc +++ b/tensorflow/lite/kernels/space_to_depth.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/space_to_depth_test.cc b/tensorflow/lite/kernels/space_to_depth_test.cc index ad2f95d82ba..523dc60a37f 100644 --- a/tensorflow/lite/kernels/space_to_depth_test.cc +++ b/tensorflow/lite/kernels/space_to_depth_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/sparse_to_dense.cc b/tensorflow/lite/kernels/sparse_to_dense.cc index 29c87734748..bdf0f4e703a 100644 --- a/tensorflow/lite/kernels/sparse_to_dense.cc +++ b/tensorflow/lite/kernels/sparse_to_dense.cc @@ -12,20 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include -#include -#include -#include -#include +#include + +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" #include "tensorflow/lite/kernels/op_macros.h" -#include "tensorflow/lite/kernels/padding.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/sparse_to_dense_test.cc b/tensorflow/lite/kernels/sparse_to_dense_test.cc index ad040b2ce04..add4b53ca48 100644 --- a/tensorflow/lite/kernels/sparse_to_dense_test.cc +++ b/tensorflow/lite/kernels/sparse_to_dense_test.cc @@ -1,4 +1,3 @@ - /* Copyright 2018 The TensorFlow Authors. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,12 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/split.cc b/tensorflow/lite/kernels/split.cc index da239e6ecab..3b7781f409e 100644 --- a/tensorflow/lite/kernels/split.cc +++ b/tensorflow/lite/kernels/split.cc @@ -12,17 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include - -#include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/split_test.cc b/tensorflow/lite/kernels/split_test.cc index 7952396880c..ae7c5cf76e8 100644 --- a/tensorflow/lite/kernels/split_test.cc +++ b/tensorflow/lite/kernels/split_test.cc @@ -12,11 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/split_v.cc b/tensorflow/lite/kernels/split_v.cc index b5529b98ecb..7d60086a91d 100644 --- a/tensorflow/lite/kernels/split_v.cc +++ b/tensorflow/lite/kernels/split_v.cc @@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include #include "tensorflow/lite/c/builtin_op_data.h" @@ -19,8 +21,9 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/split_v_test.cc b/tensorflow/lite/kernels/split_v_test.cc index 4e143cabe58..a10e277d653 100644 --- a/tensorflow/lite/kernels/split_v_test.cc +++ b/tensorflow/lite/kernels/split_v_test.cc @@ -12,13 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/squared_difference.cc b/tensorflow/lite/kernels/squared_difference.cc index fbea2403a53..e17ff8e3191 100644 --- a/tensorflow/lite/kernels/squared_difference.cc +++ b/tensorflow/lite/kernels/squared_difference.cc @@ -12,14 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include "tensorflow/lite/c/builtin_op_data.h" +#include +#include + +#include "ruy/profiler/instrumentation.h" // from @ruy #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/binary_function.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/squared_difference_test.cc b/tensorflow/lite/kernels/squared_difference_test.cc index 249590f37e9..efac1969144 100644 --- a/tensorflow/lite/kernels/squared_difference_test.cc +++ b/tensorflow/lite/kernels/squared_difference_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/squeeze.cc b/tensorflow/lite/kernels/squeeze.cc index fa5656e1d59..c4dc51026a6 100644 --- a/tensorflow/lite/kernels/squeeze.cc +++ b/tensorflow/lite/kernels/squeeze.cc @@ -14,13 +14,10 @@ limitations under the License. ==============================================================================*/ #include -#include - #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/squeeze_test.cc b/tensorflow/lite/kernels/squeeze_test.cc index 575a02a70f8..4239ae43e1c 100644 --- a/tensorflow/lite/kernels/squeeze_test.cc +++ b/tensorflow/lite/kernels/squeeze_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/strided_slice.cc b/tensorflow/lite/kernels/strided_slice.cc index e2ca812d193..50c2255e526 100644 --- a/tensorflow/lite/kernels/strided_slice.cc +++ b/tensorflow/lite/kernels/strided_slice.cc @@ -15,14 +15,20 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/reference/strided_slice.h" +#include +#include + +#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/strided_slice_logic.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/strided_slice_test.cc b/tensorflow/lite/kernels/strided_slice_test.cc index e97eab5b7c4..5f625d3f201 100644 --- a/tensorflow/lite/kernels/strided_slice_test.cc +++ b/tensorflow/lite/kernels/strided_slice_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/sub.cc b/tensorflow/lite/kernels/sub.cc index a2282a0545b..aa628fa5408 100644 --- a/tensorflow/lite/kernels/sub.cc +++ b/tensorflow/lite/kernels/sub.cc @@ -14,18 +14,27 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/internal/reference/sub.h" +#include +#include + +#include #include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/cpu_check.h" +#include "tensorflow/lite/kernels/internal/optimized/neon_check.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" +#include "tensorflow/lite/kernels/internal/reference/add.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/add.h" +#include "tensorflow/lite/kernels/internal/reference/process_broadcast_shapes.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/sub_test.cc b/tensorflow/lite/kernels/sub_test.cc index adda1b810ce..21f2dc7cabd 100644 --- a/tensorflow/lite/kernels/sub_test.cc +++ b/tensorflow/lite/kernels/sub_test.cc @@ -12,11 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/subgraph_test_util.cc b/tensorflow/lite/kernels/subgraph_test_util.cc index 00f947a9e38..8f1964ad10f 100644 --- a/tensorflow/lite/kernels/subgraph_test_util.cc +++ b/tensorflow/lite/kernels/subgraph_test_util.cc @@ -15,13 +15,18 @@ limitations under the License. #include "tensorflow/lite/kernels/subgraph_test_util.h" -#include "flatbuffers/flexbuffers.h" // from @flatbuffers +#include +#include +#include + +#include + +#include +#include "tensorflow/lite/c/builtin_op_data.h" +#include "tensorflow/lite/c/common.h" #include "tensorflow/lite/core/subgraph.h" #include "tensorflow/lite/kernels/builtin_op_kernels.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/register.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" namespace tflite { namespace subgraph_test_util { diff --git a/tensorflow/lite/kernels/subgraph_test_util.h b/tensorflow/lite/kernels/subgraph_test_util.h index 95b7206fc29..7306f82344d 100644 --- a/tensorflow/lite/kernels/subgraph_test_util.h +++ b/tensorflow/lite/kernels/subgraph_test_util.h @@ -20,6 +20,11 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_SUBGRAPH_TEST_UTIL_H_ #define TENSORFLOW_LITE_KERNELS_SUBGRAPH_TEST_UTIL_H_ +#include + +#include +#include + #include #include "tensorflow/lite/core/subgraph.h" #include "tensorflow/lite/interpreter.h" diff --git a/tensorflow/lite/kernels/subgraph_test_util_test.cc b/tensorflow/lite/kernels/subgraph_test_util_test.cc index 4bd0482da17..39e013294f7 100644 --- a/tensorflow/lite/kernels/subgraph_test_util_test.cc +++ b/tensorflow/lite/kernels/subgraph_test_util_test.cc @@ -14,10 +14,16 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/subgraph_test_util.h" + +#include + +#include +#include + #include #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/test_util.h" +#include "tensorflow/lite/testing/util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/svdf.cc b/tensorflow/lite/kernels/svdf.cc index 57eedb6b204..1b8bf904b8a 100644 --- a/tensorflow/lite/kernels/svdf.cc +++ b/tensorflow/lite/kernels/svdf.cc @@ -24,6 +24,7 @@ limitations under the License. #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/quantization_util.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" diff --git a/tensorflow/lite/kernels/svdf_test.cc b/tensorflow/lite/kernels/svdf_test.cc index 68963b784f4..b0ac2011948 100644 --- a/tensorflow/lite/kernels/svdf_test.cc +++ b/tensorflow/lite/kernels/svdf_test.cc @@ -14,15 +14,15 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite SVDF op. -#include +#include + +#include #include -#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/test_util.cc b/tensorflow/lite/kernels/test_util.cc index 010aed31dc6..24f6e4f11ca 100644 --- a/tensorflow/lite/kernels/test_util.cc +++ b/tensorflow/lite/kernels/test_util.cc @@ -14,18 +14,37 @@ limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/test_util.h" -#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/core/platform/logging.h" -#include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/core/api/op_resolver.h" +#include "tensorflow/lite/core/subgraph.h" #include "tensorflow/lite/delegates/nnapi/acceleration_test_util.h" #include "tensorflow/lite/delegates/nnapi/nnapi_delegate.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/acceleration_test_util.h" +#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/minimal_logging.h" +#include "tensorflow/lite/model.h" #include "tensorflow/lite/nnapi/nnapi_implementation.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" +#include "tensorflow/lite/string_util.h" #include "tensorflow/lite/tools/versioning/op_version.h" #include "tensorflow/lite/version.h" diff --git a/tensorflow/lite/kernels/test_util.h b/tensorflow/lite/kernels/test_util.h index f0f02d25add..bc93bdae58a 100644 --- a/tensorflow/lite/kernels/test_util.h +++ b/tensorflow/lite/kernels/test_util.h @@ -15,25 +15,39 @@ limitations under the License. #ifndef TENSORFLOW_LITE_KERNELS_TEST_UTIL_H_ #define TENSORFLOW_LITE_KERNELS_TEST_UTIL_H_ +#include +#include +#include +#include + +#include #include #include +#include +#include +#include +#include +#include +#include +#include #include +#include #include #include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/core/platform/logging.h" -#include "tensorflow/lite/c/common.h" -#include "tensorflow/lite/delegates/nnapi/nnapi_delegate_kernel.h" +#include "tensorflow/lite/core/api/op_resolver.h" #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor_utils.h" -#include "tensorflow/lite/kernels/register.h" -#include "tensorflow/lite/model.h" #include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" #include "tensorflow/lite/string_util.h" -#include "tensorflow/lite/testing/util.h" +#include "tensorflow/lite/testing/util.h" // IWYU pragma: keep #include "tensorflow/lite/tools/optimize/quantization_utils.h" #include "tensorflow/lite/tools/optimize/sparsity/format_converter.h" +#include "tensorflow/lite/type_to_tflitetype.h" namespace tflite { diff --git a/tensorflow/lite/kernels/test_util_test.cc b/tensorflow/lite/kernels/test_util_test.cc index 7abb7011f9d..e6f865f6cd6 100644 --- a/tensorflow/lite/kernels/test_util_test.cc +++ b/tensorflow/lite/kernels/test_util_test.cc @@ -13,7 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ #include "tensorflow/lite/kernels/test_util.h" + +#include + +#include + #include +#include "tensorflow/lite/testing/util.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/tile.cc b/tensorflow/lite/kernels/tile.cc index 64f6bd05485..884456fcbf2 100644 --- a/tensorflow/lite/kernels/tile.cc +++ b/tensorflow/lite/kernels/tile.cc @@ -12,16 +12,19 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include +#include +#include +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" +#include "tensorflow/lite/string_util.h" + namespace tflite { namespace ops { namespace builtin { diff --git a/tensorflow/lite/kernels/tile_test.cc b/tensorflow/lite/kernels/tile_test.cc index 0df1f33c2bc..7a5203937a5 100644 --- a/tensorflow/lite/kernels/tile_test.cc +++ b/tensorflow/lite/kernels/tile_test.cc @@ -12,12 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include + +#include #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/topk_v2.cc b/tensorflow/lite/kernels/topk_v2.cc index 3e313481725..6a5bd392086 100644 --- a/tensorflow/lite/kernels/topk_v2.cc +++ b/tensorflow/lite/kernels/topk_v2.cc @@ -12,13 +12,18 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include + +#include +#include +#include -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" + namespace tflite { namespace ops { namespace builtin { diff --git a/tensorflow/lite/kernels/topk_v2_test.cc b/tensorflow/lite/kernels/topk_v2_test.cc index 72ed82c1449..5d96fe06bf4 100644 --- a/tensorflow/lite/kernels/topk_v2_test.cc +++ b/tensorflow/lite/kernels/topk_v2_test.cc @@ -1,4 +1,3 @@ - /* Copyright 2017 The TensorFlow Authors. All Rights Reserved. Licensed under the Apache License, Version 2.0 (the "License"); @@ -13,12 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/c/builtin_op_data.h" -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/transpose.cc b/tensorflow/lite/kernels/transpose.cc index 511b45e9f4a..27f5cf6f065 100644 --- a/tensorflow/lite/kernels/transpose.cc +++ b/tensorflow/lite/kernels/transpose.cc @@ -12,17 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include -#include - -#include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" namespace tflite { namespace ops { diff --git a/tensorflow/lite/kernels/transpose_conv.cc b/tensorflow/lite/kernels/transpose_conv.cc index 494433159d4..33e122ba037 100644 --- a/tensorflow/lite/kernels/transpose_conv.cc +++ b/tensorflow/lite/kernels/transpose_conv.cc @@ -13,27 +13,26 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include -#include -#include -#include -#include -#include +#include +#include + +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/cpu_backend_context.h" #include "tensorflow/lite/kernels/eigen_support.h" +#include "tensorflow/lite/kernels/internal/compatibility.h" // NOLINTNEXTLINE - This header file should't go to the top. #include "tensorflow/lite/kernels/internal/optimized/integer_ops/transpose_conv.h" #include "tensorflow/lite/kernels/internal/optimized/optimized_ops.h" // NOLINTNEXTLINE - This header file should't go to the top. #include "tensorflow/lite/kernels/internal/reference/integer_ops/transpose_conv.h" +#include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/op_macros.h" #include "tensorflow/lite/kernels/padding.h" namespace tflite { diff --git a/tensorflow/lite/kernels/transpose_conv_test.cc b/tensorflow/lite/kernels/transpose_conv_test.cc index 25c55c95412..b57bc047f62 100644 --- a/tensorflow/lite/kernels/transpose_conv_test.cc +++ b/tensorflow/lite/kernels/transpose_conv_test.cc @@ -12,14 +12,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include "absl/memory/memory.h" #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" +#include "tensorflow/lite/string_type.h" namespace tflite { diff --git a/tensorflow/lite/kernels/transpose_test.cc b/tensorflow/lite/kernels/transpose_test.cc index 30594da5d51..a88abec7161 100644 --- a/tensorflow/lite/kernels/transpose_test.cc +++ b/tensorflow/lite/kernels/transpose_test.cc @@ -12,13 +12,20 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers +#include "tensorflow/lite/kernels/internal/compatibility.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" -#include "tensorflow/lite/kernels/register.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc b/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc index 0552885f720..b8b9396f436 100644 --- a/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_lstm.cc @@ -13,6 +13,8 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include #include "tensorflow/lite/c/builtin_op_data.h" diff --git a/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc index 4ea018c0cab..43cc75f894b 100644 --- a/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc @@ -14,15 +14,13 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite Sequential LSTM op. -#include #include #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc b/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc index 8b6f102acdb..f1486267c17 100644 --- a/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc +++ b/tensorflow/lite/kernels/unidirectional_sequence_rnn_test.cc @@ -14,15 +14,14 @@ limitations under the License. ==============================================================================*/ // Unit test for TFLite Sequential RNN op. -#include +#include #include #include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/unique.cc b/tensorflow/lite/kernels/unique.cc index d0d277ecaa4..dd5c801b468 100644 --- a/tensorflow/lite/kernels/unique.cc +++ b/tensorflow/lite/kernels/unique.cc @@ -13,12 +13,18 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include +#include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/unique_test.cc b/tensorflow/lite/kernels/unique_test.cc index b18fcbed654..d01616025bf 100644 --- a/tensorflow/lite/kernels/unique_test.cc +++ b/tensorflow/lite/kernels/unique_test.cc @@ -12,11 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/unpack.cc b/tensorflow/lite/kernels/unpack.cc index 285e01b3558..8d307acb268 100644 --- a/tensorflow/lite/kernels/unpack.cc +++ b/tensorflow/lite/kernels/unpack.cc @@ -13,10 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" +#include "tensorflow/lite/kernels/internal/types.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/unpack_test.cc b/tensorflow/lite/kernels/unpack_test.cc index 0c6b8fa157c..14d9b9e66b7 100644 --- a/tensorflow/lite/kernels/unpack_test.cc +++ b/tensorflow/lite/kernels/unpack_test.cc @@ -12,11 +12,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include +#include +#include + +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/variable_ops_test.cc b/tensorflow/lite/kernels/variable_ops_test.cc index 2efac9d7d8f..077a03df21d 100644 --- a/tensorflow/lite/kernels/variable_ops_test.cc +++ b/tensorflow/lite/kernels/variable_ops_test.cc @@ -12,13 +12,11 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ -#include +#include #include #include "tensorflow/lite/interpreter.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/lite/kernels/where.cc b/tensorflow/lite/kernels/where.cc index 867d3069f2c..a20efa8baaa 100644 --- a/tensorflow/lite/kernels/where.cc +++ b/tensorflow/lite/kernels/where.cc @@ -12,6 +12,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/reference/reference_ops.h" #include "tensorflow/lite/kernels/internal/tensor.h" diff --git a/tensorflow/lite/kernels/where_test.cc b/tensorflow/lite/kernels/where_test.cc index f52c9aad487..ba93bed6e74 100644 --- a/tensorflow/lite/kernels/where_test.cc +++ b/tensorflow/lite/kernels/where_test.cc @@ -12,13 +12,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include #include -#include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/kernels/while.cc b/tensorflow/lite/kernels/while.cc index 81b6c0c6634..99d6d2cc1c8 100644 --- a/tensorflow/lite/kernels/while.cc +++ b/tensorflow/lite/kernels/while.cc @@ -13,7 +13,10 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + #include +#include #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/c/common.h" diff --git a/tensorflow/lite/kernels/while_test.cc b/tensorflow/lite/kernels/while_test.cc index 324519e32a0..b0b63f8c643 100644 --- a/tensorflow/lite/kernels/while_test.cc +++ b/tensorflow/lite/kernels/while_test.cc @@ -12,14 +12,14 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include +#include + #include -#include "flatbuffers/flexbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/kernel_util.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/subgraph_test_util.h" -#include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" namespace tflite { diff --git a/tensorflow/lite/kernels/zeros_like.cc b/tensorflow/lite/kernels/zeros_like.cc index ad6d03649f6..8586c945e7c 100644 --- a/tensorflow/lite/kernels/zeros_like.cc +++ b/tensorflow/lite/kernels/zeros_like.cc @@ -13,8 +13,12 @@ See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include +#include + #include "tensorflow/lite/c/common.h" #include "tensorflow/lite/kernels/internal/tensor.h" +#include "tensorflow/lite/kernels/internal/tensor_ctypes.h" #include "tensorflow/lite/kernels/kernel_util.h" namespace tflite { diff --git a/tensorflow/lite/kernels/zeros_like_test.cc b/tensorflow/lite/kernels/zeros_like_test.cc index 09a233c2c30..0be6336ce3e 100644 --- a/tensorflow/lite/kernels/zeros_like_test.cc +++ b/tensorflow/lite/kernels/zeros_like_test.cc @@ -12,11 +12,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ==============================================================================*/ +#include + +#include + +#include #include +#include "flatbuffers/flatbuffers.h" // from @flatbuffers #include "tensorflow/lite/interpreter.h" -#include "tensorflow/lite/kernels/register.h" #include "tensorflow/lite/kernels/test_util.h" -#include "tensorflow/lite/model.h" +#include "tensorflow/lite/schema/schema_generated.h" namespace tflite { namespace { diff --git a/tensorflow/lite/micro/kernels/cmsis-nn/pooling.cc b/tensorflow/lite/micro/kernels/cmsis-nn/pooling.cc index 381e3632b3a..001b0feaef2 100644 --- a/tensorflow/lite/micro/kernels/cmsis-nn/pooling.cc +++ b/tensorflow/lite/micro/kernels/cmsis-nn/pooling.cc @@ -15,6 +15,7 @@ limitations under the License. #include "tensorflow/lite/kernels/internal/reference/pooling.h" #include "cmsis/CMSIS/NN/Include/arm_nnfunctions.h" +#include "flatbuffers/base.h" // from @flatbuffers #include "tensorflow/lite/c/builtin_op_data.h" #include "tensorflow/lite/kernels/internal/reference/integer_ops/pooling.h" #include "tensorflow/lite/kernels/internal/tensor_ctypes.h"