Skip to content

Commit 62e7865

Browse files
Update ICU version
PiperOrigin-RevId: 822813535
1 parent f0c7929 commit 62e7865

File tree

8 files changed

+71
-78
lines changed

8 files changed

+71
-78
lines changed

WORKSPACE

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,32 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
http_archive(
66
name = "icu",
7-
strip_prefix = "icu-release-64-2",
8-
sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27",
7+
build_file = "//third_party/icu:BUILD.bzl",
8+
sha256 = "e424ba5282d95ad38b52639a08fb82164f0b0cbd7f17b53ae16bf14f8541855f",
9+
strip_prefix = "icu-release-77-1",
910
urls = [
10-
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-64-2.zip",
11-
"https://github.com/unicode-org/icu/archive/release-64-2.zip",
11+
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-77-1.zip",
12+
"https://github.com/unicode-org/icu/archive/release-77-1.zip",
1213
],
13-
build_file = "//third_party/icu:BUILD.bzl",
14-
patches = ["//third_party/icu:udata.patch"],
15-
patch_args = ["-p1"],
1614
)
1715

1816
http_archive(
1917
name = "com_google_sentencepiece",
20-
strip_prefix = "sentencepiece-0.1.96",
18+
build_file = "//third_party/sentencepiece:BUILD",
19+
patch_args = ["-p1"],
20+
patches = ["//third_party/sentencepiece:sp.patch"],
2121
sha256 = "8409b0126ebd62b256c685d5757150cf7fcb2b92a2f2b98efb3f38fc36719754",
22+
strip_prefix = "sentencepiece-0.1.96",
2223
urls = [
23-
"https://github.com/google/sentencepiece/archive/refs/tags/v0.1.96.zip"
24+
"https://github.com/google/sentencepiece/archive/refs/tags/v0.1.96.zip",
2425
],
25-
build_file = "//third_party/sentencepiece:BUILD",
26-
patches = ["//third_party/sentencepiece:sp.patch"],
27-
patch_args = ["-p1"],
2826
)
2927

3028
http_archive(
3129
name = "cppitertools",
32-
urls = ["https://github.com/ryanhaining/cppitertools/archive/refs/tags/v2.0.zip"],
3330
sha256 = "e56741b108d6baced98c4ccd83fd0d5a545937f2845978799c28d0312c0dee3d",
3431
strip_prefix = "cppitertools-2.0",
32+
urls = ["https://github.com/ryanhaining/cppitertools/archive/refs/tags/v2.0.zip"],
3533
)
3634

3735
http_archive(
@@ -56,10 +54,10 @@ http_archive(
5654

5755
http_archive(
5856
name = "org_tensorflow",
59-
strip_prefix = "tensorflow-40998f44c0c500ce0f6e3b1658dfbc54f838a82a",
6057
sha256 = "5a5bc4599964c71277dcac0d687435291e5810d2ac2f6283cc96736febf73aaf",
58+
strip_prefix = "tensorflow-40998f44c0c500ce0f6e3b1658dfbc54f838a82a",
6159
urls = [
62-
"https://github.com/tensorflow/tensorflow/archive/40998f44c0c500ce0f6e3b1658dfbc54f838a82a.zip"
60+
"https://github.com/tensorflow/tensorflow/archive/40998f44c0c500ce0f6e3b1658dfbc54f838a82a.zip",
6361
],
6462
)
6563

@@ -72,15 +70,26 @@ http_archive(
7270
],
7371
)
7472

73+
http_archive(
74+
name = "pybind11_bazel",
75+
sha256 = "e10d65e64d101d2d3d0a52fdf04b1a5116e0cff16c9e0d0b1b1c2ed0e1b69e5d",
76+
strip_prefix = "pybind11_bazel-b1d64d363b8cb6e8b7d9b9b1263b651410d7e4c5",
77+
urls = ["https://github.com/pybind/pybind11_bazel/archive/b1d64d363b8cb6e8b7d9b9b1263b651410d7e4c5.tar.gz"],
78+
)
79+
80+
load("@pybind11_bazel//:python_configure.bzl", "pybind_python_configure")
81+
82+
pybind_python_configure(name = "local_config_python")
83+
7584
http_archive(
7685
name = "pybind11",
86+
build_file = "@pybind11_bazel//:BUILD",
87+
sha256 = "efc901aa0aab439a3fea6efeaf930b5a349fb06394bf845c64ce15a9cf8f0240",
88+
strip_prefix = "pybind11-2.13.4",
7789
urls = [
7890
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/pybind/pybind11/archive/v2.13.4.tar.gz",
7991
"https://github.com/pybind/pybind11/archive/v2.13.4.tar.gz",
8092
],
81-
sha256 = "efc901aa0aab439a3fea6efeaf930b5a349fb06394bf845c64ce15a9cf8f0240",
82-
strip_prefix = "pybind11-2.13.4",
83-
build_file = "//third_party/pybind11:BUILD.bzl",
8493
)
8594

8695
http_archive(
@@ -99,27 +108,31 @@ load("//tensorflow_text:tftext.bzl", "py_deps_profile")
99108

100109
py_deps_profile(
101110
name = "release_or_nightly",
102-
requirements_in = "//oss_scripts/pip_package:requirements.in",
103-
pip_repo_name = "pypi",
104111
deps_map = {
105-
"tensorflow": ["tf-nightly", "tf_header_lib", "libtensorflow_framework"],
106-
"tf-keras": ["tf-keras-nightly"]
112+
"tensorflow": [
113+
"tf-nightly",
114+
"tf_header_lib",
115+
"libtensorflow_framework",
116+
],
117+
"tf-keras": ["tf-keras-nightly"],
107118
},
119+
pip_repo_name = "pypi",
120+
requirements_in = "//oss_scripts/pip_package:requirements.in",
108121
switch = {
109-
"IS_NIGHTLY": "nightly"
110-
}
122+
"IS_NIGHTLY": "nightly",
123+
},
111124
)
112125

113126
load("@org_tensorflow//third_party/py:python_init_repositories.bzl", "python_init_repositories")
114127

115128
python_init_repositories(
129+
default_python_version = "system",
116130
requirements = {
117131
"3.9": "//oss_scripts/pip_package:requirements_lock_3_9.txt",
118132
"3.10": "//oss_scripts/pip_package:requirements_lock_3_10.txt",
119133
"3.11": "//oss_scripts/pip_package:requirements_lock_3_11.txt",
120134
"3.12": "//oss_scripts/pip_package:requirements_lock_3_12.txt",
121135
},
122-
default_python_version = "system",
123136
)
124137

125138
load("@org_tensorflow//third_party/py:python_init_toolchains.bzl", "python_init_toolchains")
@@ -136,18 +149,28 @@ install_deps()
136149

137150
# Initialize TensorFlow dependencies.
138151
load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
152+
139153
tf_workspace3()
154+
140155
load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2")
156+
141157
tf_workspace2()
158+
142159
load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1")
160+
143161
tf_workspace1()
162+
144163
load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
164+
145165
tf_workspace0()
146166

147167
# Set up Android.
148168
load("@org_tensorflow//third_party/android:android_configure.bzl", "android_configure")
149-
android_configure(name="local_config_android")
169+
170+
android_configure(name = "local_config_android")
171+
150172
load("@local_config_android//:android.bzl", "android_workspace")
173+
151174
android_workspace()
152175

153176
load(

oss_scripts/configure.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ else
4141
if [[ "$IS_NIGHTLY" == "nightly" ]]; then
4242
pip install tf-nightly
4343
else
44-
pip install tensorflow==2.18.0
44+
pip install tensorflow==2.20.0
4545
fi
4646
fi
4747

@@ -85,3 +85,5 @@ if is_macos; then
8585
fi
8686

8787
write_action_env_to_bazelrc "TF_CXX11_ABI_FLAG" ${TF_ABIFLAG}
88+
write_to_bazelrc "build --define=TENSORFLOW_TEXT_BUILD_TFLITE_OPS=1"
89+
write_to_bazelrc "build --define=with_tflite_ops=true"
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
setuptools==70.0.0
22
dm-tree==0.1.8 # Limit for macos support.
33
numpy
4-
protobuf==4.25.3 # b/397977335 - Fix crash on python 3.9, 3.10.
54
tensorflow
65
tf-keras
76
tensorflow-datasets
8-
tensorflow-metadata

oss_scripts/pip_package/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ def finalize_options(self):
8888
distclass=BinaryDistribution,
8989
install_requires=[
9090
(
91-
'tensorflow>=2.18.0, <2.19',
91+
'tensorflow==2.20',
9292
),
9393
],
9494
extras_require={
9595
'tensorflow_cpu': [
96-
'tensorflow-cpu>=2.18.0, <2.19',
96+
'tensorflow-cpu==2.20',
9797
],
9898
'tests': [
9999
'absl-py',

tensorflow_text/core/kernels/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ cc_library(
337337
deps = [
338338
"@com_google_absl//absl/container:flat_hash_set",
339339
"@com_google_absl//absl/status:statusor",
340+
"@com_google_absl//absl/strings",
340341
"@darts_clone",
341342
],
342343
)
@@ -871,8 +872,12 @@ tf_cc_library(
871872
# tf:lib tensorflow dep,
872873
],
873874
deps = [
875+
"@com_google_absl//absl/base:core_headers",
876+
"@com_google_absl//absl/status",
877+
"@com_google_absl//absl/status:statusor",
874878
"@com_google_absl//absl/strings",
875879
"@icu//:common",
880+
"@icu//:nfkc",
876881
],
877882
)
878883

tensorflow_text/core/kernels/darts_clone_trie_builder.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <numeric>
2020

2121
#include "absl/container/flat_hash_set.h"
22+
#include "absl/strings/str_cat.h"
2223
#include "include/darts.h"
2324

2425
namespace tensorflow {

tensorflow_text/core/pybinds/BUILD

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Code that exposes C++ libraries to Python via pybind11.
22

33
# Placeholder: load py_test
4-
load("@org_tensorflow//tensorflow:tensorflow.bzl", "pybind_extension")
4+
load("//third_party/tensorflow/compiler/xla/tsl:tsl.google.bzl", pybind_extension = "tsl_pybind_extension")
55

66
licenses(["notice"])
77

@@ -66,19 +66,6 @@ pybind_extension(
6666
],
6767
)
6868

69-
py_test(
70-
name = "pywrap_fast_bert_normalizer_model_builder_test",
71-
srcs = ["pywrap_fast_bert_normalizer_model_builder_test.py"],
72-
data = [
73-
"//tensorflow_text:python/ops/test_data/fast_bert_normalizer_model.fb",
74-
"//tensorflow_text:python/ops/test_data/fast_bert_normalizer_model_lower_case_nfd_strip_accents.fb",
75-
],
76-
deps = [
77-
":pywrap_fast_bert_normalizer_model_builder",
78-
"@release_or_nightly//:tensorflow_pkg", # tensorflow package dep
79-
],
80-
)
81-
8269
pybind_extension(
8370
name = "pywrap_fast_wordpiece_tokenizer_model_builder",
8471
srcs = ["pywrap_fast_wordpiece_tokenizer_model_builder.cc"],
@@ -98,18 +85,6 @@ pybind_extension(
9885
],
9986
)
10087

101-
py_test(
102-
name = "pywrap_fast_wordpiece_tokenizer_model_builder_test",
103-
srcs = ["pywrap_fast_wordpiece_tokenizer_model_builder_test.py"],
104-
data = [
105-
"//tensorflow_text:python/ops/test_data/fast_wordpiece_tokenizer_model.fb",
106-
],
107-
deps = [
108-
":pywrap_fast_wordpiece_tokenizer_model_builder",
109-
"@release_or_nightly//:tensorflow_pkg", # tensorflow package dep
110-
],
111-
)
112-
11388
pybind_extension(
11489
name = "pywrap_phrase_tokenizer_model_builder",
11590
srcs = ["pywrap_phrase_tokenizer_model_builder.cc"],
@@ -133,18 +108,6 @@ pybind_extension(
133108
],
134109
)
135110

136-
py_test(
137-
name = "pywrap_phrase_tokenizer_model_builder_test",
138-
srcs = ["pywrap_phrase_tokenizer_model_builder_test.py"],
139-
data = [
140-
"//tensorflow_text:python/ops/test_data/phrase_tokenizer_model_test.fb",
141-
],
142-
deps = [
143-
":pywrap_phrase_tokenizer_model_builder",
144-
"@release_or_nightly//:tensorflow_pkg", # tensorflow package dep
145-
],
146-
)
147-
148111
pybind_extension(
149112
name = "pywrap_model_converter",
150113
srcs = ["pywrap_model_converter.cc"],
@@ -184,12 +147,3 @@ pybind_extension(
184147
"@pybind11",
185148
],
186149
)
187-
188-
py_test(
189-
name = "pywrap_whitespace_tokenizer_config_builder_test",
190-
srcs = ["pywrap_whitespace_tokenizer_config_builder_test.py"],
191-
deps = [
192-
":pywrap_whitespace_tokenizer_config_builder",
193-
"@release_or_nightly//:tensorflow_pkg", # tensorflow package dep
194-
],
195-
)

tensorflow_text/tftext.bzl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,16 @@ def tf_cc_library(
139139
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/time")
140140
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/types:variant")
141141
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/functional:any_invocable")
142+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/log:check")
143+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/log:log")
144+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/log:absl_check")
145+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/log:absl_log")
146+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/strings")
147+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/container:btree")
148+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/container:flat_hash_set")
149+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/base")
150+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/meta:type_traits")
151+
oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/utility:if_constexpr")
142152
deps += select({
143153
"@org_tensorflow//tensorflow:mobile": [
144154
"@org_tensorflow//tensorflow/core:portable_tensorflow_lib_lite",

0 commit comments

Comments
 (0)