Move the TfLiteArrayIs matcher out of kernels.

This moves the matcher closer to the definition of `TfLite*Array` and allows us to use it inside the `lite` folder without pulling in all the dependencies of `kernels:test_utils`. PiperOrigin-RevId: 544204174
tensorflow · Jun 29, 2023 · 4b5e96e · 4b5e96e
1 parent d383ef3
commit 4b5e96e
Show file tree

Hide file tree

Showing 5 changed files with 527 additions and 213 deletions.
diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD
@@ -1157,20 +1157,6 @@ cc_test(
     ],
 )
 
-cc_test(
-    name = "test_util_test",
-    srcs = ["test_util_test.cc"],
-    deps = [
-        ":array",
-        ":test_util",
-        "//tensorflow/lite/core/c:common",
-        "@com_google_absl//absl/strings",
-        "@com_google_absl//absl/strings:str_format",
-        "@com_google_absl//absl/types:span",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_library_with_tflite(
     name = "create_op_resolver_header",
     hdrs = ["create_op_resolver.h"],
@@ -1350,8 +1336,6 @@ cc_library_with_tflite(
         "//tensorflow/lite/c:test_util",
     ],
     deps = [
-        ":array",
-        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest",
     ],
 )

diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD
@@ -192,13 +192,15 @@ cc_library(
         ":acceleration_test_util",
         ":kernel_util",
         ":test_delegate_providers_lib",
+        "//tensorflow/lite:array",
         "//tensorflow/lite:framework_stable",
         "//tensorflow/lite:schema_fbs_version",
         "//tensorflow/lite:simple_planner",
         "//tensorflow/lite:string",
         "//tensorflow/lite:string_util",
         "//tensorflow/lite:type_to_tflitetype",
         "//tensorflow/lite:util",
+        "//tensorflow/lite/c:common",
         "//tensorflow/lite/core:framework_stable",
         "//tensorflow/lite/core:subgraph",
         "//tensorflow/lite/core/api",
@@ -217,6 +219,8 @@ cc_library(
         "//tensorflow/lite/tools/versioning",
         "//tensorflow/tsl/platform:logging",
         "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest",
         "@flatbuffers",