Merge branch 'master' into image-classifier-c-api

Author: priankakariat

WORKSPACE

@@ -51,9 +51,9 @@ http_archive(
     ],
 )
 
-# TF on 2021-08-02.
-TENSORFLOW_COMMIT = "b1b4548b3e37c245d7de671aae5b827abde9ba29"
-TENSORFLOW_SHA256 = "5d941518f93eb0fbfb56312f6f32b096ac769068504ff103df582304c86b3a17"
+# TF on 2021-09-29.
+TENSORFLOW_COMMIT = "a221f72e69fea7a46977e35961e5cdb1e51fec36"
+TENSORFLOW_SHA256 = "d0e57bcf455df772cfdf65fdf59a94dfef7547c6aafd50b382dab3a182b0c5b3"
 http_archive(
     name = "org_tensorflow",
     sha256 = TENSORFLOW_SHA256,

tensorflow_lite_support/cc/task/audio/audio_classifier.h

@@ -52,6 +52,13 @@ namespace audio {
 //      `ImageClassifierOptions` used at creation time ("en" by default, i.e.
 //      English). If none of these are available, only the `index` field of the
 //      results will be filled.
+//
+// An example of such model can be found at:
+// https://tfhub.dev/google/lite-model/yamnet/classification/tflite/1
+
+// A CLI demo tool is available for easily trying out this API, and provides
+// example usage. See:
+// https://github.com/tensorflow/tflite-support/tree/master/tensorflow_lite_support/examples/task/audio/desktop
 class AudioClassifier
     : public tflite::task::core::BaseTaskApi<ClassificationResult,
                                              const AudioBuffer&> {

tensorflow_lite_support/cc/task/audio/audio_embedder.cc

@@ -17,11 +17,11 @@ limitations under the License.
 #include "external/com_google_absl/absl/status/status.h"
 #include "tensorflow_lite_support/cc/common.h"
 #include "tensorflow_lite_support/cc/port/status_macros.h"
-#include "tensorflow_lite_support/cc/task/audio/proto/audio_embedder_options.proto.h"
+#include "tensorflow_lite_support/cc/task/audio/proto/audio_embedder_options.pb.h"
 #include "tensorflow_lite_support/cc/task/core/task_api_factory.h"
 #include "tensorflow_lite_support/cc/task/processor/audio_preprocessor.h"
 #include "tensorflow_lite_support/cc/task/processor/embedding_postprocessor.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/embedding_options.proto.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/embedding_options.pb.h"
 
 namespace tflite {
 namespace task {

tensorflow_lite_support/cc/task/audio/audio_embedder.h

@@ -19,11 +19,11 @@ limitations under the License.
 
 #include "tensorflow/lite/c/common.h"
 #include "tensorflow_lite_support/cc/port/statusor.h"
-#include "tensorflow_lite_support/cc/task/audio/proto/audio_embedder_options.proto.h"
+#include "tensorflow_lite_support/cc/task/audio/proto/audio_embedder_options.pb.h"
 #include "tensorflow_lite_support/cc/task/core/base_task_api.h"
 #include "tensorflow_lite_support/cc/task/processor/audio_preprocessor.h"
 #include "tensorflow_lite_support/cc/task/processor/embedding_postprocessor.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/embedding.proto.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/embedding.pb.h"
 namespace tflite {
 namespace task {
 namespace audio {

tensorflow_lite_support/cc/task/core/task_utils.cc

@@ -61,6 +61,22 @@ std::string LoadBinaryContent(const char* filename) {
   return buffer;
 }
 
+int FindIndexByMetadataTensorName(
+    const flatbuffers::Vector<flatbuffers::Offset<TensorMetadata>>*
+        tensor_metadatas,
+    const std::string& name) {
+  if (tensor_metadatas == nullptr) {
+    return -1;
+  }
+  for (int i = 0; i < tensor_metadatas->size(); i++) {
+    if (strcmp(name.data(), tensor_metadatas->Get(i)->name()->c_str()) == 0) {
+      return i;
+    }
+  }
+  // Returns -1 if not found.
+  return -1;
+}
+
 }  // namespace core
 }  // namespace task
 }  // namespace tflite

tensorflow_lite_support/cc/task/core/task_utils.h

@@ -156,6 +156,14 @@ std::string GetStringAtIndex(const TfLiteTensor* labels, int index);
 // Loads binary content of a file into a string.
 std::string LoadBinaryContent(const char* filename);
 
+// Gets the index from a vector of tensors with name specified inside metadata.
+// The range of the return value should be [0, output_tensor_size). If not
+// found, returns -1.
+int FindIndexByMetadataTensorName(
+    const flatbuffers::Vector<flatbuffers::Offset<TensorMetadata>>*
+        tensor_metadatas,
+    const std::string& name);
+
 // Gets the tensor from a vector of tensors with name specified inside metadata.
 template <typename TensorType>
 static TensorType* FindTensorByName(
@@ -167,12 +175,8 @@ static TensorType* FindTensorByName(
       tensor_metadatas->size() != tensors.size()) {
     return nullptr;
   }
-  for (flatbuffers::uoffset_t i = 0; i < tensor_metadatas->size(); i++) {
-    if (strcmp(name.data(), tensor_metadatas->Get(i)->name()->c_str()) == 0) {
-      return tensors[i];
-    }
-  }
-  return nullptr;
+  int i = FindIndexByMetadataTensorName(tensor_metadatas, name);
+  return i == -1 ? nullptr : tensors[i];
 }
 
 }  // namespace core

tensorflow_lite_support/cc/task/processor/classification_postprocessor.h

@@ -25,9 +25,9 @@ limitations under the License.
 #include "tensorflow_lite_support/cc/task/core/score_calibration.h"
 #include "tensorflow_lite_support/cc/task/core/task_utils.h"
 #include "tensorflow_lite_support/cc/task/processor/processor.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/class.proto.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/classification_options.proto.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/classifications.proto.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/class.pb.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/classification_options.pb.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/classifications.pb.h"
 
 namespace tflite {
 namespace task {

tensorflow_lite_support/cc/task/processor/embedding_postprocessor.h

@@ -22,7 +22,7 @@ limitations under the License.
 #include "tensorflow_lite_support/cc/port/statusor.h"
 #include "tensorflow_lite_support/cc/task/core/tflite_engine.h"
 #include "tensorflow_lite_support/cc/task/processor/processor.h"
-#include "tensorflow_lite_support/cc/task/processor/proto/embedding_options.proto.h"
+#include "tensorflow_lite_support/cc/task/processor/proto/embedding_options.pb.h"
 
 namespace tflite {
 namespace task {

tensorflow_lite_support/cc/task/text/BUILD

@@ -82,3 +82,35 @@ cc_library_with_tflite(
         "@com_google_absl//absl/strings",
     ],
 )
+
+cc_library_with_tflite(
+    name = "universal_sentence_encoder_qa",
+    srcs = [
+        "universal_sentence_encoder_qa.cc",
+    ],
+    hdrs = [
+        "universal_sentence_encoder_qa.h",
+    ],
+    tflite_deps = [
+        "@org_tensorflow//tensorflow/lite/core/shims:builtin_ops",
+        "//tensorflow_lite_support/cc/task/core:base_task_api",
+        "//tensorflow_lite_support/cc/task/core:task_api_factory",
+        "//tensorflow_lite_support/cc/task/core:tflite_engine",
+    ],
+    deps = [
+        "//tensorflow_lite_support/cc/port:status_macros",
+        "//tensorflow_lite_support/cc/port:statusor",
+        "//tensorflow_lite_support/cc/task/core:task_utils",
+        "//tensorflow_lite_support/cc/task/processor/proto:embedding_cc_proto",
+        "//tensorflow_lite_support/cc/task/text/proto:retrieval_cc_proto",
+        "//tensorflow_lite_support/cc/text/tokenizers:bert_tokenizer",
+        "//tensorflow_lite_support/cc/text/tokenizers:sentencepiece_tokenizer",
+        "//tensorflow_lite_support/cc/text/tokenizers:tokenizer",
+        "//tensorflow_lite_support/cc/text/tokenizers:tokenizer_utils",
+        "//tensorflow_lite_support/metadata:metadata_schema_cc",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:str_format",
+    ],
+)

tensorflow_lite_support/cc/task/text/proto/BUILD

@@ -76,3 +76,29 @@ cc_library(
         "//tensorflow_lite_support/cc/task/core/proto:base_options_proto_inc",
     ],
 )
+
+proto_library(
+    name = "retrieval_proto",
+    srcs = ["retrieval.proto"],
+    deps = [
+        "//tensorflow_lite_support/cc/task/core/proto:base_options_proto",
+        "//tensorflow_lite_support/cc/task/processor/proto:embedding_proto",
+    ],
+)
+
+cc_proto_library(
+    name = "retrieval_cc_proto",
+    deps = [
+        ":retrieval_proto",
+    ],
+)
+
+cc_library(
+    name = "retrieval_proto_inc",
+    hdrs = ["retrieval_proto_inc.h"],
+    deps = [
+        ":retrieval_cc_proto",
+        "//tensorflow_lite_support/cc/task/core/proto:base_options_proto_inc",
+        "//tensorflow_lite_support/cc/task/vision/proto:embeddings_proto_inc",
+    ],
+)