Skip to content

Commit 6699c77

Browse files
authored
Merge branch 'tensorflow:master' into image_transformer
2 parents 6d57c96 + ded908c commit 6699c77

File tree

230 files changed

+2474
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+2474
-748
lines changed

WORKSPACE

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@ http_file(
4747
urls = ["https://storage.googleapis.com/download.tensorflow.org/models/tflite_support/bert_nl_classifier/bert_nl_classifier.tflite"],
4848
)
4949

50+
http_file(
51+
name = "bert_nl_classifier_no_metadata",
52+
sha256 = "9b4554f6e28a72a3f40511964eed1ccf4e74cc074f81543cacca4faf169a173e",
53+
urls = ["https://storage.googleapis.com/download.tensorflow.org/models/tflite_support/bert_nl_classifier/bert_nl_classifier_no_metadata.tflite"],
54+
)
55+
5056
http_archive(
5157
name = "io_bazel_rules_closure",
5258
sha256 = "5b00383d08dd71f28503736db0500b6fb4dda47489ff5fc6bed42557c07c6ba9",
@@ -88,9 +94,9 @@ http_archive(
8894
],
8995
)
9096

91-
# TF on 2021-09-29.
92-
TENSORFLOW_COMMIT = "a221f72e69fea7a46977e35961e5cdb1e51fec36"
93-
TENSORFLOW_SHA256 = "d0e57bcf455df772cfdf65fdf59a94dfef7547c6aafd50b382dab3a182b0c5b3"
97+
# TF on 2021-11-09.
98+
TENSORFLOW_COMMIT = "6a144e7763914d3f6141a7cdc9cb116cc23425f9"
99+
TENSORFLOW_SHA256 = "cec9a514c09d2b171ad447f3413151b25a6c3d88d048148cced1e85db81f3617"
94100
http_archive(
95101
name = "org_tensorflow",
96102
sha256 = TENSORFLOW_SHA256,

tensorflow_lite_support/BUILD

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,21 @@ package(
88

99
exports_files(["LICENSE"])
1010

11-
# LINT.IfChange
1211
package_group(
1312
name = "users",
13+
includes = [
14+
":internal",
15+
],
16+
packages = [
17+
],
18+
)
19+
20+
package_group(
21+
name = "internal",
1422
packages = [
15-
# build rule placeholder: tensorflow_examples/... dep,
1623
"//tensorflow_lite_support/...",
17-
"//third_party/tensorflow_models/...",
1824
],
1925
)
20-
# Remove internal path from tensorflow_lite_support:users in the copybara file.
21-
# LINT.ThenChange(//tensorflow_lite_support/copy.bara.sky)
2226

2327
# Config setting for determining if we are building for Android.
2428
config_setting(

tensorflow_lite_support/acceleration/configuration/BUILD

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,16 @@ load("@org_tensorflow//tensorflow/lite:build_def.bzl", "tflite_jni_binary")
44

55
package(
66
default_visibility = [
7-
"//visibility:public",
7+
"//tensorflow_lite_support:internal",
88
],
99
licenses = ["notice"], # Apache 2.0
1010
)
1111

1212
cc_library(
1313
name = "gpu_plugin",
14+
visibility = [
15+
"//visibility:public",
16+
],
1417
deps = [
1518
"@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:gpu_plugin",
1619
],
@@ -19,6 +22,9 @@ cc_library(
1922

2023
cc_library(
2124
name = "nnapi_plugin",
25+
visibility = [
26+
"//visibility:public",
27+
],
2228
deps = [
2329
"@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:nnapi_plugin",
2430
],
@@ -27,6 +33,9 @@ cc_library(
2733

2834
cc_library(
2935
name = "hexagon_plugin",
36+
visibility = [
37+
"//visibility:public",
38+
],
3039
deps = [
3140
"@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:hexagon_plugin",
3241
],
@@ -35,6 +44,9 @@ cc_library(
3544

3645
cc_library(
3746
name = "xnnpack_plugin",
47+
visibility = [
48+
"//visibility:public",
49+
],
3850
deps = [
3951
"@org_tensorflow//tensorflow/lite/experimental/acceleration/configuration:xnnpack_plugin",
4052
],
@@ -46,6 +58,9 @@ cc_library(
4658
cc_library(
4759
name = "edgetpu_coral_plugin",
4860
srcs = ["edgetpu_coral_plugin.cc"],
61+
visibility = [
62+
"//visibility:public",
63+
],
4964
deps = [
5065
"@com_google_absl//absl/container:node_hash_map",
5166
"@com_google_absl//absl/memory",
@@ -108,6 +123,9 @@ cc_library(
108123
# Use this target when GPU delegate is selected in the Task Library Java API.
109124
android_library(
110125
name = "gpu_delegate_plugin_android",
126+
visibility = [
127+
"//visibility:public",
128+
],
111129
exports = [":gpu_delegate_plugin_native"],
112130
)
113131

tensorflow_lite_support/acceleration/configuration/edgetpu_coral_plugin.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ limitations under the License.
1616
#include <unordered_map>
1717

1818
#include <glog/logging.h>
19-
#include "external/com_google_absl/absl/container/node_hash_map.h"
20-
#include "external/com_google_absl/absl/memory/memory.h"
21-
#include "external/com_google_absl/absl/strings/match.h"
22-
#include "external/com_google_absl/absl/strings/numbers.h"
23-
#include "external/libedgetpu/tflite/public/edgetpu_c.h"
19+
#include "absl/container/node_hash_map.h" // from @com_google_absl
20+
#include "absl/memory/memory.h" // from @com_google_absl
21+
#include "absl/strings/match.h" // from @com_google_absl
22+
#include "absl/strings/numbers.h" // from @com_google_absl
23+
#include "tflite/public/edgetpu_c.h"
2424
#include "tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h"
2525
#include "tensorflow/lite/experimental/acceleration/configuration/delegate_registry.h"
2626

tensorflow_lite_support/acceleration/configuration/testdata/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package(
2-
default_visibility = ["//tensorflow_lite_support:users"],
2+
default_visibility = ["//tensorflow_lite_support:internal"],
33
licenses = ["notice"], # Apache 2.0
44
)
55

tensorflow_lite_support/c/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package(
2-
default_visibility = ["//tensorflow_lite_support:__subpackages__"],
2+
default_visibility = ["//tensorflow_lite_support:internal"],
33
licenses = ["notice"], # Apache 2.0
44
)
55

tensorflow_lite_support/c/common_utils.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ limitations under the License.
1717

1818
#include <string>
1919

20-
#include "external/com_google_absl/absl/status/status.h"
21-
#include "external/com_google_absl/absl/strings/cord.h"
20+
#include "absl/status/status.h" // from @com_google_absl
21+
#include "absl/strings/cord.h" // from @com_google_absl
2222
#include "tensorflow_lite_support/cc/common.h"
2323

2424
namespace tflite {

tensorflow_lite_support/c/common_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515
#ifndef TENSORFLOW_LITE_SUPPORT_C_COMMON_UTILS_H_
1616
#define TENSORFLOW_LITE_SUPPORT_C_COMMON_UTILS_H_
1717

18-
#include "external/com_google_absl/absl/status/status.h"
18+
#include "absl/status/status.h" // from @com_google_absl
1919
#include "tensorflow_lite_support/c/common.h"
2020

2121
// Utils for Conversion of absl::Status to TfLiteError

tensorflow_lite_support/c/task/core/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package(
2-
default_visibility = ["//tensorflow_lite_support:__subpackages__"],
2+
default_visibility = ["//tensorflow_lite_support:internal"],
33
licenses = ["notice"], # Apache 2.0
44
)
55

tensorflow_lite_support/c/task/processor/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package(
2-
default_visibility = ["//tensorflow_lite_support:__subpackages__"],
2+
default_visibility = ["//tensorflow_lite_support:internal"],
33
licenses = ["notice"], # Apache 2.0
44
)
55

0 commit comments

Comments
 (0)