diff --git a/WORKSPACE b/WORKSPACE index b5b90f39b..03ae53deb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -4,34 +4,32 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "icu", - strip_prefix = "icu-release-64-2", - sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27", + build_file = "//third_party/icu:BUILD.bzl", + integrity = "sha256-5CS6UoLZWtOLUmOaCPuCFk8LDL1/F7U64WvxT4VBhV8=", + strip_prefix = "icu-release-77-1", urls = [ - "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-64-2.zip", - "https://github.com/unicode-org/icu/archive/release-64-2.zip", + "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-77-1.zip", + "https://github.com/unicode-org/icu/archive/release-77-1.zip", ], - build_file = "//third_party/icu:BUILD.bzl", - patches = ["//third_party/icu:udata.patch"], - patch_args = ["-p1"], ) http_archive( name = "com_google_sentencepiece", - strip_prefix = "sentencepiece-0.1.96", + build_file = "//third_party/sentencepiece:BUILD", + patch_args = ["-p1"], + patches = ["//third_party/sentencepiece:sp.patch"], sha256 = "8409b0126ebd62b256c685d5757150cf7fcb2b92a2f2b98efb3f38fc36719754", + strip_prefix = "sentencepiece-0.1.96", urls = [ - "https://github.com/google/sentencepiece/archive/refs/tags/v0.1.96.zip" + "https://github.com/google/sentencepiece/archive/refs/tags/v0.1.96.zip", ], - build_file = "//third_party/sentencepiece:BUILD", - patches = ["//third_party/sentencepiece:sp.patch"], - patch_args = ["-p1"], ) http_archive( name = "cppitertools", - urls = ["https://github.com/ryanhaining/cppitertools/archive/refs/tags/v2.0.zip"], sha256 = "e56741b108d6baced98c4ccd83fd0d5a545937f2845978799c28d0312c0dee3d", strip_prefix = "cppitertools-2.0", + urls = ["https://github.com/ryanhaining/cppitertools/archive/refs/tags/v2.0.zip"], ) http_archive( @@ -56,10 +54,10 @@ http_archive( http_archive( name = "org_tensorflow", + # sha256 = "c8c7e0df61412231f881e624586eafcb77a230ba461c9241e2f6c1e957fbebd6", strip_prefix = "tensorflow-40998f44c0c500ce0f6e3b1658dfbc54f838a82a", - sha256 = "5a5bc4599964c71277dcac0d687435291e5810d2ac2f6283cc96736febf73aaf", urls = [ - "https://github.com/tensorflow/tensorflow/archive/40998f44c0c500ce0f6e3b1658dfbc54f838a82a.zip" + "https://github.com/tensorflow/tensorflow/archive/40998f44c0c500ce0f6e3b1658dfbc54f838a82a.zip", ], ) @@ -74,13 +72,13 @@ http_archive( http_archive( name = "pybind11", + build_file = "//third_party/pybind11:BUILD.bzl", + sha256 = "efc901aa0aab439a3fea6efeaf930b5a349fb06394bf845c64ce15a9cf8f0240", + strip_prefix = "pybind11-2.13.4", urls = [ "https://storage.googleapis.com/mirror.tensorflow.org/github.com/pybind/pybind11/archive/v2.13.4.tar.gz", "https://github.com/pybind/pybind11/archive/v2.13.4.tar.gz", ], - sha256 = "efc901aa0aab439a3fea6efeaf930b5a349fb06394bf845c64ce15a9cf8f0240", - strip_prefix = "pybind11-2.13.4", - build_file = "//third_party/pybind11:BUILD.bzl", ) http_archive( @@ -99,27 +97,31 @@ load("//tensorflow_text:tftext.bzl", "py_deps_profile") py_deps_profile( name = "release_or_nightly", - requirements_in = "//oss_scripts/pip_package:requirements.in", - pip_repo_name = "pypi", deps_map = { - "tensorflow": ["tf-nightly", "tf_header_lib", "libtensorflow_framework"], - "tf-keras": ["tf-keras-nightly"] + "tensorflow": [ + "tf-nightly", + "tf_header_lib", + "libtensorflow_framework", + ], + "tf-keras": ["tf-keras-nightly"], }, + pip_repo_name = "pypi", + requirements_in = "//oss_scripts/pip_package:requirements.in", switch = { - "IS_NIGHTLY": "nightly" - } + "IS_NIGHTLY": "nightly", + }, ) load("@org_tensorflow//third_party/py:python_init_repositories.bzl", "python_init_repositories") python_init_repositories( + default_python_version = "system", requirements = { "3.9": "//oss_scripts/pip_package:requirements_lock_3_9.txt", "3.10": "//oss_scripts/pip_package:requirements_lock_3_10.txt", "3.11": "//oss_scripts/pip_package:requirements_lock_3_11.txt", "3.12": "//oss_scripts/pip_package:requirements_lock_3_12.txt", }, - default_python_version = "system", ) load("@org_tensorflow//third_party/py:python_init_toolchains.bzl", "python_init_toolchains") @@ -136,18 +138,28 @@ install_deps() # Initialize TensorFlow dependencies. load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3") + tf_workspace3() + load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2") + tf_workspace2() + load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1") + tf_workspace1() + load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0") + tf_workspace0() # Set up Android. load("@org_tensorflow//third_party/android:android_configure.bzl", "android_configure") -android_configure(name="local_config_android") + +android_configure(name = "local_config_android") + load("@local_config_android//:android.bzl", "android_workspace") + android_workspace() load( diff --git a/oss_scripts/pip_package/requirements.in b/oss_scripts/pip_package/requirements.in index 9cc9f75d0..a00bb8b9b 100644 --- a/oss_scripts/pip_package/requirements.in +++ b/oss_scripts/pip_package/requirements.in @@ -2,7 +2,7 @@ setuptools==70.0.0 dm-tree==0.1.8 # Limit for macos support. numpy protobuf==4.25.3 # b/397977335 - Fix crash on python 3.9, 3.10. -tensorflow +tensorflow==2.20.0 tf-keras tensorflow-datasets -tensorflow-metadata +tensorflow-metadata==1.17.2 diff --git a/oss_scripts/pip_package/setup.py b/oss_scripts/pip_package/setup.py index 4b7422c37..d191a54c5 100644 --- a/oss_scripts/pip_package/setup.py +++ b/oss_scripts/pip_package/setup.py @@ -46,7 +46,7 @@ from setuptools.dist import Distribution project_name = 'tensorflow-text' -project_version = '2.18.0' +project_version = '2.20.0' class BinaryDistribution(Distribution): @@ -87,13 +87,11 @@ def finalize_options(self): cmdclass={'install': InstallPlatlib}, distclass=BinaryDistribution, install_requires=[ - ( - 'tensorflow>=2.18.0, <2.19', - ), + 'tensorflow>=2.20.0', ], extras_require={ 'tensorflow_cpu': [ - 'tensorflow-cpu>=2.18.0, <2.19', + 'tensorflow-cpu>=2.20.0', ], 'tests': [ 'absl-py',