Merge branch 'tensorflow:master' into image_transformer

Author: jonpsy

WORKSPACE

@@ -47,6 +47,12 @@ http_file(
     urls = ["https://storage.googleapis.com/download.tensorflow.org/models/tflite_support/bert_nl_classifier/bert_nl_classifier.tflite"],
 )
 
+http_file(
+    name = "bert_nl_classifier_no_metadata",
+    sha256 = "9b4554f6e28a72a3f40511964eed1ccf4e74cc074f81543cacca4faf169a173e",
+    urls = ["https://storage.googleapis.com/download.tensorflow.org/models/tflite_support/bert_nl_classifier/bert_nl_classifier_no_metadata.tflite"],
+)
+
 http_archive(
     name = "io_bazel_rules_closure",
     sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
@@ -88,9 +94,9 @@ http_archive(
     ],
 )
 
-# TF on 2021-09-29.
-TENSORFLOW_COMMIT = "a221f72e69fea7a46977e35961e5cdb1e51fec36"
-TENSORFLOW_SHA256 = "d0e57bcf455df772cfdf65fdf59a94dfef7547c6aafd50b382dab3a182b0c5b3"
+# TF on 2021-11-09.
+TENSORFLOW_COMMIT = "6a144e7763914d3f6141a7cdc9cb116cc23425f9"
+TENSORFLOW_SHA256 = "cec9a514c09d2b171ad447f3413151b25a6c3d88d048148cced1e85db81f3617"
 http_archive(
     name = "org_tensorflow",
     sha256 = TENSORFLOW_SHA256,

tensorflow_lite_support/BUILD

@@ -8,17 +8,21 @@ package(
 
 exports_files(["LICENSE"])
 
-# LINT.IfChange
 package_group(
     name = "users",
+    includes = [
+        ":internal",
+    ],
+    packages = [
+    ],
+)
+
+package_group(
+    name = "internal",
     packages = [
-        # build rule placeholder: tensorflow_examples/... dep,
         "//tensorflow_lite_support/...",
-        "//third_party/tensorflow_models/...",
     ],
 )
-# Remove internal path from tensorflow_lite_support:users in the copybara file.
-# LINT.ThenChange(//tensorflow_lite_support/copy.bara.sky)
 
 # Config setting for determining if we are building for Android.
 config_setting(

tensorflow_lite_support/acceleration/configuration/BUILD

@@ -4,13 +4,16 @@ load("@org_tensorflow//tensorflow/lite:build_def.bzl", "tflite_jni_binary")
 
 package(
     default_visibility = [
-        "//visibility:public",
+        "//tensorflow_lite_support:internal",
     ],
     licenses = ["notice"],  # Apache 2.0
 )
 
 cc_library(
     name = "gpu_plugin",
+    visibility = [
+        "//visibility:public",
+    ],
     deps = [
         "@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:gpu_plugin",
     ],
@@ -19,6 +22,9 @@ cc_library(
 
 cc_library(
     name = "nnapi_plugin",
+    visibility = [
+        "//visibility:public",
+    ],
     deps = [
         "@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:nnapi_plugin",
     ],
@@ -27,6 +33,9 @@ cc_library(
 
 cc_library(
     name = "hexagon_plugin",
+    visibility = [
+        "//visibility:public",
+    ],
     deps = [
         "@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:hexagon_plugin",
     ],
@@ -35,6 +44,9 @@ cc_library(
 
 cc_library(
     name = "xnnpack_plugin",
+    visibility = [
+        "//visibility:public",
+    ],
     deps = [
         "@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:xnnpack_plugin",
     ],
@@ -46,6 +58,9 @@ cc_library(
 cc_library(
     name = "edgetpu_coral_plugin",
     srcs = ["edgetpu_coral_plugin.cc"],
+    visibility = [
+        "//visibility:public",
+    ],
     deps = [
         "@com_google_absl//absl/container:node_hash_map",
         "@com_google_absl//absl/memory",
@@ -108,6 +123,9 @@ cc_library(
 # Use this target when GPU delegate is selected in the Task Library Java API.
 android_library(
     name = "gpu_delegate_plugin_android",
+    visibility = [
+        "//visibility:public",
+    ],
     exports = [":gpu_delegate_plugin_native"],
 )
 

tensorflow_lite_support/acceleration/configuration/edgetpu_coral_plugin.cc

@@ -16,11 +16,11 @@ limitations under the License.
 #include <unordered_map>
 
 #include <glog/logging.h>
-#include "external/com_google_absl/absl/container/node_hash_map.h"
-#include "external/com_google_absl/absl/memory/memory.h"
-#include "external/com_google_absl/absl/strings/match.h"
-#include "external/com_google_absl/absl/strings/numbers.h"
-#include "external/libedgetpu/tflite/public/edgetpu_c.h"
+#include "absl/container/node_hash_map.h"  // from @com_google_absl
+#include "absl/memory/memory.h"  // from @com_google_absl
+#include "absl/strings/match.h"  // from @com_google_absl
+#include "absl/strings/numbers.h"  // from @com_google_absl
+#include "tflite/public/edgetpu_c.h"
 #include "tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h"
 #include "tensorflow/lite/experimental/acceleration/configuration/delegate_registry.h"
 

tensorflow_lite_support/acceleration/configuration/testdata/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//tensorflow_lite_support:users"],
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 

tensorflow_lite_support/c/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//tensorflow_lite_support:__subpackages__"],
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 

tensorflow_lite_support/c/common_utils.cc

@@ -17,8 +17,8 @@ limitations under the License.
 
 #include <string>
 
-#include "external/com_google_absl/absl/status/status.h"
-#include "external/com_google_absl/absl/strings/cord.h"
+#include "absl/status/status.h"  // from @com_google_absl
+#include "absl/strings/cord.h"  // from @com_google_absl
 #include "tensorflow_lite_support/cc/common.h"
 
 namespace tflite {

tensorflow_lite_support/c/common_utils.h

@@ -15,7 +15,7 @@ limitations under the License.
 #ifndef TENSORFLOW_LITE_SUPPORT_C_COMMON_UTILS_H_
 #define TENSORFLOW_LITE_SUPPORT_C_COMMON_UTILS_H_
 
-#include "external/com_google_absl/absl/status/status.h"
+#include "absl/status/status.h"  // from @com_google_absl
 #include "tensorflow_lite_support/c/common.h"
 
 // Utils for Conversion of absl::Status to TfLiteError

tensorflow_lite_support/c/task/core/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//tensorflow_lite_support:__subpackages__"],
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )
 

tensorflow_lite_support/c/task/processor/BUILD

@@ -1,5 +1,5 @@
 package(
-    default_visibility = ["//tensorflow_lite_support:__subpackages__"],
+    default_visibility = ["//tensorflow_lite_support:internal"],
     licenses = ["notice"],  # Apache 2.0
 )