Change TF Lite Tasks library to use the TF Lite stable API

rather than depending on experimental APIs.

This required also updating the version of TF used by the
TF Support Library.

PiperOrigin-RevId: 399708233

Author: fergushenderson

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/java/BUILD

@@ -24,7 +24,7 @@ filegroup(
 # Lite runtime (tensorflow/lite/java:tensorflowlite). If you don't want to
 # introduce the native library into dependencies, use
 # "tensorflowlite_support_java" instead, which depends on
-# tensorflow/lite/java:tensorflowlite_java.
+# tensorflow/lite/java:tensorflowlite_java_stable.
 android_library(
     name = "tensorflowlite_support",
     srcs = [],
@@ -50,7 +50,7 @@ android_library(
         "@maven//:androidx_annotation_annotation",
         "@maven//:com_google_android_odml_image",
         "@org_checkerframework_qual",
-        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java",  # TODO(b/198734357): Use api when TF dep catches up.
+        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java_stable",  # TODO(b/198734357): Use api when TF dep catches up.
     ],
     # LINT.ThenChange(<INTERNAL>/release/build_support_api_pom.sh:dep)
 )

tensorflow_lite_support/java/src/java/org/tensorflow/lite/support/model/Model.java

@@ -21,7 +21,8 @@
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
-import org.tensorflow.lite.Interpreter;
+import org.tensorflow.lite.InterpreterApi;
+import org.tensorflow.lite.InterpreterFactory;
 import org.tensorflow.lite.Tensor;
 import org.tensorflow.lite.support.common.FileUtil;
 import org.tensorflow.lite.support.common.SupportPreconditions;
@@ -83,7 +84,7 @@ private Options(Builder builder) {
   }
 
   /** An instance of the driver class to run model inference with Tensorflow Lite. */
-  private final Interpreter interpreter;
+  private final InterpreterApi interpreter;
 
   /** Path to tflite model file in asset folder. */
   private final String modelPath;
@@ -186,7 +187,7 @@ public static Model createModel(
    */
   public static Model createModel(
       @NonNull MappedByteBuffer byteModel, @NonNull String modelPath, @NonNull Options options) {
-    Interpreter.Options interpreterOptions = new Interpreter.Options();
+    InterpreterApi.Options interpreterOptions = new InterpreterApi.Options();
     GpuDelegateProxy gpuDelegateProxy = null;
     switch (options.device) {
       case NNAPI:
@@ -203,7 +204,7 @@ public static Model createModel(
         break;
     }
     interpreterOptions.setNumThreads(options.numThreads);
-    Interpreter interpreter = new Interpreter(byteModel, interpreterOptions);
+    InterpreterApi interpreter = new InterpreterFactory().create(byteModel, interpreterOptions);
     return new Model(modelPath, byteModel, interpreter, gpuDelegateProxy);
   }
 
@@ -275,7 +276,7 @@ public void close() {
   private Model(
       @NonNull String modelPath,
       @NonNull MappedByteBuffer byteModel,
-      @NonNull Interpreter interpreter,
+      @NonNull InterpreterApi interpreter,
       @Nullable GpuDelegateProxy gpuDelegateProxy) {
     this.modelPath = modelPath;
     this.byteModel = byteModel;

tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/audio/BUILD

@@ -25,7 +25,7 @@ android_library(
         "//tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/core:base_task_api",
         "//tensorflow_lite_support/java/src/native/task/audio:task_audio_native",
         "@com_google_auto_value",
-        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java",
+        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java_stable",
     ],
     # LINT.ThenChange(<INTERNAL>/release/build_task_pom.sh:dep)
 )

tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/audio/classifier/BUILD

@@ -32,6 +32,6 @@ android_library(
         "//tensorflow_lite_support/java:tensorflowlite_support_java",
         "//tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/core:base_task_api",
         "@com_google_auto_value",
-        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java",
+        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java_stable",
     ],
 )

tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/vision/detector/BUILD

@@ -43,7 +43,7 @@ android_library(
         "//tensorflow_lite_support/java/src/java/org/tensorflow/lite/task/core:base_task_api",
         "@com_google_auto_value",
         "@maven//:com_google_android_odml_image",
-        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java",
+        "@org_tensorflow//tensorflow/lite/java:tensorflowlite_java_stable",
     ],
 )