diff --git a/WORKSPACE b/WORKSPACE index 51ba39d87..ca4e2b522 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -69,11 +69,19 @@ http_archive( http_archive( name = "org_tensorflow", patch_args = ["-p1"], - patches = ["//third_party/tensorflow:tensorflow.core.BUILD.patch"], - sha256 = "213edf03ac7c4e74d8eb2074216ae8c8ae4f325c6bc22efd16cfdeed2073bd66", - strip_prefix = "tensorflow-2.20.0", + patches = [ + "//third_party/tensorflow:tensorflow.core.BUILD.patch", + "//third_party/tensorflow:tensorflow.common_runtime.BUILD.patch", + "//third_party/tensorflow:tensorflow.device_set.BUILD.patch", + "//third_party/tensorflow:tensorflow.framework.BUILD.patch", + "//third_party/tensorflow:tensorflow.grappler_optimizers.BUILD.patch", + "//third_party/tensorflow:tensorflow.xla_allocator_registry.BUILD.patch", + "//third_party/tensorflow:tensorflow.core.ops.BUILD.patch", + ], + sha256 = "0e1494185594ce7a6c1cf86c984da2f2d9bef24427104cb2c76c1ccee76ee986", + strip_prefix = "tensorflow-2.21.0", urls = [ - "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.20.0.zip", + "https://github.com/tensorflow/tensorflow/archive/refs/tags/v2.21.0.zip", ], ) @@ -104,7 +112,13 @@ http_archive( url = "https://github.com/bazelbuild/rules_shell/releases/download/v0.4.1/rules_shell-v0.4.1.tar.gz", ) -# Initialize hermetic Python +# Initialize TensorFlow base dependencies first: defines @xla and @tsl, +# which are required by python_init_rules() in TF 2.21+. +load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3") + +tf_workspace3() + +# Initialize hermetic Python (requires @xla to be defined by tf_workspace3). load("@org_tensorflow//third_party/py:python_init_rules.bzl", "python_init_rules") python_init_rules() @@ -134,7 +148,6 @@ load("@org_tensorflow//third_party/py:python_init_repositories.bzl", "python_ini 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", @@ -154,11 +167,7 @@ load("@pypi//:requirements.bzl", "install_deps") install_deps() -# Initialize TensorFlow dependencies. -load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3") - -tf_workspace3() - +# Initialize remaining TensorFlow dependencies. load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2") tf_workspace2() @@ -181,7 +190,7 @@ load("@local_config_android//:android.bzl", "android_workspace") android_workspace() load( - "@local_xla//third_party/py:python_wheel.bzl", + "@xla//third_party/py:python_wheel.bzl", "python_wheel_version_suffix_repository", ) diff --git a/build.err b/build.err new file mode 100644 index 000000000..2b697efcb --- /dev/null +++ b/build.err @@ -0,0 +1,34 @@ +INFO: Reading 'startup' options from /home/cantonios/dev/tensorflow_text/.bazelrc: --windows_enable_symlinks +INFO: Options provided by the client: + Inherited 'common' options: --isatty=0 --terminal_columns=158 +INFO: Reading rc options for 'test' from /home/cantonios/dev/tensorflow_text/.bazelrc: + Inherited 'common' options: --announce_rc --experimental_cc_shared_library --experimental_link_static_libraries_once=false --incompatible_enforce_config_setting_visibility --noenable_bzlmod --incompatible_enable_cc_toolchain_resolution --noincompatible_enable_android_toolchain_resolution --experimental_repo_remote_exec --java_runtime_version=remotejdk_21 +INFO: Reading rc options for 'test' from /home/cantonios/dev/tensorflow_text/.bazelrc: + Inherited 'build' options: --repo_env=ML_WHEEL_TYPE=snapshot --repo_env=ML_WHEEL_BUILD_DATE= --repo_env=ML_WHEEL_VERSION_SUFFIX= --define framework_shared_object=true --define tsl_protobuf_header_only=true --define=allow_oversize_protos=true --spawn_strategy=standalone -c opt --repo_env=USE_PYWRAP_RULES=True --copt=-DGRPC_BAZEL_BUILD --host_copt=-DGRPC_BAZEL_BUILD --action_env=GRPC_BAZEL_RUNTIME=1 --repo_env=PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb --action_env=PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb --repo_env=RULES_PYTHON_ENABLE_PYSTAR=1 --define=grpc_no_ares=true --features=-force_no_whole_archive --host_features=-force_no_whole_archive --enable_platform_specific_config --define=with_xla_support=true --config=short_logs --config=v2 --@rules_python//python/config_settings:precompile=force_disabled --action_env TF_CXX11_ABI_FLAG= +INFO: Reading rc options for 'test' from /home/cantonios/dev/tensorflow_text/.bazelrc: + 'test' options: --test_env=GTEST_INSTALL_FAILURE_SIGNAL_HANDLER=1 --test_env=TF_USE_LEGACY_KERAS=1 +INFO: Found applicable config definition build:short_logs in file /home/cantonios/dev/tensorflow_text/.bazelrc: --output_filter=DONT_MATCH_ANYTHING +INFO: Found applicable config definition build:v2 in file /home/cantonios/dev/tensorflow_text/.bazelrc: --define=tf_api_version=2 --action_env=TF2_BEHAVIOR=1 +INFO: Found applicable config definition build:linux in file /home/cantonios/dev/tensorflow_text/.bazelrc: --host_copt=-w --copt=-Wno-all --copt=-Wno-extra --copt=-Wno-deprecated --copt=-Wno-deprecated-declarations --copt=-Wno-ignored-attributes --copt=-Wno-array-bounds --copt=-Wunused-result --copt=-Werror=unused-result --copt=-Wswitch --copt=-Werror=switch --define=PREFIX=/usr --define=PROTOBUF_INCLUDE_PATH=$(PREFIX)/include --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --config=dynamic_kernels --experimental_guard_against_concurrent_changes +INFO: Found applicable config definition build:dynamic_kernels in file /home/cantonios/dev/tensorflow_text/.bazelrc: --define=dynamic_loaded_kernels=true --copt=-DAUTOLOAD_DYNAMIC_KERNELS +Computing main repo mapping: +Loading: +Loading: 0 packages loaded +Analyzing: 357 targets (0 packages loaded, 0 targets configured) +Analyzing: 357 targets (0 packages loaded, 0 targets configured) +[0 / 1] checking cached actions +ERROR: /home/cantonios/dev/tensorflow_text/tensorflow_text/core/pybinds/BUILD:138:15: WinDefFileParse tensorflow_text/core/pybinds/_pybinds_library_common_def.gen.def failed: (Exit 2): no_op.bat failed: error executing WinDefFileParse command (from target //tensorflow_text/core/pybinds:_pybinds_library_common_def) + (cd /home/cantonios/.cache/bazel/_bazel_cantonios/1808d8afb5b8b7032b0384e0635fa50a/execroot/org_tensorflow_text && \ + exec env - \ + external/bazel_tools/tools/def_parser/no_op.bat bazel-out/k8-opt/bin/tensorflow_text/core/pybinds/_pybinds_library_common_def.gen.def '' @bazel-out/k8-opt/bin/tensorflow_text/core/pybinds/_pybinds_library_common_def.gen.def-0.params) +# Configuration: 060dc0a13798b2ae3a90cf6f57dd08e9bc7a704880355041030a89a2b5ce8977 +# Execution platform: @@local_execution_config_platform//:platform +external/bazel_tools/tools/def_parser/no_op.bat: 1: ::: not found +external/bazel_tools/tools/def_parser/no_op.bat: 2: ::: not found +external/bazel_tools/tools/def_parser/no_op.bat: 3: Syntax error: "(" unexpected +INFO: Analyzed 357 targets (0 packages loaded, 0 targets configured). +INFO: Analysis succeeded for only 356 of 357 top-level targets +INFO: Found 266 targets and 91 test targets... +INFO: Elapsed time: 1.700s, Critical Path: 0.02s +INFO: 2 processes: 2 internal. +ERROR: Build did NOT complete successfully diff --git a/oss_scripts/configure.sh b/oss_scripts/configure.sh index edc0e0b01..06d86587f 100755 --- a/oss_scripts/configure.sh +++ b/oss_scripts/configure.sh @@ -53,10 +53,10 @@ fi # fi # Copy the current bazelversion of TF. -curl https://raw.githubusercontent.com/tensorflow/tensorflow/v2.20.0/.bazelversion -o .bazelversion +curl https://raw.githubusercontent.com/tensorflow/tensorflow/v2.21.0/.bazelversion -o .bazelversion # Copy the building configuration of TF. -curl https://raw.githubusercontent.com/tensorflow/tensorflow/v2.20.0/.bazelrc -o .bazelrc +curl https://raw.githubusercontent.com/tensorflow/tensorflow/v2.21.0/.bazelrc -o .bazelrc # This line breaks Windows builds, so we remove it. sed -i -e 's/build --noincompatible_remove_legacy_whole_archive//' .bazelrc diff --git a/oss_scripts/pip_package/BUILD b/oss_scripts/pip_package/BUILD index 1434e5458..c8ad540b3 100644 --- a/oss_scripts/pip_package/BUILD +++ b/oss_scripts/pip_package/BUILD @@ -1,5 +1,5 @@ # Tools for building the TF.Text pip package. -load("@python//:defs.bzl", "compile_pip_requirements") +load("@rules_python//python:pip.bzl", "compile_pip_requirements") load("@python_version_repo//:py_version.bzl", "REQUIREMENTS") package(default_visibility = ["//visibility:private"]) diff --git a/oss_scripts/pip_package/requirements.in b/oss_scripts/pip_package/requirements.in index 749ed0837..0f2072741 100644 --- a/oss_scripts/pip_package/requirements.in +++ b/oss_scripts/pip_package/requirements.in @@ -1,6 +1,5 @@ # Limit libraries based on compatibility. absl-py>=1.0 # Python 3.10 issues. -numpy==2.0.2; python_version=="3.9" numpy==2.1.3; python_version=="3.10" h5py==3.13.0; urllib3==2.5.0 diff --git a/oss_scripts/pip_package/requirements_lock_3_10.txt b/oss_scripts/pip_package/requirements_lock_3_10.txt index e66ea93e0..93984dae8 100644 --- a/oss_scripts/pip_package/requirements_lock_3_10.txt +++ b/oss_scripts/pip_package/requirements_lock_3_10.txt @@ -882,27 +882,23 @@ tensorboard-data-server==0.7.2 \ --hash=sha256:9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 \ --hash=sha256:ef687163c24185ae9754ed5650eb5bc4d84ff257aabdc33f0cc6f74d8ba54530 # via tensorboard -tensorflow==2.20.0 \ - --hash=sha256:02a0293d94f5c8b7125b66abf622cc4854a33ae9d618a0d41309f95e091bbaea \ - --hash=sha256:0deb5c583dfc53b54fd158a194ce0087b406bb6518af400ca3809735e4548ec3 \ - --hash=sha256:1590cbf87b6bcbd34d8e9ad70d0c696135e0aa71be31803b27358cf7ed63f8fc \ - --hash=sha256:197f0b613b38c0da5c6a12a8295ad4a05c78b853835dae8e0f9dfae3ce9ce8a5 \ - --hash=sha256:25265b0bc527e0d54b1e9cc60c44a24f44a809fe27666b905f0466471f9c52ec \ - --hash=sha256:28bc33759249c98eabcee9debd24e74506bbe29ac139e050cf0c74aa9888ebdf \ - --hash=sha256:2bfbfb3dd0e22bffc45fe1e922390d27753e99261fab8a882e802cf98a0e078f \ - --hash=sha256:3e9568c8efcb05c0266be223e3269c62ebf7ad3498f156438311735f6fa5ced5 \ - --hash=sha256:47c88e05a07f1ead4977b4894b3ecd4d8075c40191065afc4fd9355c9db3d926 \ - --hash=sha256:481499fd0f824583de8945be61d5e827898cdaa4f5ea1bc2cc28ca2ccff8229e \ - --hash=sha256:4a69ac2c2ce20720abf3abf917b4e86376326c0976fcec3df330e184b81e4088 \ - --hash=sha256:52b122f0232fd7ab10f28d537ce08470d0b6dcac7fff9685432daac7f8a06c8f \ - --hash=sha256:5f964016c5035d09b85a246a6b739be89282a7839743f3ea63640224f0c63aee \ - --hash=sha256:5fa3729b0126f75a99882b89fb7d536515721eda8014a63e259e780ba0a37372 \ - --hash=sha256:7551558a48c2e2f6c32a1537f06c654a9df1408a1c18e7b99c3caafbd03edfe3 \ - --hash=sha256:7abd7f3a010e0d354dc804182372779a722d474c4d8a3db8f4a3f5baef2a591e \ - --hash=sha256:a66cbd1b19209d3fbc45cbea80de92514ba455434013937251d65d444779783c \ - --hash=sha256:c25edad45e8cb9e76366f7a8c835279f9169028d610f3b52ce92d332a1b05438 \ - --hash=sha256:dd71a7e7c3270239f4185915e8f2c5d39608c5e18973d6e1d101b153993841eb \ - --hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357 +tensorflow==2.21.0 \ + --hash=sha256:0064a19bdc054a4b7c5e7e21cdf50ce38a114c2bada578b4f5267a37410f6784 \ + --hash=sha256:27ba0682572b1e50a0db1ee74cfb787eafcfdb1b751bbbf401fed62fe32a92e0 \ + --hash=sha256:4b24aca16d527a3cf1c37f720c04c484c3d20f4d0fdfa98632ac8b9f3be6eb5c \ + --hash=sha256:51f46f4806139d01fc7920cc72a4c75876f80649bf40ff083ab6212ceb43ca88 \ + --hash=sha256:56ecd7d47429acbe1df2694d50b75bf9fc3995ac92cb367cd9af6c4780ead712 \ + --hash=sha256:6462632889e0e9ce1455b208c87b86a8c154e899407ef7d426ef1ec71647f565 \ + --hash=sha256:76cccbe0a95d9392dee1ae501ae0656b6c73c1cac29a7f8f32d570e0670863f7 \ + --hash=sha256:77c6f298e695ea1d283cdd7d30f8d97530cc6e92c1395a9ddbab9771c99233a4 \ + --hash=sha256:7c97938b25cf70c80ae8619931f85abcdee2ab2eb256c2051202edb3b89e9a5d \ + --hash=sha256:8ee4d30fca0249c441bf65e63994df848dc63c80730bd494a9aa9ce5e3f0dee5 \ + --hash=sha256:9056fbc9ba04235810b71ae6cbd958a196e8804fb53bbcffbf3e23b56155f124 \ + --hash=sha256:a10abdfb8b1189210c251021a3f153b7ccc52a8e6521351f3dc3331e8ba593e0 \ + --hash=sha256:a145ed46c58192b7c3f9916d070caf4f6afc6dc7e5511f83dd97677f4c4947f4 \ + --hash=sha256:b07d15737406533898e36c7ef7944b1be18e9028dc521b9229952c537bbc5552 \ + --hash=sha256:b3b95643c4e70eb925839938fb35cbe142f317ec84af6844ee61513713bb13c0 \ + --hash=sha256:e9d8da8dcab9650efb45f032ba70af2f016f907e6e0c6bda29dd101bba945406 # via # -r @release_or_nightly/requirements.in # tf-keras @@ -921,9 +917,8 @@ termcolor==3.2.0 \ # via # tensorflow # tensorflow-datasets -tf-keras==2.20.1 \ - --hash=sha256:3f0e0a34d9a4c8758f24fdc1053e6e335f16ab5534c7d34f1899b8924779760c \ - --hash=sha256:884be5938fb0b2b53b1583c1ae2b660ef87215377c29b5b6a77fd221b472aeaf +tf-keras==2.21.0 \ + --hash=sha256:f858bf3d97f892304e7fbcf5eb0942ed91674e27204f940a85de8c93cf07fe62 # via -r @release_or_nightly/requirements.in toml==0.10.2 \ --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ diff --git a/oss_scripts/pip_package/requirements_lock_3_11.txt b/oss_scripts/pip_package/requirements_lock_3_11.txt index a4fdc2b99..5165a0008 100644 --- a/oss_scripts/pip_package/requirements_lock_3_11.txt +++ b/oss_scripts/pip_package/requirements_lock_3_11.txt @@ -907,27 +907,23 @@ tensorboard-data-server==0.7.2 \ --hash=sha256:9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 \ --hash=sha256:ef687163c24185ae9754ed5650eb5bc4d84ff257aabdc33f0cc6f74d8ba54530 # via tensorboard -tensorflow==2.20.0 \ - --hash=sha256:02a0293d94f5c8b7125b66abf622cc4854a33ae9d618a0d41309f95e091bbaea \ - --hash=sha256:0deb5c583dfc53b54fd158a194ce0087b406bb6518af400ca3809735e4548ec3 \ - --hash=sha256:1590cbf87b6bcbd34d8e9ad70d0c696135e0aa71be31803b27358cf7ed63f8fc \ - --hash=sha256:197f0b613b38c0da5c6a12a8295ad4a05c78b853835dae8e0f9dfae3ce9ce8a5 \ - --hash=sha256:25265b0bc527e0d54b1e9cc60c44a24f44a809fe27666b905f0466471f9c52ec \ - --hash=sha256:28bc33759249c98eabcee9debd24e74506bbe29ac139e050cf0c74aa9888ebdf \ - --hash=sha256:2bfbfb3dd0e22bffc45fe1e922390d27753e99261fab8a882e802cf98a0e078f \ - --hash=sha256:3e9568c8efcb05c0266be223e3269c62ebf7ad3498f156438311735f6fa5ced5 \ - --hash=sha256:47c88e05a07f1ead4977b4894b3ecd4d8075c40191065afc4fd9355c9db3d926 \ - --hash=sha256:481499fd0f824583de8945be61d5e827898cdaa4f5ea1bc2cc28ca2ccff8229e \ - --hash=sha256:4a69ac2c2ce20720abf3abf917b4e86376326c0976fcec3df330e184b81e4088 \ - --hash=sha256:52b122f0232fd7ab10f28d537ce08470d0b6dcac7fff9685432daac7f8a06c8f \ - --hash=sha256:5f964016c5035d09b85a246a6b739be89282a7839743f3ea63640224f0c63aee \ - --hash=sha256:5fa3729b0126f75a99882b89fb7d536515721eda8014a63e259e780ba0a37372 \ - --hash=sha256:7551558a48c2e2f6c32a1537f06c654a9df1408a1c18e7b99c3caafbd03edfe3 \ - --hash=sha256:7abd7f3a010e0d354dc804182372779a722d474c4d8a3db8f4a3f5baef2a591e \ - --hash=sha256:a66cbd1b19209d3fbc45cbea80de92514ba455434013937251d65d444779783c \ - --hash=sha256:c25edad45e8cb9e76366f7a8c835279f9169028d610f3b52ce92d332a1b05438 \ - --hash=sha256:dd71a7e7c3270239f4185915e8f2c5d39608c5e18973d6e1d101b153993841eb \ - --hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357 +tensorflow==2.21.0 \ + --hash=sha256:0064a19bdc054a4b7c5e7e21cdf50ce38a114c2bada578b4f5267a37410f6784 \ + --hash=sha256:27ba0682572b1e50a0db1ee74cfb787eafcfdb1b751bbbf401fed62fe32a92e0 \ + --hash=sha256:4b24aca16d527a3cf1c37f720c04c484c3d20f4d0fdfa98632ac8b9f3be6eb5c \ + --hash=sha256:51f46f4806139d01fc7920cc72a4c75876f80649bf40ff083ab6212ceb43ca88 \ + --hash=sha256:56ecd7d47429acbe1df2694d50b75bf9fc3995ac92cb367cd9af6c4780ead712 \ + --hash=sha256:6462632889e0e9ce1455b208c87b86a8c154e899407ef7d426ef1ec71647f565 \ + --hash=sha256:76cccbe0a95d9392dee1ae501ae0656b6c73c1cac29a7f8f32d570e0670863f7 \ + --hash=sha256:77c6f298e695ea1d283cdd7d30f8d97530cc6e92c1395a9ddbab9771c99233a4 \ + --hash=sha256:7c97938b25cf70c80ae8619931f85abcdee2ab2eb256c2051202edb3b89e9a5d \ + --hash=sha256:8ee4d30fca0249c441bf65e63994df848dc63c80730bd494a9aa9ce5e3f0dee5 \ + --hash=sha256:9056fbc9ba04235810b71ae6cbd958a196e8804fb53bbcffbf3e23b56155f124 \ + --hash=sha256:a10abdfb8b1189210c251021a3f153b7ccc52a8e6521351f3dc3331e8ba593e0 \ + --hash=sha256:a145ed46c58192b7c3f9916d070caf4f6afc6dc7e5511f83dd97677f4c4947f4 \ + --hash=sha256:b07d15737406533898e36c7ef7944b1be18e9028dc521b9229952c537bbc5552 \ + --hash=sha256:b3b95643c4e70eb925839938fb35cbe142f317ec84af6844ee61513713bb13c0 \ + --hash=sha256:e9d8da8dcab9650efb45f032ba70af2f016f907e6e0c6bda29dd101bba945406 # via # -r @release_or_nightly/requirements.in # tf-keras @@ -946,9 +942,8 @@ termcolor==3.2.0 \ # via # tensorflow # tensorflow-datasets -tf-keras==2.20.1 \ - --hash=sha256:3f0e0a34d9a4c8758f24fdc1053e6e335f16ab5534c7d34f1899b8924779760c \ - --hash=sha256:884be5938fb0b2b53b1583c1ae2b660ef87215377c29b5b6a77fd221b472aeaf +tf-keras==2.21.0 \ + --hash=sha256:f858bf3d97f892304e7fbcf5eb0942ed91674e27204f940a85de8c93cf07fe62 # via -r @release_or_nightly/requirements.in toml==0.10.2 \ --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ diff --git a/oss_scripts/pip_package/requirements_lock_3_12.txt b/oss_scripts/pip_package/requirements_lock_3_12.txt index 6d81db26e..7bc64b00a 100644 --- a/oss_scripts/pip_package/requirements_lock_3_12.txt +++ b/oss_scripts/pip_package/requirements_lock_3_12.txt @@ -907,27 +907,23 @@ tensorboard-data-server==0.7.2 \ --hash=sha256:9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 \ --hash=sha256:ef687163c24185ae9754ed5650eb5bc4d84ff257aabdc33f0cc6f74d8ba54530 # via tensorboard -tensorflow==2.20.0 \ - --hash=sha256:02a0293d94f5c8b7125b66abf622cc4854a33ae9d618a0d41309f95e091bbaea \ - --hash=sha256:0deb5c583dfc53b54fd158a194ce0087b406bb6518af400ca3809735e4548ec3 \ - --hash=sha256:1590cbf87b6bcbd34d8e9ad70d0c696135e0aa71be31803b27358cf7ed63f8fc \ - --hash=sha256:197f0b613b38c0da5c6a12a8295ad4a05c78b853835dae8e0f9dfae3ce9ce8a5 \ - --hash=sha256:25265b0bc527e0d54b1e9cc60c44a24f44a809fe27666b905f0466471f9c52ec \ - --hash=sha256:28bc33759249c98eabcee9debd24e74506bbe29ac139e050cf0c74aa9888ebdf \ - --hash=sha256:2bfbfb3dd0e22bffc45fe1e922390d27753e99261fab8a882e802cf98a0e078f \ - --hash=sha256:3e9568c8efcb05c0266be223e3269c62ebf7ad3498f156438311735f6fa5ced5 \ - --hash=sha256:47c88e05a07f1ead4977b4894b3ecd4d8075c40191065afc4fd9355c9db3d926 \ - --hash=sha256:481499fd0f824583de8945be61d5e827898cdaa4f5ea1bc2cc28ca2ccff8229e \ - --hash=sha256:4a69ac2c2ce20720abf3abf917b4e86376326c0976fcec3df330e184b81e4088 \ - --hash=sha256:52b122f0232fd7ab10f28d537ce08470d0b6dcac7fff9685432daac7f8a06c8f \ - --hash=sha256:5f964016c5035d09b85a246a6b739be89282a7839743f3ea63640224f0c63aee \ - --hash=sha256:5fa3729b0126f75a99882b89fb7d536515721eda8014a63e259e780ba0a37372 \ - --hash=sha256:7551558a48c2e2f6c32a1537f06c654a9df1408a1c18e7b99c3caafbd03edfe3 \ - --hash=sha256:7abd7f3a010e0d354dc804182372779a722d474c4d8a3db8f4a3f5baef2a591e \ - --hash=sha256:a66cbd1b19209d3fbc45cbea80de92514ba455434013937251d65d444779783c \ - --hash=sha256:c25edad45e8cb9e76366f7a8c835279f9169028d610f3b52ce92d332a1b05438 \ - --hash=sha256:dd71a7e7c3270239f4185915e8f2c5d39608c5e18973d6e1d101b153993841eb \ - --hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357 +tensorflow==2.21.0 \ + --hash=sha256:0064a19bdc054a4b7c5e7e21cdf50ce38a114c2bada578b4f5267a37410f6784 \ + --hash=sha256:27ba0682572b1e50a0db1ee74cfb787eafcfdb1b751bbbf401fed62fe32a92e0 \ + --hash=sha256:4b24aca16d527a3cf1c37f720c04c484c3d20f4d0fdfa98632ac8b9f3be6eb5c \ + --hash=sha256:51f46f4806139d01fc7920cc72a4c75876f80649bf40ff083ab6212ceb43ca88 \ + --hash=sha256:56ecd7d47429acbe1df2694d50b75bf9fc3995ac92cb367cd9af6c4780ead712 \ + --hash=sha256:6462632889e0e9ce1455b208c87b86a8c154e899407ef7d426ef1ec71647f565 \ + --hash=sha256:76cccbe0a95d9392dee1ae501ae0656b6c73c1cac29a7f8f32d570e0670863f7 \ + --hash=sha256:77c6f298e695ea1d283cdd7d30f8d97530cc6e92c1395a9ddbab9771c99233a4 \ + --hash=sha256:7c97938b25cf70c80ae8619931f85abcdee2ab2eb256c2051202edb3b89e9a5d \ + --hash=sha256:8ee4d30fca0249c441bf65e63994df848dc63c80730bd494a9aa9ce5e3f0dee5 \ + --hash=sha256:9056fbc9ba04235810b71ae6cbd958a196e8804fb53bbcffbf3e23b56155f124 \ + --hash=sha256:a10abdfb8b1189210c251021a3f153b7ccc52a8e6521351f3dc3331e8ba593e0 \ + --hash=sha256:a145ed46c58192b7c3f9916d070caf4f6afc6dc7e5511f83dd97677f4c4947f4 \ + --hash=sha256:b07d15737406533898e36c7ef7944b1be18e9028dc521b9229952c537bbc5552 \ + --hash=sha256:b3b95643c4e70eb925839938fb35cbe142f317ec84af6844ee61513713bb13c0 \ + --hash=sha256:e9d8da8dcab9650efb45f032ba70af2f016f907e6e0c6bda29dd101bba945406 # via # -r @release_or_nightly/requirements.in # tf-keras @@ -946,9 +942,8 @@ termcolor==3.2.0 \ # via # tensorflow # tensorflow-datasets -tf-keras==2.20.1 \ - --hash=sha256:3f0e0a34d9a4c8758f24fdc1053e6e335f16ab5534c7d34f1899b8924779760c \ - --hash=sha256:884be5938fb0b2b53b1583c1ae2b660ef87215377c29b5b6a77fd221b472aeaf +tf-keras==2.21.0 \ + --hash=sha256:f858bf3d97f892304e7fbcf5eb0942ed91674e27204f940a85de8c93cf07fe62 # via -r @release_or_nightly/requirements.in toml==0.10.2 \ --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ diff --git a/oss_scripts/pip_package/requirements_lock_3_13.txt b/oss_scripts/pip_package/requirements_lock_3_13.txt index 754f7ea7f..6e4f4dfba 100644 --- a/oss_scripts/pip_package/requirements_lock_3_13.txt +++ b/oss_scripts/pip_package/requirements_lock_3_13.txt @@ -907,27 +907,23 @@ tensorboard-data-server==0.7.2 \ --hash=sha256:9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 \ --hash=sha256:ef687163c24185ae9754ed5650eb5bc4d84ff257aabdc33f0cc6f74d8ba54530 # via tensorboard -tensorflow==2.20.0 \ - --hash=sha256:02a0293d94f5c8b7125b66abf622cc4854a33ae9d618a0d41309f95e091bbaea \ - --hash=sha256:0deb5c583dfc53b54fd158a194ce0087b406bb6518af400ca3809735e4548ec3 \ - --hash=sha256:1590cbf87b6bcbd34d8e9ad70d0c696135e0aa71be31803b27358cf7ed63f8fc \ - --hash=sha256:197f0b613b38c0da5c6a12a8295ad4a05c78b853835dae8e0f9dfae3ce9ce8a5 \ - --hash=sha256:25265b0bc527e0d54b1e9cc60c44a24f44a809fe27666b905f0466471f9c52ec \ - --hash=sha256:28bc33759249c98eabcee9debd24e74506bbe29ac139e050cf0c74aa9888ebdf \ - --hash=sha256:2bfbfb3dd0e22bffc45fe1e922390d27753e99261fab8a882e802cf98a0e078f \ - --hash=sha256:3e9568c8efcb05c0266be223e3269c62ebf7ad3498f156438311735f6fa5ced5 \ - --hash=sha256:47c88e05a07f1ead4977b4894b3ecd4d8075c40191065afc4fd9355c9db3d926 \ - --hash=sha256:481499fd0f824583de8945be61d5e827898cdaa4f5ea1bc2cc28ca2ccff8229e \ - --hash=sha256:4a69ac2c2ce20720abf3abf917b4e86376326c0976fcec3df330e184b81e4088 \ - --hash=sha256:52b122f0232fd7ab10f28d537ce08470d0b6dcac7fff9685432daac7f8a06c8f \ - --hash=sha256:5f964016c5035d09b85a246a6b739be89282a7839743f3ea63640224f0c63aee \ - --hash=sha256:5fa3729b0126f75a99882b89fb7d536515721eda8014a63e259e780ba0a37372 \ - --hash=sha256:7551558a48c2e2f6c32a1537f06c654a9df1408a1c18e7b99c3caafbd03edfe3 \ - --hash=sha256:7abd7f3a010e0d354dc804182372779a722d474c4d8a3db8f4a3f5baef2a591e \ - --hash=sha256:a66cbd1b19209d3fbc45cbea80de92514ba455434013937251d65d444779783c \ - --hash=sha256:c25edad45e8cb9e76366f7a8c835279f9169028d610f3b52ce92d332a1b05438 \ - --hash=sha256:dd71a7e7c3270239f4185915e8f2c5d39608c5e18973d6e1d101b153993841eb \ - --hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357 +tensorflow==2.21.0 \ + --hash=sha256:0064a19bdc054a4b7c5e7e21cdf50ce38a114c2bada578b4f5267a37410f6784 \ + --hash=sha256:27ba0682572b1e50a0db1ee74cfb787eafcfdb1b751bbbf401fed62fe32a92e0 \ + --hash=sha256:4b24aca16d527a3cf1c37f720c04c484c3d20f4d0fdfa98632ac8b9f3be6eb5c \ + --hash=sha256:51f46f4806139d01fc7920cc72a4c75876f80649bf40ff083ab6212ceb43ca88 \ + --hash=sha256:56ecd7d47429acbe1df2694d50b75bf9fc3995ac92cb367cd9af6c4780ead712 \ + --hash=sha256:6462632889e0e9ce1455b208c87b86a8c154e899407ef7d426ef1ec71647f565 \ + --hash=sha256:76cccbe0a95d9392dee1ae501ae0656b6c73c1cac29a7f8f32d570e0670863f7 \ + --hash=sha256:77c6f298e695ea1d283cdd7d30f8d97530cc6e92c1395a9ddbab9771c99233a4 \ + --hash=sha256:7c97938b25cf70c80ae8619931f85abcdee2ab2eb256c2051202edb3b89e9a5d \ + --hash=sha256:8ee4d30fca0249c441bf65e63994df848dc63c80730bd494a9aa9ce5e3f0dee5 \ + --hash=sha256:9056fbc9ba04235810b71ae6cbd958a196e8804fb53bbcffbf3e23b56155f124 \ + --hash=sha256:a10abdfb8b1189210c251021a3f153b7ccc52a8e6521351f3dc3331e8ba593e0 \ + --hash=sha256:a145ed46c58192b7c3f9916d070caf4f6afc6dc7e5511f83dd97677f4c4947f4 \ + --hash=sha256:b07d15737406533898e36c7ef7944b1be18e9028dc521b9229952c537bbc5552 \ + --hash=sha256:b3b95643c4e70eb925839938fb35cbe142f317ec84af6844ee61513713bb13c0 \ + --hash=sha256:e9d8da8dcab9650efb45f032ba70af2f016f907e6e0c6bda29dd101bba945406 # via # -r @release_or_nightly/requirements.in # tf-keras @@ -946,9 +942,8 @@ termcolor==3.2.0 \ # via # tensorflow # tensorflow-datasets -tf-keras==2.20.1 \ - --hash=sha256:3f0e0a34d9a4c8758f24fdc1053e6e335f16ab5534c7d34f1899b8924779760c \ - --hash=sha256:884be5938fb0b2b53b1583c1ae2b660ef87215377c29b5b6a77fd221b472aeaf +tf-keras==2.21.0 \ + --hash=sha256:f858bf3d97f892304e7fbcf5eb0942ed91674e27204f940a85de8c93cf07fe62 # via -r @release_or_nightly/requirements.in toml==0.10.2 \ --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ diff --git a/oss_scripts/pip_package/requirements_lock_3_9.txt b/oss_scripts/pip_package/requirements_lock_3_9.txt deleted file mode 100644 index 89fda7164..000000000 --- a/oss_scripts/pip_package/requirements_lock_3_9.txt +++ /dev/null @@ -1,1012 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# bazel run //oss_scripts/pip_package:requirements.update -# -absl-py==2.3.1 \ - --hash=sha256:a97820526f7fbfd2ec1bce83f3f25e3a14840dac0d8e02a0b71cd75db3f77fc9 \ - --hash=sha256:eeecf07f0c2a93ace0772c92e596ace6d3d3996c042b2128459aaae2a76de11d - # via - # -r @release_or_nightly/requirements.in - # array-record - # etils - # keras - # tensorboard - # tensorflow - # tensorflow-datasets - # tensorflow-metadata -array-record==0.4.1 ; python_version == "3.9" \ - --hash=sha256:6a0c8ed6fdfaaf2cecd3d5c6b9c13e116ad3299649611c8fd184d64557fbaba8 \ - --hash=sha256:a74e9c0075860777b79e4b3ac278f67add270acf78520d3b9cf8c325aef42951 - # via - # -r @release_or_nightly/requirements.in - # tensorflow-datasets -astunparse==1.6.3 \ - --hash=sha256:5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872 \ - --hash=sha256:c2652417f2c8b5bb325c885ae329bdf3f86424075c4fd1a128674bc6fba4b8e8 - # via tensorflow -certifi==2025.11.12 \ - --hash=sha256:97de8790030bbd5c2d96b7ec782fc2f7820ef8dba6db909ccf95449f2d062d4b \ - --hash=sha256:d8ab5478f2ecd78af242878415affce761ca6bc54a22a27e026d7c25357c3316 - # via requests -charset-normalizer==3.4.4 \ - --hash=sha256:027f6de494925c0ab2a55eab46ae5129951638a49a34d87f4c3eda90f696b4ad \ - --hash=sha256:077fbb858e903c73f6c9db43374fd213b0b6a778106bc7032446a8e8b5b38b93 \ - --hash=sha256:0a98e6759f854bd25a58a73fa88833fba3b7c491169f86ce1180c948ab3fd394 \ - --hash=sha256:0d3d8f15c07f86e9ff82319b3d9ef6f4bf907608f53fe9d92b28ea9ae3d1fd89 \ - --hash=sha256:0f04b14ffe5fdc8c4933862d8306109a2c51e0704acfa35d51598eb45a1e89fc \ - --hash=sha256:11d694519d7f29d6cd09f6ac70028dba10f92f6cdd059096db198c283794ac86 \ - --hash=sha256:194f08cbb32dc406d6e1aea671a68be0823673db2832b38405deba2fb0d88f63 \ - --hash=sha256:1bee1e43c28aa63cb16e5c14e582580546b08e535299b8b6158a7c9c768a1f3d \ - --hash=sha256:21d142cc6c0ec30d2efee5068ca36c128a30b0f2c53c1c07bd78cb6bc1d3be5f \ - --hash=sha256:2437418e20515acec67d86e12bf70056a33abdacb5cb1655042f6538d6b085a8 \ - --hash=sha256:244bfb999c71b35de57821b8ea746b24e863398194a4014e4c76adc2bbdfeff0 \ - --hash=sha256:2677acec1a2f8ef614c6888b5b4ae4060cc184174a938ed4e8ef690e15d3e505 \ - --hash=sha256:277e970e750505ed74c832b4bf75dac7476262ee2a013f5574dd49075879e161 \ - --hash=sha256:2aaba3b0819274cc41757a1da876f810a3e4d7b6eb25699253a4effef9e8e4af \ - --hash=sha256:2b7d8f6c26245217bd2ad053761201e9f9680f8ce52f0fcd8d0755aeae5b2152 \ - --hash=sha256:2c9d3c380143a1fedbff95a312aa798578371eb29da42106a29019368a475318 \ - --hash=sha256:3162d5d8ce1bb98dd51af660f2121c55d0fa541b46dff7bb9b9f86ea1d87de72 \ - --hash=sha256:31fd66405eaf47bb62e8cd575dc621c56c668f27d46a61d975a249930dd5e2a4 \ - --hash=sha256:362d61fd13843997c1c446760ef36f240cf81d3ebf74ac62652aebaf7838561e \ - --hash=sha256:376bec83a63b8021bb5c8ea75e21c4ccb86e7e45ca4eb81146091b56599b80c3 \ - --hash=sha256:44c2a8734b333e0578090c4cd6b16f275e07aa6614ca8715e6c038e865e70576 \ - --hash=sha256:47cc91b2f4dd2833fddaedd2893006b0106129d4b94fdb6af1f4ce5a9965577c \ - --hash=sha256:4902828217069c3c5c71094537a8e623f5d097858ac6ca8252f7b4d10b7560f1 \ - --hash=sha256:4bd5d4137d500351a30687c2d3971758aac9a19208fc110ccb9d7188fbe709e8 \ - --hash=sha256:4fe7859a4e3e8457458e2ff592f15ccb02f3da787fcd31e0183879c3ad4692a1 \ - --hash=sha256:542d2cee80be6f80247095cc36c418f7bddd14f4a6de45af91dfad36d817bba2 \ - --hash=sha256:554af85e960429cf30784dd47447d5125aaa3b99a6f0683589dbd27e2f45da44 \ - --hash=sha256:5833d2c39d8896e4e19b689ffc198f08ea58116bee26dea51e362ecc7cd3ed26 \ - --hash=sha256:5947809c8a2417be3267efc979c47d76a079758166f7d43ef5ae8e9f92751f88 \ - --hash=sha256:5ae497466c7901d54b639cf42d5b8c1b6a4fead55215500d2f486d34db48d016 \ - --hash=sha256:5bd2293095d766545ec1a8f612559f6b40abc0eb18bb2f5d1171872d34036ede \ - --hash=sha256:5bfbb1b9acf3334612667b61bd3002196fe2a1eb4dd74d247e0f2a4d50ec9bbf \ - --hash=sha256:5cb4d72eea50c8868f5288b7f7f33ed276118325c1dfd3957089f6b519e1382a \ - --hash=sha256:5dbe56a36425d26d6cfb40ce79c314a2e4dd6211d51d6d2191c00bed34f354cc \ - --hash=sha256:5f819d5fe9234f9f82d75bdfa9aef3a3d72c4d24a6e57aeaebba32a704553aa0 \ - --hash=sha256:64b55f9dce520635f018f907ff1b0df1fdc31f2795a922fb49dd14fbcdf48c84 \ - --hash=sha256:6515f3182dbe4ea06ced2d9e8666d97b46ef4c75e326b79bb624110f122551db \ - --hash=sha256:65e2befcd84bc6f37095f5961e68a6f077bf44946771354a28ad434c2cce0ae1 \ - --hash=sha256:6aee717dcfead04c6eb1ce3bd29ac1e22663cdea57f943c87d1eab9a025438d7 \ - --hash=sha256:6b39f987ae8ccdf0d2642338faf2abb1862340facc796048b604ef14919e55ed \ - --hash=sha256:6e1fcf0720908f200cd21aa4e6750a48ff6ce4afe7ff5a79a90d5ed8a08296f8 \ - --hash=sha256:74018750915ee7ad843a774364e13a3db91682f26142baddf775342c3f5b1133 \ - --hash=sha256:74664978bb272435107de04e36db5a9735e78232b85b77d45cfb38f758efd33e \ - --hash=sha256:74bb723680f9f7a6234dcf67aea57e708ec1fbdf5699fb91dfd6f511b0a320ef \ - --hash=sha256:752944c7ffbfdd10c074dc58ec2d5a8a4cd9493b314d367c14d24c17684ddd14 \ - --hash=sha256:778d2e08eda00f4256d7f672ca9fef386071c9202f5e4607920b86d7803387f2 \ - --hash=sha256:780236ac706e66881f3b7f2f32dfe90507a09e67d1d454c762cf642e6e1586e0 \ - --hash=sha256:798d75d81754988d2565bff1b97ba5a44411867c0cf32b77a7e8f8d84796b10d \ - --hash=sha256:799a7a5e4fb2d5898c60b640fd4981d6a25f1c11790935a44ce38c54e985f828 \ - --hash=sha256:7a32c560861a02ff789ad905a2fe94e3f840803362c84fecf1851cb4cf3dc37f \ - --hash=sha256:7c308f7e26e4363d79df40ca5b2be1c6ba9f02bdbccfed5abddb7859a6ce72cf \ - --hash=sha256:7fa17817dc5625de8a027cb8b26d9fefa3ea28c8253929b8d6649e705d2835b6 \ - --hash=sha256:81d5eb2a312700f4ecaa977a8235b634ce853200e828fbadf3a9c50bab278328 \ - --hash=sha256:82004af6c302b5d3ab2cfc4cc5f29db16123b1a8417f2e25f9066f91d4411090 \ - --hash=sha256:837c2ce8c5a65a2035be9b3569c684358dfbf109fd3b6969630a87535495ceaa \ - --hash=sha256:840c25fb618a231545cbab0564a799f101b63b9901f2569faecd6b222ac72381 \ - --hash=sha256:8a6562c3700cce886c5be75ade4a5db4214fda19fede41d9792d100288d8f94c \ - --hash=sha256:8af65f14dc14a79b924524b1e7fffe304517b2bff5a58bf64f30b98bbc5079eb \ - --hash=sha256:8ef3c867360f88ac904fd3f5e1f902f13307af9052646963ee08ff4f131adafc \ - --hash=sha256:94537985111c35f28720e43603b8e7b43a6ecfb2ce1d3058bbe955b73404e21a \ - --hash=sha256:99ae2cffebb06e6c22bdc25801d7b30f503cc87dbd283479e7b606f70aff57ec \ - --hash=sha256:9a26f18905b8dd5d685d6d07b0cdf98a79f3c7a918906af7cc143ea2e164c8bc \ - --hash=sha256:9b35f4c90079ff2e2edc5b26c0c77925e5d2d255c42c74fdb70fb49b172726ac \ - --hash=sha256:9cd98cdc06614a2f768d2b7286d66805f94c48cde050acdbbb7db2600ab3197e \ - --hash=sha256:9d1bb833febdff5c8927f922386db610b49db6e0d4f4ee29601d71e7c2694313 \ - --hash=sha256:9f7fcd74d410a36883701fafa2482a6af2ff5ba96b9a620e9e0721e28ead5569 \ - --hash=sha256:a59cb51917aa591b1c4e6a43c132f0cdc3c76dbad6155df4e28ee626cc77a0a3 \ - --hash=sha256:a61900df84c667873b292c3de315a786dd8dac506704dea57bc957bd31e22c7d \ - --hash=sha256:a79cfe37875f822425b89a82333404539ae63dbdddf97f84dcbc3d339aae9525 \ - --hash=sha256:a8a8b89589086a25749f471e6a900d3f662d1d3b6e2e59dcecf787b1cc3a1894 \ - --hash=sha256:a8bf8d0f749c5757af2142fe7903a9df1d2e8aa3841559b2bad34b08d0e2bcf3 \ - --hash=sha256:a9768c477b9d7bd54bc0c86dbaebdec6f03306675526c9927c0e8a04e8f94af9 \ - --hash=sha256:ac1c4a689edcc530fc9d9aa11f5774b9e2f33f9a0c6a57864e90908f5208d30a \ - --hash=sha256:af2d8c67d8e573d6de5bc30cdb27e9b95e49115cd9baad5ddbd1a6207aaa82a9 \ - --hash=sha256:b435cba5f4f750aa6c0a0d92c541fb79f69a387c91e61f1795227e4ed9cece14 \ - --hash=sha256:b5b290ccc2a263e8d185130284f8501e3e36c5e02750fc6b6bdeb2e9e96f1e25 \ - --hash=sha256:b5d84d37db046c5ca74ee7bb47dd6cbc13f80665fdde3e8040bdd3fb015ecb50 \ - --hash=sha256:b7cf1017d601aa35e6bb650b6ad28652c9cd78ee6caff19f3c28d03e1c80acbf \ - --hash=sha256:bc7637e2f80d8530ee4a78e878bce464f70087ce73cf7c1caf142416923b98f1 \ - --hash=sha256:c0463276121fdee9c49b98908b3a89c39be45d86d1dbaa22957e38f6321d4ce3 \ - --hash=sha256:c4ef880e27901b6cc782f1b95f82da9313c0eb95c3af699103088fa0ac3ce9ac \ - --hash=sha256:c8ae8a0f02f57a6e61203a31428fa1d677cbe50c93622b4149d5c0f319c1d19e \ - --hash=sha256:ca5862d5b3928c4940729dacc329aa9102900382fea192fc5e52eb69d6093815 \ - --hash=sha256:cb01158d8b88ee68f15949894ccc6712278243d95f344770fa7593fa2d94410c \ - --hash=sha256:cb6254dc36b47a990e59e1068afacdcd02958bdcce30bb50cc1700a8b9d624a6 \ - --hash=sha256:cc00f04ed596e9dc0da42ed17ac5e596c6ccba999ba6bd92b0e0aef2f170f2d6 \ - --hash=sha256:cd09d08005f958f370f539f186d10aec3377d55b9eeb0d796025d4886119d76e \ - --hash=sha256:cd4b7ca9984e5e7985c12bc60a6f173f3c958eae74f3ef6624bb6b26e2abbae4 \ - --hash=sha256:ce8a0633f41a967713a59c4139d29110c07e826d131a316b50ce11b1d79b4f84 \ - --hash=sha256:cead0978fc57397645f12578bfd2d5ea9138ea0fac82b2f63f7f7c6877986a69 \ - --hash=sha256:d055ec1e26e441f6187acf818b73564e6e6282709e9bcb5b63f5b23068356a15 \ - --hash=sha256:d1f13550535ad8cff21b8d757a3257963e951d96e20ec82ab44bc64aeb62a191 \ - --hash=sha256:d9c7f57c3d666a53421049053eaacdd14bbd0a528e2186fcb2e672effd053bb0 \ - --hash=sha256:d9e45d7faa48ee908174d8fe84854479ef838fc6a705c9315372eacbc2f02897 \ - --hash=sha256:da3326d9e65ef63a817ecbcc0df6e94463713b754fe293eaa03da99befb9a5bd \ - --hash=sha256:de00632ca48df9daf77a2c65a484531649261ec9f25489917f09e455cb09ddb2 \ - --hash=sha256:e1f185f86a6f3403aa2420e815904c67b2f9ebc443f045edd0de921108345794 \ - --hash=sha256:e824f1492727fa856dd6eda4f7cee25f8518a12f3c4a56a74e8095695089cf6d \ - --hash=sha256:e912091979546adf63357d7e2ccff9b44f026c075aeaf25a52d0e95ad2281074 \ - --hash=sha256:eaabd426fe94daf8fd157c32e571c85cb12e66692f15516a83a03264b08d06c3 \ - --hash=sha256:ebf3e58c7ec8a8bed6d66a75d7fb37b55e5015b03ceae72a8e7c74495551e224 \ - --hash=sha256:ecaae4149d99b1c9e7b88bb03e3221956f68fd6d50be2ef061b2381b61d20838 \ - --hash=sha256:eecbc200c7fd5ddb9a7f16c7decb07b566c29fa2161a16cf67b8d068bd21690a \ - --hash=sha256:f155a433c2ec037d4e8df17d18922c3a0d9b3232a396690f17175d2946f0218d \ - --hash=sha256:f1e34719c6ed0b92f418c7c780480b26b5d9c50349e9a9af7d76bf757530350d \ - --hash=sha256:f34be2938726fc13801220747472850852fe6b1ea75869a048d6f896838c896f \ - --hash=sha256:f820802628d2694cb7e56db99213f930856014862f3fd943d290ea8438d07ca8 \ - --hash=sha256:f8bf04158c6b607d747e93949aa60618b61312fe647a6369f88ce2ff16043490 \ - --hash=sha256:f8e160feb2aed042cd657a72acc0b481212ed28b1b9a95c0cee1621b524e1966 \ - --hash=sha256:f9d332f8c2a2fcbffe1378594431458ddbef721c1769d78e2cbc06280d8155f9 \ - --hash=sha256:fa09f53c465e532f4d3db095e0c55b615f010ad81803d383195b6b5ca6cbf5f3 \ - --hash=sha256:faa3a41b2b66b6e50f84ae4a68c64fcd0c44355741c6374813a800cd6695db9e \ - --hash=sha256:fd44c878ea55ba351104cb93cc85e74916eb8fa440ca7903e57575e97394f608 - # via requests -click==8.1.8 \ - --hash=sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2 \ - --hash=sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a - # via tensorflow-datasets -dm-tree==0.1.8 \ - --hash=sha256:054b461f8176f4bce7a21f7b1870f873a1ced3bdbe1282c816c550bb43c71fa6 \ - --hash=sha256:09964470f76a5201aff2e8f9b26842976de7889300676f927930f6285e256760 \ - --hash=sha256:0d3172394079a86c3a759179c65f64c48d1a42b89495fcf38976d11cc3bb952c \ - --hash=sha256:0e9620ccf06393eb6b613b5e366469304622d4ea96ae6540b28a33840e6c89cf \ - --hash=sha256:0fcaabbb14e7980377439e7140bd05552739ca5e515ecb3119f234acee4b9430 \ - --hash=sha256:1607ce49aa42f010d1e5e616d92ce899d66835d4d8bea49679582435285515de \ - --hash=sha256:181c35521d480d0365f39300542cb6cd7fd2b77351bb43d7acfda15aef63b317 \ - --hash=sha256:1d7c26e431fc93cc7e0cba867eb000db6a05f6f2b25af11ac4e9dada88fc5bca \ - --hash=sha256:1fe962015b2fe1282892b28ebe962faed53c7f98d942da9a4625cbf27baef913 \ - --hash=sha256:250b692fb75f45f02e2f58fbef9ab338904ef334b90557565621fa251df267cf \ - --hash=sha256:2869228d9c619074de501a3c10dc7f07c75422f8fab36ecdcb859b6f1b1ec3ef \ - --hash=sha256:28c52cbf4f8b3dbd0beaedf44f69fa85eec5e9dede612e08035e06ada6ec9426 \ - --hash=sha256:2f7915660f59c09068e428613c480150180df1060561fd0d1470684ae7007bd1 \ - --hash=sha256:343a4a4ebaa127451ff971254a4be4084eb4bdc0b2513c32b46f6f728fd03f9e \ - --hash=sha256:35cc164a79336bfcfafb47e5f297898359123bbd3330c1967f0c4994f9cf9f60 \ - --hash=sha256:378cc8ad93c5fe3590f405a309980721f021c790ca1bdf9b15bb1d59daec57f5 \ - --hash=sha256:39070ba268c0491af9fe7a58644d99e8b4f2cde6e5884ba3380bddc84ed43d5f \ - --hash=sha256:435227cf3c5dc63f4de054cf3d00183790bd9ead4c3623138c74dde7f67f521b \ - --hash=sha256:5483dca4d7eb1a0d65fe86d3b6a53ae717face83c1f17e0887b1a4a64ae5c410 \ - --hash=sha256:694c3654cfd2a81552c08ec66bb5c4a3d48fa292b9a181880fb081c36c5b9134 \ - --hash=sha256:75c5d528bb992981c20793b6b453e91560784215dffb8a5440ba999753c14ceb \ - --hash=sha256:803bfc53b4659f447ac694dbd04235f94a73ef7c1fd1e0df7c84ac41e0bc963b \ - --hash=sha256:81fce77f22a302d7a5968aebdf4efafef4def7ce96528719a354e6990dcd49c7 \ - --hash=sha256:83b7764de0d855338abefc6e3ee9fe40d301668310aa3baea3f778ff051f4393 \ - --hash=sha256:8c60a7eadab64c2278861f56bca320b2720f163dca9d7558103c3b77f2416571 \ - --hash=sha256:8ed3564abed97c806db122c2d3e1a2b64c74a63debe9903aad795167cc301368 \ - --hash=sha256:94d3f0826311f45ee19b75f5b48c99466e4218a0489e81c0f0167bda50cacf22 \ - --hash=sha256:96a548a406a6fb15fe58f6a30a57ff2f2aafbf25f05afab00c8f5e5977b6c715 \ - --hash=sha256:a5d819c38c03f0bb5b3b3703c60e4b170355a0fc6b5819325bf3d4ceb3ae7e80 \ - --hash=sha256:ad16ceba90a56ec47cf45b21856d14962ac314787975ef786efb5e6e9ca75ec7 \ - --hash=sha256:af4b3d372f2477dcd89a6e717e4a575ca35ccc20cc4454a8a4b6f8838a00672d \ - --hash=sha256:b095ba4f8ca1ba19350fd53cf1f8f3eb0bd406aa28af64a6dfc86707b32a810a \ - --hash=sha256:b9bd9b9ccb59409d33d51d84b7668010c04c2af7d4a371632874c1ca356cff3d \ - --hash=sha256:b9f89a454e98806b44fe9d40ec9eee61f848388f7e79ac2371a55679bd5a3ac6 \ - --hash=sha256:bb2d109f42190225112da899b9f3d46d0d5f26aef501c61e43529fe9322530b5 \ - --hash=sha256:c0a94aba18a35457a1b5cd716fd7b46c5dafdc4cf7869b4bae665b91c4682a8e \ - --hash=sha256:c5c8c12e3fda754ef6af94161bacdaeda816d941995fac415d6855c6c386af68 \ - --hash=sha256:d1612fcaecd79023dbc6a6ae48d51a80beb5c385d6f3f6d71688e57bc8d07de8 \ - --hash=sha256:d16e1f2a073604cfcc09f7131ae8d534674f43c3aef4c25742eae295bc60d04f \ - --hash=sha256:d20f2faa3672b52e5013f4077117bfb99c4cfc0b445d3bde1584c34032b57436 \ - --hash=sha256:d40fa4106ca6edc66760246a08f500ec0c85ef55c762fb4a363f6ee739ba02ee \ - --hash=sha256:de287fabc464b8734be251e46e06aa9aa1001f34198da2b6ce07bd197172b9cb \ - --hash=sha256:e4d714371bb08839e4e5e29024fc95832d9affe129825ef38836b143028bd144 \ - --hash=sha256:ea9e59e0451e7d29aece402d9f908f2e2a80922bcde2ebfd5dcb07750fcbfee8 \ - --hash=sha256:f7ac31b9aecccb2c6e1ab29706f6ded3eba0c2c69c770322c9c685929c3d6afb \ - --hash=sha256:fa42a605d099ee7d41ba2b5fb75e21423951fd26e5d50583a00471238fb3021d - # via tensorflow-datasets -etils[array-types,enp,epath,epy,etqdm,etree]==1.5.2 \ - --hash=sha256:6dc882d355e1e98a5d1a148d6323679dc47c9a5792939b9de72615aa4737eb0b \ - --hash=sha256:ba6a3e1aff95c769130776aa176c11540637f5dd881f3b79172a5149b6b1c446 - # via - # array-record - # tensorflow-datasets -flatbuffers==25.12.19 \ - --hash=sha256:7634f50c427838bb021c2d66a3d1168e9d199b0607e6329399f04846d42e20b4 - # via tensorflow -fsspec==2025.3.0 \ - --hash=sha256:a935fd1ea872591f2b5148907d103488fc523295e6c64b835cfad8c3eca44972 \ - --hash=sha256:efb87af3efa9103f94ca91a7f8cb7a4df91af9f74fc106c9c7ea0efd7277c1b3 - # via etils -gast==0.7.0 \ - --hash=sha256:0bb14cd1b806722e91ddbab6fb86bba148c22b40e7ff11e248974e04c8adfdae \ - --hash=sha256:99cbf1365633a74099f69c59bd650476b96baa5ef196fec88032b00b31ba36f7 - # via tensorflow -google-pasta==0.2.0 \ - --hash=sha256:4612951da876b1a10fe3960d7226f0c7682cf901e16ac06e473b267a5afa8954 \ - --hash=sha256:b32482794a366b5366a32c92a9a9201b107821889935a02b3e51f6b432ea84ed \ - --hash=sha256:c9f2c8dfc8f96d0d5808299920721be30c9eec37f2389f28904f454565c8a16e - # via tensorflow -grpcio==1.76.0 \ - --hash=sha256:035d90bc79eaa4bed83f524331d55e35820725c9fbb00ffa1904d5550ed7ede3 \ - --hash=sha256:04bbe1bfe3a68bbfd4e52402ab7d4eb59d72d02647ae2042204326cf4bbad280 \ - --hash=sha256:063065249d9e7e0782d03d2bca50787f53bd0fb89a67de9a7b521c4a01f1989b \ - --hash=sha256:06c3d6b076e7b593905d04fdba6a0525711b3466f43b3400266f04ff735de0cd \ - --hash=sha256:08caea849a9d3c71a542827d6df9d5a69067b0a1efbea8a855633ff5d9571465 \ - --hash=sha256:0aaa82d0813fd4c8e589fac9b65d7dd88702555f702fb10417f96e2a2a6d4c0f \ - --hash=sha256:0b7604868b38c1bfd5cf72d768aedd7db41d78cb6a4a18585e33fb0f9f2363fd \ - --hash=sha256:0c37db8606c258e2ee0c56b78c62fc9dee0e901b5dbdcf816c2dd4ad652b8b0c \ - --hash=sha256:1c9b93f79f48b03ada57ea24725d83a30284a012ec27eab2cf7e50a550cbbbcc \ - --hash=sha256:2107b0c024d1b35f4083f11245c0e23846ae64d02f40b2b226684840260ed054 \ - --hash=sha256:2229ae655ec4e8999599469559e97630185fdd53ae1e8997d147b7c9b2b72cba \ - --hash=sha256:25a18e9810fbc7e7f03ec2516addc116a957f8cbb8cbc95ccc80faa072743d03 \ - --hash=sha256:26ef06c73eb53267c2b319f43e6634c7556ea37672029241a056629af27c10e2 \ - --hash=sha256:2e1743fbd7f5fa713a1b0a8ac8ebabf0ec980b5d8809ec358d488e273b9cf02a \ - --hash=sha256:32483fe2aab2c3794101c2a159070584e5db11d0aa091b2c0ea9c4fc43d0d749 \ - --hash=sha256:3bf0f392c0b806905ed174dcd8bdd5e418a40d5567a05615a030a5aeddea692d \ - --hash=sha256:3e2a27c89eb9ac3d81ec8835e12414d73536c6e620355d65102503064a4ed6eb \ - --hash=sha256:40ad3afe81676fd9ec6d9d406eda00933f218038433980aa19d401490e46ecde \ - --hash=sha256:4215d3a102bd95e2e11b5395c78562967959824156af11fa93d18fdd18050990 \ - --hash=sha256:45d59a649a82df5718fd9527ce775fd66d1af35e6d31abdcdc906a49c6822958 \ - --hash=sha256:45e0111e73f43f735d70786557dc38141185072d7ff8dc1829d6a77ac1471468 \ - --hash=sha256:479496325ce554792dba6548fae3df31a72cef7bad71ca2e12b0e58f9b336bfc \ - --hash=sha256:490fa6d203992c47c7b9e4a9d39003a0c2bcc1c9aa3c058730884bbbb0ee9f09 \ - --hash=sha256:49ce47231818806067aea3324d4bf13825b658ad662d3b25fada0bdad9b8a6af \ - --hash=sha256:4baf3cbe2f0be3289eb68ac8ae771156971848bb8aaff60bad42005539431980 \ - --hash=sha256:522175aba7af9113c48ec10cc471b9b9bd4f6ceb36aeb4544a8e2c80ed9d252d \ - --hash=sha256:5e8571632780e08526f118f74170ad8d50fb0a48c23a746bef2a6ebade3abd6f \ - --hash=sha256:615ba64c208aaceb5ec83bfdce7728b80bfeb8be97562944836a7a0a9647d882 \ - --hash=sha256:61f69297cba3950a524f61c7c8ee12e55c486cb5f7db47ff9dcee33da6f0d3ae \ - --hash=sha256:65a20de41e85648e00305c1bb09a3598f840422e522277641145a32d42dcefcc \ - --hash=sha256:6a15c17af8839b6801d554263c546c69c4d7718ad4321e3166175b37eaacca77 \ - --hash=sha256:747fa73efa9b8b1488a95d0ba1039c8e2dca0f741612d80415b1e1c560febf4e \ - --hash=sha256:7be78388d6da1a25c0d5ec506523db58b18be22d9c37d8d3a32c08be4987bd73 \ - --hash=sha256:81fd9652b37b36f16138611c7e884eb82e0cec137c40d3ef7c3f9b3ed00f6ed8 \ - --hash=sha256:83d57312a58dcfe2a3a0f9d1389b299438909a02db60e2f2ea2ae2d8034909d3 \ - --hash=sha256:8843114c0cfce61b40ad48df65abcfc00d4dba82eae8718fab5352390848c5da \ - --hash=sha256:8cc3309d8e08fd79089e13ed4819d0af72aa935dd8f435a195fd152796752ff2 \ - --hash=sha256:8ebe63ee5f8fa4296b1b8cfc743f870d10e902ca18afc65c68cf46fd39bb0783 \ - --hash=sha256:8eddfb4d203a237da6f3cc8a540dad0517d274b5a1e9e636fd8d2c79b5c1d397 \ - --hash=sha256:922fa70ba549fce362d2e2871ab542082d66e2aaf0c19480ea453905b01f384e \ - --hash=sha256:931091142fd8cc14edccc0845a79248bc155425eee9a98b2db2ea4f00a235a42 \ - --hash=sha256:971fd5a1d6e62e00d945423a567e42eb1fa678ba89072832185ca836a94daaa6 \ - --hash=sha256:980a846182ce88c4f2f7e2c22c56aefd515daeb36149d1c897f83cf57999e0b6 \ - --hash=sha256:9d9adda641db7207e800a7f089068f6f645959f2df27e870ee81d44701dd9db3 \ - --hash=sha256:9f8f757bebaaea112c00dba718fc0d3260052ce714e25804a03f93f5d1c6cc11 \ - --hash=sha256:a6ae758eb08088d36812dd5d9af7a9859c05b1e0f714470ea243694b49278e7b \ - --hash=sha256:a8c2cf1209497cf659a667d7dea88985e834c24b7c3b605e6254cbb5076d985c \ - --hash=sha256:acab0277c40eff7143c2323190ea57b9ee5fd353d8190ee9652369fae735668a \ - --hash=sha256:b331680e46239e090f5b3cead313cc772f6caa7d0fc8de349337563125361a4a \ - --hash=sha256:c088e7a90b6017307f423efbb9d1ba97a22aa2170876223f9709e9d1de0b5347 \ - --hash=sha256:d099566accf23d21037f18a2a63d323075bebace807742e4b0ac210971d4dd70 \ - --hash=sha256:d388087771c837cdb6515539f43b9d4bf0b0f23593a24054ac16f7a960be16f4 \ - --hash=sha256:dcfe41187da8992c5f40aa8c5ec086fa3672834d2be57a32384c08d5a05b4c00 \ - --hash=sha256:e6d1db20594d9daba22f90da738b1a0441a7427552cc6e2e3d1297aeddc00378 \ - --hash=sha256:ebea5cc3aa8ea72e04df9913492f9a96d9348db876f9dda3ad729cfedf7ac416 \ - --hash=sha256:ebebf83299b0cb1721a8859ea98f3a77811e35dce7609c5c963b9ad90728f886 \ - --hash=sha256:f0e34c2079d47ae9f6188211db9e777c619a21d4faba6977774e8fa43b085e48 \ - --hash=sha256:f92f88e6c033db65a5ae3d97905c8fea9c725b63e28d5a75cb73b49bda5024d8 \ - --hash=sha256:f9f7bd5faab55f47231ad8dba7787866b69f5e93bc306e3915606779bbfb4ba8 \ - --hash=sha256:fd5ef5932f6475c436c4a55e4336ebbe47bd3272be04964a03d316bbf4afbcbc \ - --hash=sha256:ff8a59ea85a1f2191a0ffcc61298c571bc566332f82e5f5be1b83c9d8e668a62 - # via - # tensorboard - # tensorflow -h5py==3.13.0 \ - --hash=sha256:10894c55d46df502d82a7a4ed38f9c3fdbcb93efb42e25d275193e093071fade \ - --hash=sha256:1870e46518720023da85d0895a1960ff2ce398c5671eac3b1a41ec696b7105c3 \ - --hash=sha256:21daf38171753899b5905f3d82c99b0b1ec2cbbe282a037cad431feb620e62ec \ - --hash=sha256:22ffe2a25770a2d67213a1b94f58006c14dce06933a42d2aaa0318c5868d1508 \ - --hash=sha256:337af114616f3656da0c83b68fcf53ecd9ce9989a700b0883a6e7c483c3235d4 \ - --hash=sha256:357e6dc20b101a805ccfd0024731fbaf6e8718c18c09baf3b5e4e9d198d13fca \ - --hash=sha256:477c58307b6b9a2509c59c57811afb9f598aedede24a67da808262dfa0ee37b4 \ - --hash=sha256:4f97ecde7ac6513b21cd95efdfc38dc6d19f96f6ca6f2a30550e94e551458e0a \ - --hash=sha256:5540daee2b236d9569c950b417f13fd112d51d78b4c43012de05774908dff3f5 \ - --hash=sha256:560e71220dc92dfa254b10a4dcb12d56b574d2d87e095db20466b32a93fec3f9 \ - --hash=sha256:56dd172d862e850823c4af02dc4ddbc308f042b85472ffdaca67f1598dff4a57 \ - --hash=sha256:57c4c74f627c616f02b7aec608a8c706fe08cb5b0ba7c08555a4eb1dde20805a \ - --hash=sha256:782ff0ac39f455f21fd1c8ebc007328f65f43d56718a89327eec76677ebf238a \ - --hash=sha256:82690e89c72b85addf4fc4d5058fb1e387b6c14eb063b0b879bf3f42c3b93c35 \ - --hash=sha256:851ae3a8563d87a5a0dc49c2e2529c75b8842582ccaefbf84297d2cfceeacd61 \ - --hash=sha256:8a8e38ef4ceb969f832cc230c0cf808c613cc47e31e768fd7b1106c55afa1cb8 \ - --hash=sha256:9c82ece71ed1c2b807b6628e3933bc6eae57ea21dac207dca3470e3ceaaf437c \ - --hash=sha256:be949b46b7388074c5acae017fbbe3e5ba303fd9daaa52157fdfef30bbdacadd \ - --hash=sha256:c10f061764d8dce0a9592ce08bfd5f243a00703325c388f1086037e5d619c5f1 \ - --hash=sha256:d2cf6a231a07c14acd504a945a6e9ec115e0007f675bde5e0de30a4dc8d86a31 \ - --hash=sha256:d571644958c5e19a61c793d8d23cd02479572da828e333498c9acc463f4a3997 \ - --hash=sha256:d6f13f9b5ce549448c01e4dfe08ea8d1772e6078799af2c1c8d09e941230a90d \ - --hash=sha256:e520ec76de00943dd017c8ea3f354fa1d2f542eac994811943a8faedf2a7d5cb \ - --hash=sha256:e79d8368cd9295045956bfb436656bea3f915beaa11d342e9f79f129f5178763 \ - --hash=sha256:f35640e81b03c02a88b8bf99fb6a9d3023cc52f7c627694db2f379e0028f2868 \ - --hash=sha256:fb267ce4b83f9c42560e9ff4d30f60f7ae492eacf9c7ede849edf8c1b860e16b - # via - # -r @release_or_nightly/requirements.in - # keras - # tensorflow -idna==3.11 \ - --hash=sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea \ - --hash=sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902 - # via requests -importlib-metadata==8.6.1 \ - --hash=sha256:02a89390c1e15fdfdc0d7c6b25cb3e62650d0494005c97d6f148bf5b9787525e \ - --hash=sha256:310b41d755445d74569f993ccfc22838295d9fe005425094fad953d7f15c8580 - # via markdown -importlib-resources==6.5.2 \ - --hash=sha256:185f87adef5bcc288449d98fb4fba07cea78bc036455dd44c5fc4a2fe78fed2c \ - --hash=sha256:789cfdc3ed28c78b67a06acb8126751ced69a3d5f79c095a98298cd8a760ccec - # via etils -keras==3.10.0 \ - --hash=sha256:6e9100bf66eaf6de4b7f288d34ef9bb8b5dcdd62f42c64cfd910226bb34ad2d2 \ - --hash=sha256:c095a6bf90cd50defadf73d4859ff794fad76b775357ef7bd1dbf96388dae7d3 - # via tensorflow -libclang==18.1.1 \ - --hash=sha256:0b2e143f0fac830156feb56f9231ff8338c20aecfe72b4ffe96f19e5a1dbb69a \ - --hash=sha256:3f0e1f49f04d3cd198985fea0511576b0aee16f9ff0e0f0cad7f9c57ec3c20e8 \ - --hash=sha256:4dd2d3b82fab35e2bf9ca717d7b63ac990a3519c7e312f19fa8e86dcc712f7fb \ - --hash=sha256:54dda940a4a0491a9d1532bf071ea3ef26e6dbaf03b5000ed94dd7174e8f9592 \ - --hash=sha256:69f8eb8f65c279e765ffd28aaa7e9e364c776c17618af8bff22a8df58677ff4f \ - --hash=sha256:6f14c3f194704e5d09769108f03185fce7acaf1d1ae4bbb2f30a72c2400cb7c5 \ - --hash=sha256:83ce5045d101b669ac38e6da8e58765f12da2d3aafb3b9b98d88b286a60964d8 \ - --hash=sha256:a1214966d08d73d971287fc3ead8dfaf82eb07fb197680d8b3859dbbbbf78250 \ - --hash=sha256:c533091d8a3bbf7460a00cb6c1a71da93bffe148f172c7d03b1c31fbf8aa2a0b \ - --hash=sha256:cf4a99b05376513717ab5d82a0db832c56ccea4fd61a69dbb7bccf2dfb207dbe - # via tensorflow -markdown==3.8 \ - --hash=sha256:794a929b79c5af141ef5ab0f2f642d0f7b1872981250230e72682346f7cc90dc \ - --hash=sha256:7df81e63f0df5c4b24b7d156eb81e4690595239b7d70937d0409f1b0de319c6f - # via tensorboard -markdown-it-py==3.0.0 \ - --hash=sha256:355216845c60bd96232cd8d8c40e8f9765cc86f46880e43a8fd22dc1a1a8cab1 \ - --hash=sha256:e3f60a94fa066dc52ec76661e37c851cb232d92f9886b15cb560aaada2df8feb - # via rich -markupsafe==3.0.3 \ - --hash=sha256:0303439a41979d9e74d18ff5e2dd8c43ed6c6001fd40e5bf2e43f7bd9bbc523f \ - --hash=sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a \ - --hash=sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf \ - --hash=sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19 \ - --hash=sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf \ - --hash=sha256:0f4b68347f8c5eab4a13419215bdfd7f8c9b19f2b25520968adfad23eb0ce60c \ - --hash=sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175 \ - --hash=sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219 \ - --hash=sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb \ - --hash=sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6 \ - --hash=sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab \ - --hash=sha256:15d939a21d546304880945ca1ecb8a039db6b4dc49b2c5a400387cdae6a62e26 \ - --hash=sha256:177b5253b2834fe3678cb4a5f0059808258584c559193998be2601324fdeafb1 \ - --hash=sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce \ - --hash=sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218 \ - --hash=sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634 \ - --hash=sha256:1ba88449deb3de88bd40044603fafffb7bc2b055d626a330323a9ed736661695 \ - --hash=sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad \ - --hash=sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73 \ - --hash=sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c \ - --hash=sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe \ - --hash=sha256:2a15a08b17dd94c53a1da0438822d70ebcd13f8c3a95abe3a9ef9f11a94830aa \ - --hash=sha256:2f981d352f04553a7171b8e44369f2af4055f888dfb147d55e42d29e29e74559 \ - --hash=sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa \ - --hash=sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37 \ - --hash=sha256:3537e01efc9d4dccdf77221fb1cb3b8e1a38d5428920e0657ce299b20324d758 \ - --hash=sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f \ - --hash=sha256:38664109c14ffc9e7437e86b4dceb442b0096dfe3541d7864d9cbe1da4cf36c8 \ - --hash=sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d \ - --hash=sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c \ - --hash=sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97 \ - --hash=sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a \ - --hash=sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19 \ - --hash=sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9 \ - --hash=sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9 \ - --hash=sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc \ - --hash=sha256:591ae9f2a647529ca990bc681daebdd52c8791ff06c2bfa05b65163e28102ef2 \ - --hash=sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4 \ - --hash=sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354 \ - --hash=sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50 \ - --hash=sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698 \ - --hash=sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9 \ - --hash=sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b \ - --hash=sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc \ - --hash=sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115 \ - --hash=sha256:7c3fb7d25180895632e5d3148dbdc29ea38ccb7fd210aa27acbd1201a1902c6e \ - --hash=sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485 \ - --hash=sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f \ - --hash=sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12 \ - --hash=sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025 \ - --hash=sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009 \ - --hash=sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d \ - --hash=sha256:949b8d66bc381ee8b007cd945914c721d9aba8e27f71959d750a46f7c282b20b \ - --hash=sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a \ - --hash=sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5 \ - --hash=sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f \ - --hash=sha256:a320721ab5a1aba0a233739394eb907f8c8da5c98c9181d1161e77a0c8e36f2d \ - --hash=sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1 \ - --hash=sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287 \ - --hash=sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6 \ - --hash=sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f \ - --hash=sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581 \ - --hash=sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed \ - --hash=sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b \ - --hash=sha256:c0c0b3ade1c0b13b936d7970b1d37a57acde9199dc2aecc4c336773e1d86049c \ - --hash=sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026 \ - --hash=sha256:c4ffb7ebf07cfe8931028e3e4c85f0357459a3f9f9490886198848f4fa002ec8 \ - --hash=sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676 \ - --hash=sha256:d2ee202e79d8ed691ceebae8e0486bd9a2cd4794cec4824e1c99b6f5009502f6 \ - --hash=sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e \ - --hash=sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d \ - --hash=sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d \ - --hash=sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01 \ - --hash=sha256:df2449253ef108a379b8b5d6b43f4b1a8e81a061d6537becd5582fba5f9196d7 \ - --hash=sha256:e1c1493fb6e50ab01d20a22826e57520f1284df32f2d8601fdd90b6304601419 \ - --hash=sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795 \ - --hash=sha256:e2103a929dfa2fcaf9bb4e7c091983a49c9ac3b19c9061b6d5427dd7d14d81a1 \ - --hash=sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5 \ - --hash=sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d \ - --hash=sha256:e8fc20152abba6b83724d7ff268c249fa196d8259ff481f3b1476383f8f24e42 \ - --hash=sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe \ - --hash=sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda \ - --hash=sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e \ - --hash=sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737 \ - --hash=sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523 \ - --hash=sha256:f42d0984e947b8adf7dd6dde396e720934d12c506ce84eea8476409563607591 \ - --hash=sha256:f71a396b3bf33ecaa1626c255855702aca4d3d9fea5e051b41ac59a9c1c41edc \ - --hash=sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a \ - --hash=sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50 - # via werkzeug -mdurl==0.1.2 \ - --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \ - --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba - # via markdown-it-py -ml-dtypes==0.5.4 \ - --hash=sha256:0d2ffd05a2575b1519dc928c0b93c06339eb67173ff53acb00724502cda231cf \ - --hash=sha256:11942cbf2cf92157db91e5022633c0d9474d4dfd813a909383bd23ce828a4b7d \ - --hash=sha256:14a4fd3228af936461db66faccef6e4f41c1d82fcc30e9f8d58a08916b1d811f \ - --hash=sha256:19b9a53598f21e453ea2fbda8aa783c20faff8e1eeb0d7ab899309a0053f1483 \ - --hash=sha256:2314892cdc3fcf05e373d76d72aaa15fda9fb98625effa73c1d646f331fcecb7 \ - --hash=sha256:2b857d3af6ac0d39db1de7c706e69c7f9791627209c3d6dedbfca8c7e5faec22 \ - --hash=sha256:304ad47faa395415b9ccbcc06a0350800bc50eda70f0e45326796e27c62f18b6 \ - --hash=sha256:35f29491a3e478407f7047b8a4834e4640a77d2737e0b294d049746507af5175 \ - --hash=sha256:388d399a2152dd79a3f0456a952284a99ee5c93d3e2f8dfe25977511e0515270 \ - --hash=sha256:3bbbe120b915090d9dd1375e4684dd17a20a2491ef25d640a908281da85e73f1 \ - --hash=sha256:3d277bf3637f2a62176f4575512e9ff9ef51d00e39626d9fe4a161992f355af2 \ - --hash=sha256:4381fe2f2452a2d7589689693d3162e876b3ddb0a832cde7a414f8e1adf7eab1 \ - --hash=sha256:4ff7f3e7ca2972e7de850e7b8fcbb355304271e2933dd90814c1cb847414d6e2 \ - --hash=sha256:531eff30e4d368cb6255bc2328d070e35836aa4f282a0fb5f3a0cd7260257298 \ - --hash=sha256:533ce891ba774eabf607172254f2e7260ba5f57bdd64030c9a4fcfbd99815d0d \ - --hash=sha256:557a31a390b7e9439056644cb80ed0735a6e3e3bb09d67fd5687e4b04238d1de \ - --hash=sha256:5a0f68ca8fd8d16583dfa7793973feb86f2fbb56ce3966daf9c9f748f52a2049 \ - --hash=sha256:6a0df4223b514d799b8a1629c65ddc351b3efa833ccf7f8ea0cf654a61d1e35d \ - --hash=sha256:6c7ecb74c4bd71db68a6bea1edf8da8c34f3d9fe218f038814fd1d310ac76c90 \ - --hash=sha256:7c23c54a00ae43edf48d44066a7ec31e05fdc2eee0be2b8b50dd1903a1db94bb \ - --hash=sha256:805cef3a38f4eafae3a5bf9ebdcdb741d0bcfd9e1bd90eb54abd24f928cd2465 \ - --hash=sha256:88c982aac7cb1cbe8cbb4e7f253072b1df872701fcaf48d84ffbb433b6568f24 \ - --hash=sha256:8ab06a50fb9bf9666dd0fe5dfb4676fa2b0ac0f31ecff72a6c3af8e22c063453 \ - --hash=sha256:8c6a2dcebd6f3903e05d51960a8058d6e131fe69f952a5397e5dbabc841b6d56 \ - --hash=sha256:8c760d85a2f82e2bed75867079188c9d18dae2ee77c25a54d60e9cc79be1bc48 \ - --hash=sha256:9ad459e99793fa6e13bd5b7e6792c8f9190b4e5a1b45c63aba14a4d0a7f1d5ff \ - --hash=sha256:9bad06436568442575beb2d03389aa7456c690a5b05892c471215bfd8cf39460 \ - --hash=sha256:a174837a64f5b16cab6f368171a1a03a27936b31699d167684073ff1c4237dac \ - --hash=sha256:a7f7c643e8b1320fd958bf098aa7ecf70623a42ec5154e3be3be673f4c34d900 \ - --hash=sha256:a9b61c19040397970d18d7737375cffd83b1f36a11dd4ad19f83a016f736c3ef \ - --hash=sha256:b4b801ebe0b477be666696bda493a9be8356f1f0057a57f1e35cd26928823e5a \ - --hash=sha256:b95e97e470fe60ed493fd9ae3911d8da4ebac16bd21f87ffa2b7c588bf22ea2c \ - --hash=sha256:bc11d7e8c44a65115d05e2ab9989d1e045125d7be8e05a071a48bc76eb6d6040 \ - --hash=sha256:bfc534409c5d4b0bf945af29e5d0ab075eae9eecbb549ff8a29280db822f34f9 \ - --hash=sha256:c1a953995cccb9e25a4ae19e34316671e4e2edaebe4cf538229b1fc7109087b7 \ - --hash=sha256:cb73dccfc991691c444acc8c0012bee8f2470da826a92e3a20bb333b1a7894e6 \ - --hash=sha256:ce756d3a10d0c4067172804c9cc276ba9cc0ff47af9078ad439b075d1abdc29b \ - --hash=sha256:d81fdb088defa30eb37bf390bb7dde35d3a83ec112ac8e33d75ab28cc29dd8b0 \ - --hash=sha256:f21c9219ef48ca5ee78402d5cc831bd58ea27ce89beda894428bc67a52da5328 - # via - # keras - # tensorflow -namex==0.1.0 \ - --hash=sha256:117f03ccd302cc48e3f5c58a296838f6b89c83455ab8683a1e85f2a430aa4306 \ - --hash=sha256:e2012a474502f1e2251267062aae3114611f07df4224b6e06334c57b0f2ce87c - # via keras -numpy==2.0.2 ; python_version == "3.9" \ - --hash=sha256:0123ffdaa88fa4ab64835dcbde75dcdf89c453c922f18dced6e27c90d1d0ec5a \ - --hash=sha256:11a76c372d1d37437857280aa142086476136a8c0f373b2e648ab2c8f18fb195 \ - --hash=sha256:13e689d772146140a252c3a28501da66dfecd77490b498b168b501835041f951 \ - --hash=sha256:1e795a8be3ddbac43274f18588329c72939870a16cae810c2b73461c40718ab1 \ - --hash=sha256:26df23238872200f63518dd2aa984cfca675d82469535dc7162dc2ee52d9dd5c \ - --hash=sha256:286cd40ce2b7d652a6f22efdfc6d1edf879440e53e76a75955bc0c826c7e64dc \ - --hash=sha256:2b2955fa6f11907cf7a70dab0d0755159bca87755e831e47932367fc8f2f2d0b \ - --hash=sha256:2da5960c3cf0df7eafefd806d4e612c5e19358de82cb3c343631188991566ccd \ - --hash=sha256:312950fdd060354350ed123c0e25a71327d3711584beaef30cdaa93320c392d4 \ - --hash=sha256:423e89b23490805d2a5a96fe40ec507407b8ee786d66f7328be214f9679df6dd \ - --hash=sha256:496f71341824ed9f3d2fd36cf3ac57ae2e0165c143b55c3a035ee219413f3318 \ - --hash=sha256:49ca4decb342d66018b01932139c0961a8f9ddc7589611158cb3c27cbcf76448 \ - --hash=sha256:51129a29dbe56f9ca83438b706e2e69a39892b5eda6cedcb6b0c9fdc9b0d3ece \ - --hash=sha256:5fec9451a7789926bcf7c2b8d187292c9f93ea30284802a0ab3f5be8ab36865d \ - --hash=sha256:671bec6496f83202ed2d3c8fdc486a8fc86942f2e69ff0e986140339a63bcbe5 \ - --hash=sha256:7f0a0c6f12e07fa94133c8a67404322845220c06a9e80e85999afe727f7438b8 \ - --hash=sha256:807ec44583fd708a21d4a11d94aedf2f4f3c3719035c76a2bbe1fe8e217bdc57 \ - --hash=sha256:883c987dee1880e2a864ab0dc9892292582510604156762362d9326444636e78 \ - --hash=sha256:8c5713284ce4e282544c68d1c3b2c7161d38c256d2eefc93c1d683cf47683e66 \ - --hash=sha256:8cafab480740e22f8d833acefed5cc87ce276f4ece12fdaa2e8903db2f82897a \ - --hash=sha256:8df823f570d9adf0978347d1f926b2a867d5608f434a7cff7f7908c6570dcf5e \ - --hash=sha256:9059e10581ce4093f735ed23f3b9d283b9d517ff46009ddd485f1747eb22653c \ - --hash=sha256:905d16e0c60200656500c95b6b8dca5d109e23cb24abc701d41c02d74c6b3afa \ - --hash=sha256:9189427407d88ff25ecf8f12469d4d39d35bee1db5d39fc5c168c6f088a6956d \ - --hash=sha256:96a55f64139912d61de9137f11bf39a55ec8faec288c75a54f93dfd39f7eb40c \ - --hash=sha256:97032a27bd9d8988b9a97a8c4d2c9f2c15a81f61e2f21404d7e8ef00cb5be729 \ - --hash=sha256:984d96121c9f9616cd33fbd0618b7f08e0cfc9600a7ee1d6fd9b239186d19d97 \ - --hash=sha256:9a92ae5c14811e390f3767053ff54eaee3bf84576d99a2456391401323f4ec2c \ - --hash=sha256:9ea91dfb7c3d1c56a0e55657c0afb38cf1eeae4544c208dc465c3c9f3a7c09f9 \ - --hash=sha256:a15f476a45e6e5a3a79d8a14e62161d27ad897381fecfa4a09ed5322f2085669 \ - --hash=sha256:a392a68bd329eafac5817e5aefeb39038c48b671afd242710b451e76090e81f4 \ - --hash=sha256:a3f4ab0caa7f053f6797fcd4e1e25caee367db3112ef2b6ef82d749530768c73 \ - --hash=sha256:a46288ec55ebbd58947d31d72be2c63cbf839f0a63b49cb755022310792a3385 \ - --hash=sha256:a61ec659f68ae254e4d237816e33171497e978140353c0c2038d46e63282d0c8 \ - --hash=sha256:a842d573724391493a97a62ebbb8e731f8a5dcc5d285dfc99141ca15a3302d0c \ - --hash=sha256:becfae3ddd30736fe1889a37f1f580e245ba79a5855bff5f2a29cb3ccc22dd7b \ - --hash=sha256:c05e238064fc0610c840d1cf6a13bf63d7e391717d247f1bf0318172e759e692 \ - --hash=sha256:c1c9307701fec8f3f7a1e6711f9089c06e6284b3afbbcd259f7791282d660a15 \ - --hash=sha256:c7b0be4ef08607dd04da4092faee0b86607f111d5ae68036f16cc787e250a131 \ - --hash=sha256:cfd41e13fdc257aa5778496b8caa5e856dc4896d4ccf01841daee1d96465467a \ - --hash=sha256:d731a1c6116ba289c1e9ee714b08a8ff882944d4ad631fd411106a30f083c326 \ - --hash=sha256:df55d490dea7934f330006d0f81e8551ba6010a5bf035a249ef61a94f21c500b \ - --hash=sha256:ec9852fb39354b5a45a80bdab5ac02dd02b15f44b3804e9f00c556bf24b4bded \ - --hash=sha256:f15975dfec0cf2239224d80e32c3170b1d168335eaedee69da84fbe9f1f9cd04 \ - --hash=sha256:f26b258c385842546006213344c50655ff1555a9338e2e5e02a0756dc3e803dd - # via - # -r @release_or_nightly/requirements.in - # etils - # h5py - # keras - # ml-dtypes - # tensorboard - # tensorflow - # tensorflow-datasets -opt-einsum==3.4.0 \ - --hash=sha256:69bb92469f86a1565195ece4ac0323943e83477171b91d24c35afe028a90d7cd \ - --hash=sha256:96ca72f1b886d148241348783498194c577fa30a8faac108586b14f1ba4473ac - # via tensorflow -optree==0.18.0 \ - --hash=sha256:01b79aaee544adf5bfa573db32b943030dfeb9fd1c6e7a97aa417db56a8127e7 \ - --hash=sha256:02d9999840fabef85a6b22e757f336d5591f712f99c710d8b232d52e53115314 \ - --hash=sha256:056894ce6242cd1c7fed71325a7d9f633b2d3b4420c52af48f6a0c4560d74ca1 \ - --hash=sha256:057b983a9526645133553184bed7090bb07855df986abd9e99c456922045c6bc \ - --hash=sha256:07c5f64783ad0f0f80e61c25f276ce79b47deda83ed7956a4a9af6385fe8f60d \ - --hash=sha256:090a3f0ccafa0fe99d71e7d974ae52ff966ac26c409ec41f96556b96646054ef \ - --hash=sha256:0959bac58631e64e2ac6349cc284b37872c24f353b3d73b4682202a431f07d76 \ - --hash=sha256:0d25941de1acba176305dbdeb931dea6143b30d64ebdc5bfea2bfc12ef9e2b0a \ - --hash=sha256:0e0dbe995241efe70cfb522e89c1a7c968216926725a0e5e20cc72bd5d0311b1 \ - --hash=sha256:10f29662d637b80363dc620da46ddc58def7acf7935e20595b23e216ea912367 \ - --hash=sha256:1545c68299c0ce600e4ea1bc9112765dc4afe9a0b8ab43f955df6566bf78db42 \ - --hash=sha256:1b75e083137f361377ff8d70df885ab3a1cf8980e4019e3f311237579adadb64 \ - --hash=sha256:1db0a6497203a13063a8f044ae751dd5d8253cb815359270c38de0e4c9f8bed5 \ - --hash=sha256:1f19867b02a547fc9f11d27c0413e7483cef89699e16f3b9e8af73a9b25e6061 \ - --hash=sha256:1f674e34202383f8b42fa9335f13bedfb6b6f019c66e1f41034929e4be203423 \ - --hash=sha256:20536964ba2458f166c1e8ab25951e3fc0a5056b651bd08f16be99bb3ffed54a \ - --hash=sha256:27611c6c122745a003b5be7aedba49ef86e9fef46d743c234596de0bde6dc679 \ - --hash=sha256:27b1d0cadcf4627c98abbbdce912dbc2243f5687f3c7df39963b793c89321c65 \ - --hash=sha256:289b184cc41dfc400a30db6207ec997884d14540aae2cba10cb88dc7ebaae2a1 \ - --hash=sha256:2b5cfb5fc643f16d3a7d957807e55a937dce07566c49ccc4aa71b01064c56758 \ - --hash=sha256:3014537ff7e4e091ee46e57976f7d95c52f66a0e3eb5ebcbe0de0d924504b58e \ - --hash=sha256:30a2636279bdc805c8e154a0f346bcf704626b831ff44724d305fb72c90b7389 \ - --hash=sha256:30f95279188f6b9300e17c1557989baa991c2d6f519013bd8fea13462a0e6a45 \ - --hash=sha256:30fefc84975ac41d9075993196c64ce0c240510f0539cff121d63b709e03846f \ - --hash=sha256:31539dec60af84e16e99574634811d38e34e1fb381f40d6f489a2e582bf41f03 \ - --hash=sha256:328857d7a35129904b21164f6b0c2ff1d728ad1f5838589c5f437a16c94213c8 \ - --hash=sha256:3804fb6ddc923855db2dc4805b4524c66e00f1ef30b166be4aadd52822b13e06 \ - --hash=sha256:382e5ca02cbd5b20d713d4da189a8613f828832e2af57ccbe04a9c6b0bd9497e \ - --hash=sha256:385bd727cc7bd3c01bd6204028ac2adce8a8f622c296053d9df434aa0e30b01f \ - --hash=sha256:421b839c7ff30df5791e66c89b2e9c2f68191dd6a5d6927c32bcc6b887090df8 \ - --hash=sha256:446c46c53cb8f13abcc0d7dd1989d59bb059953c122fe9901ef53de7fb38b33e \ - --hash=sha256:4cc92339899acb685ee718fd22b25069dfa7be038c63274c54481d54ccc2f9e2 \ - --hash=sha256:4eb146711d4cd0876bf93e0118d3e74050b6f633d756c269ce7cda907281b499 \ - --hash=sha256:51e2cd9ac7fecfd5f6f56ce69f4f805553c226a2744810175959eb408101513c \ - --hash=sha256:55a2ccd121fccc9df961e982db2f4e8f2b4f7015e814ef70b1140514cdffe214 \ - --hash=sha256:56bb19ff827c9a443202b52bf103705ce96ef14d045e0a30d0d7ee7dbcef6a0d \ - --hash=sha256:571b732229d7b2e7a2215f57586f8ec0140e07c0faea916e456cbbfa819e56cb \ - --hash=sha256:5b126c34b459ef4f10f3a4d7d222416d9102b3c5a76b39f346c611792f144821 \ - --hash=sha256:5b75e32c191e4b8cf42a8aa854ed264df82936136c0bcad77be44605da41cdfc \ - --hash=sha256:5bc1221068a58175e0ad62afc199893f77c653206673a5552992a604c66fb77e \ - --hash=sha256:5e669f98b9af9f66144c7ae09912d0367ac3182abe016f67cdd15cb45e13c923 \ - --hash=sha256:66f142c743732cd4e630ea84415f654a00c792793c7f80d4511167f0f89796a6 \ - --hash=sha256:6fc9f8acde3bb561b2034e96079507fbe6d4624058fe204161eb8ef29f961296 \ - --hash=sha256:7172b16e87c87160475275e4bfaa6e4067ccde184d2cca65ba25a402a8ed7758 \ - --hash=sha256:71ca2fcad8972ba56d6cfffbcd962f45f5d4bc04182f23d66154b38c2eb37de3 \ - --hash=sha256:72fa79be4d6515682417f103ae759a22345439eb1319886be936029215ee00dc \ - --hash=sha256:7699957183f8d45402edd6266e175510317f5fcd7f0e623510f2eb7e1ebfc667 \ - --hash=sha256:79bbe14d6cad81f5840958589daa1b836864ada40031712a446dce8129917efd \ - --hash=sha256:7ae6945f68771b1389ee46a1778e779f4ad76bca9306f3e39eb397f9a0dd2753 \ - --hash=sha256:80d971060c888c3989132b7e75dfb50848636d41bc931af1b93fe2019fba469c \ - --hash=sha256:80f28e4666aad66e5e20bdc2c47b5bf320250bb5407b3a39dfb1772787a7068f \ - --hash=sha256:81e755124b77e766166c9d05206b90c68f234f425ad2e3c8a6c96f0db548c67b \ - --hash=sha256:86f5bf05ad236f666e5395e989d6ac2cbfd02556526703e6c6f0a594c7fa081f \ - --hash=sha256:895f23a4cd8aee2c2464efdad2d9bde28a2aaabee634c96423a933f40e74a67e \ - --hash=sha256:89d5156f8a0a3792701e1c31473eb307f0b45696f48dc51d721f1bfe0c3a950f \ - --hash=sha256:89e81afb11792d13d3777b503c6f21ec17b1a3b7de69cde1ae2c5471bcdcd4a0 \ - --hash=sha256:8a2003fab79694e04b5f260628511e441c248b46a9fc46138e2424038ac04ada \ - --hash=sha256:8a4ca121b6fc6b04300fa225fe6c31897e424db0d92691875af326f8c4e1cead \ - --hash=sha256:8a901666afc2d7a8d0c20decc8079763e3313457ee67210382162d90163c0007 \ - --hash=sha256:8b9ad4a01a1346b11acc574b7f932dea1a7c7ab31d93546a7540a1f02b3e724a \ - --hash=sha256:8d88c00c70b5914904feaf8f505f3512c2f3f4493dbbd93951fcdddc85dcfe8c \ - --hash=sha256:9104fc8915890e7292e5833fc677e4749607c67aa3cf8884677267078201c2f3 \ - --hash=sha256:9460cba62e941626beb75c99a803373b38a52136d5f1932fcdfdcede1df6f2ef \ - --hash=sha256:94983b3aa31ee401d2ac77ba570a3157d83f9508cfbb006095a48770e0a1c5ca \ - --hash=sha256:9b1e7e8f9ddc85f05d542b74157bdb73ed0e49aded67d1775f721fcd6eb9be94 \ - --hash=sha256:9d4b9d8c7e9335120ecf222d817699d17de743ad118080fb40467c367f009143 \ - --hash=sha256:a479fa25b6e2430e530d00f0c27a55e15ecb9de8ad2d0aec3d40b680e2d6df64 \ - --hash=sha256:a5c213a291c798139ed9ff80aec4bfcd2ac8f001bc015a9cdeb78457e9687dd3 \ - --hash=sha256:a63df296fec376c5cd08298a85109db4a130f4cc8df15916fc92d44ef6068937 \ - --hash=sha256:a74c45f04def041504bd21682eaf7f359f1a50dc7cf42b548b6f19aab50596bd \ - --hash=sha256:ad428ccdb2a40804919880dfe8d2a3021fd4418be15ea7ecb8434ab249badf9f \ - --hash=sha256:b0986ff1267a3b44d3ed76c3efb8b7239371444143f6e0d79f9dd23dbe02c7f9 \ - --hash=sha256:b45d7172c67fc8d2b69f77b384998b39793ee91f8b3b46c609297b781fb7eea5 \ - --hash=sha256:b4da3223c5b4cf694822752d0fbb6bf34c3f41648af1bd1b443cc3d68cc55106 \ - --hash=sha256:b7aa0de08bbbfcef6e49c107f9f397f5d4742548500f16e3e6c5e0b9e4ff0faa \ - --hash=sha256:b8adc912ecb6e4fd9df227ded66efaa6702f46a98e1403554be3c9c51d0ca920 \ - --hash=sha256:ba23caafd0e0c911bb7eab54e5cf69644af864d153e4b2abdab83ff0ef357ba1 \ - --hash=sha256:bda4572392ac1dff3fc67b6d9a4b1084e1637972e8135ad3788b4ce7cf0a90f5 \ - --hash=sha256:c017539e1196ea08f20aea3a4c473f758149b851678edd3d15773b4326decf83 \ - --hash=sha256:c1f20e8754abe312a701ee00d071ddd8502e9d97ca38fbc56204d14a9ffcb41c \ - --hash=sha256:c8841d44f3648b0662e99fc39ef8c248726ddfb4d1bfce4bdba982e51bb7e3f8 \ - --hash=sha256:cbb083a15ea968ad99e7da17d24632348d69e26534e83c69941f3020ed7536eb \ - --hash=sha256:cde70c97e4cc4e997e8fda2266e40a9bff7679c72ab4af6e15e81748a12882cc \ - --hash=sha256:cfa2e16993ba47e671a4e7ee1ad805f67b8d6744eb30a9d27ea0b07b3b7a22ed \ - --hash=sha256:d20765efa494a80a8fd91c4de8890f34de8e9f234da5516e8f34f55703cfb93d \ - --hash=sha256:d2844478690b5892159df0b2500e9d146dc8d3aa5b44e4564d05787b7330eca3 \ - --hash=sha256:d569730b2647c51a5ee68d67198aa9a78c7a55563d57b8cc1ca8d8c8377e7621 \ - --hash=sha256:daab231cf768937ce4675376ea3e214d399116d9867a6737372c31c58630bdfc \ - --hash=sha256:db00c604c1ae452f6092293bf230984d4f6cbb3ad905a9991e8cf680fd7d1523 \ - --hash=sha256:e058cc51d9d57b45801060af9f74765b95bedfc59fd6df1c7489ae0825126be5 \ - --hash=sha256:e28024e6e343353285cf99ae9c74210f0e89e47b2f0f3af7c72c4a9e89dc3ebc \ - --hash=sha256:e4a468ae1541614b5aa7b4f00254bce005ab7572fbb1fc764af4ee17d90fde7b \ - --hash=sha256:ea357657143f364a764b63b2b1ce12d77156d48a1f32def990b696d755acb629 \ - --hash=sha256:efd162e3bfc7812d75ebf2d0fb2783daee2407a92155af8a90650a6b0fa9342e \ - --hash=sha256:f02faeda66d531dc5f5356589afcf2a6bc41c8d00bc903efab60f9a2182b140d \ - --hash=sha256:f04286908654ffb05455254ebf72fe69473fc4560fc7ea49410df94dea6783a2 \ - --hash=sha256:f5197f864630162f008f5dfad3fceef32553c0fa7639eee1b8e280d924ed678e \ - --hash=sha256:f81f5340c8df50662abaf753ab07095901e40b934efb27da50032a4ae71c5a97 \ - --hash=sha256:fa8e3878a1857761d64f08a23b32140d29754a53f85f7c87186ced2b5b1b49cb \ - --hash=sha256:ff7326f36ed70d84c3fd62fb39bc6858f699640b8ab238c3cb8dafe1e200af59 - # via keras -packaging==25.0 \ - --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 \ - --hash=sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f - # via - # keras - # tensorboard - # tensorflow -pillow==11.0.0 \ - --hash=sha256:00177a63030d612148e659b55ba99527803288cea7c75fb05766ab7981a8c1b7 \ - --hash=sha256:006bcdd307cc47ba43e924099a038cbf9591062e6c50e570819743f5607404f5 \ - --hash=sha256:084a07ef0821cfe4858fe86652fffac8e187b6ae677e9906e192aafcc1b69903 \ - --hash=sha256:0ae08bd8ffc41aebf578c2af2f9d8749d91f448b3bfd41d7d9ff573d74f2a6b2 \ - --hash=sha256:0e038b0745997c7dcaae350d35859c9715c71e92ffb7e0f4a8e8a16732150f38 \ - --hash=sha256:1187739620f2b365de756ce086fdb3604573337cc28a0d3ac4a01ab6b2d2a6d2 \ - --hash=sha256:16095692a253047fe3ec028e951fa4221a1f3ed3d80c397e83541a3037ff67c9 \ - --hash=sha256:1a61b54f87ab5786b8479f81c4b11f4d61702830354520837f8cc791ebba0f5f \ - --hash=sha256:1c1d72714f429a521d8d2d018badc42414c3077eb187a59579f28e4270b4b0fc \ - --hash=sha256:1e2688958a840c822279fda0086fec1fdab2f95bf2b717b66871c4ad9859d7e8 \ - --hash=sha256:20ec184af98a121fb2da42642dea8a29ec80fc3efbaefb86d8fdd2606619045d \ - --hash=sha256:21a0d3b115009ebb8ac3d2ebec5c2982cc693da935f4ab7bb5c8ebe2f47d36f2 \ - --hash=sha256:224aaa38177597bb179f3ec87eeefcce8e4f85e608025e9cfac60de237ba6316 \ - --hash=sha256:2679d2258b7f1192b378e2893a8a0a0ca472234d4c2c0e6bdd3380e8dfa21b6a \ - --hash=sha256:27a7860107500d813fcd203b4ea19b04babe79448268403172782754870dac25 \ - --hash=sha256:290f2cc809f9da7d6d622550bbf4c1e57518212da51b6a30fe8e0a270a5b78bd \ - --hash=sha256:2e46773dc9f35a1dd28bd6981332fd7f27bec001a918a72a79b4133cf5291dba \ - --hash=sha256:3107c66e43bda25359d5ef446f59c497de2b5ed4c7fdba0894f8d6cf3822dafc \ - --hash=sha256:375b8dd15a1f5d2feafff536d47e22f69625c1aa92f12b339ec0b2ca40263273 \ - --hash=sha256:45c566eb10b8967d71bf1ab8e4a525e5a93519e29ea071459ce517f6b903d7fa \ - --hash=sha256:499c3a1b0d6fc8213519e193796eb1a86a1be4b1877d678b30f83fd979811d1a \ - --hash=sha256:4ad70c4214f67d7466bea6a08061eba35c01b1b89eaa098040a35272a8efb22b \ - --hash=sha256:4b60c9520f7207aaf2e1d94de026682fc227806c6e1f55bba7606d1c94dd623a \ - --hash=sha256:5178952973e588b3f1360868847334e9e3bf49d19e169bbbdfaf8398002419ae \ - --hash=sha256:52a2d8323a465f84faaba5236567d212c3668f2ab53e1c74c15583cf507a0291 \ - --hash=sha256:598b4e238f13276e0008299bd2482003f48158e2b11826862b1eb2ad7c768b97 \ - --hash=sha256:5bd2d3bdb846d757055910f0a59792d33b555800813c3b39ada1829c372ccb06 \ - --hash=sha256:5c39ed17edea3bc69c743a8dd3e9853b7509625c2462532e62baa0732163a904 \ - --hash=sha256:5d203af30149ae339ad1b4f710d9844ed8796e97fda23ffbc4cc472968a47d0b \ - --hash=sha256:5ddbfd761ee00c12ee1be86c9c0683ecf5bb14c9772ddbd782085779a63dd55b \ - --hash=sha256:607bbe123c74e272e381a8d1957083a9463401f7bd01287f50521ecb05a313f8 \ - --hash=sha256:61b887f9ddba63ddf62fd02a3ba7add935d053b6dd7d58998c630e6dbade8527 \ - --hash=sha256:6619654954dc4936fcff82db8eb6401d3159ec6be81e33c6000dfd76ae189947 \ - --hash=sha256:674629ff60030d144b7bca2b8330225a9b11c482ed408813924619c6f302fdbb \ - --hash=sha256:6ec0d5af64f2e3d64a165f490d96368bb5dea8b8f9ad04487f9ab60dc4bb6003 \ - --hash=sha256:6f4dba50cfa56f910241eb7f883c20f1e7b1d8f7d91c750cd0b318bad443f4d5 \ - --hash=sha256:70fbbdacd1d271b77b7721fe3cdd2d537bbbd75d29e6300c672ec6bb38d9672f \ - --hash=sha256:72bacbaf24ac003fea9bff9837d1eedb6088758d41e100c1552930151f677739 \ - --hash=sha256:7326a1787e3c7b0429659e0a944725e1b03eeaa10edd945a86dead1913383944 \ - --hash=sha256:73853108f56df97baf2bb8b522f3578221e56f646ba345a372c78326710d3830 \ - --hash=sha256:73e3a0200cdda995c7e43dd47436c1548f87a30bb27fb871f352a22ab8dcf45f \ - --hash=sha256:75acbbeb05b86bc53cbe7b7e6fe00fbcf82ad7c684b3ad82e3d711da9ba287d3 \ - --hash=sha256:8069c5179902dcdce0be9bfc8235347fdbac249d23bd90514b7a47a72d9fecf4 \ - --hash=sha256:846e193e103b41e984ac921b335df59195356ce3f71dcfd155aa79c603873b84 \ - --hash=sha256:8594f42df584e5b4bb9281799698403f7af489fba84c34d53d1c4bfb71b7c4e7 \ - --hash=sha256:86510e3f5eca0ab87429dd77fafc04693195eec7fd6a137c389c3eeb4cfb77c6 \ - --hash=sha256:8853a3bf12afddfdf15f57c4b02d7ded92c7a75a5d7331d19f4f9572a89c17e6 \ - --hash=sha256:88a58d8ac0cc0e7f3a014509f0455248a76629ca9b604eca7dc5927cc593c5e9 \ - --hash=sha256:8ba470552b48e5835f1d23ecb936bb7f71d206f9dfeee64245f30c3270b994de \ - --hash=sha256:8c676b587da5673d3c75bd67dd2a8cdfeb282ca38a30f37950511766b26858c4 \ - --hash=sha256:8ec4a89295cd6cd4d1058a5e6aec6bf51e0eaaf9714774e1bfac7cfc9051db47 \ - --hash=sha256:94f3e1780abb45062287b4614a5bc0874519c86a777d4a7ad34978e86428b8dd \ - --hash=sha256:9a0f748eaa434a41fccf8e1ee7a3eed68af1b690e75328fd7a60af123c193b50 \ - --hash=sha256:a5629742881bcbc1f42e840af185fd4d83a5edeb96475a575f4da50d6ede337c \ - --hash=sha256:a65149d8ada1055029fcb665452b2814fe7d7082fcb0c5bed6db851cb69b2086 \ - --hash=sha256:b3c5ac4bed7519088103d9450a1107f76308ecf91d6dabc8a33a2fcfb18d0fba \ - --hash=sha256:b4fd7bd29610a83a8c9b564d457cf5bd92b4e11e79a4ee4716a63c959699b306 \ - --hash=sha256:bcd1fb5bb7b07f64c15618c89efcc2cfa3e95f0e3bcdbaf4642509de1942a699 \ - --hash=sha256:c12b5ae868897c7338519c03049a806af85b9b8c237b7d675b8c5e089e4a618e \ - --hash=sha256:c26845094b1af3c91852745ae78e3ea47abf3dbcd1cf962f16b9a5fbe3ee8488 \ - --hash=sha256:c6a660307ca9d4867caa8d9ca2c2658ab685de83792d1876274991adec7b93fa \ - --hash=sha256:c809a70e43c7977c4a42aefd62f0131823ebf7dd73556fa5d5950f5b354087e2 \ - --hash=sha256:c8b2351c85d855293a299038e1f89db92a2f35e8d2f783489c6f0b2b5f3fe8a3 \ - --hash=sha256:cb929ca942d0ec4fac404cbf520ee6cac37bf35be479b970c4ffadf2b6a1cad9 \ - --hash=sha256:d2c0a187a92a1cb5ef2c8ed5412dd8d4334272617f532d4ad4de31e0495bd923 \ - --hash=sha256:d69bfd8ec3219ae71bcde1f942b728903cad25fafe3100ba2258b973bd2bc1b2 \ - --hash=sha256:daffdf51ee5db69a82dd127eabecce20729e21f7a3680cf7cbb23f0829189790 \ - --hash=sha256:e58876c91f97b0952eb766123bfef372792ab3f4e3e1f1a2267834c2ab131734 \ - --hash=sha256:eda2616eb2313cbb3eebbe51f19362eb434b18e3bb599466a1ffa76a033fb916 \ - --hash=sha256:ee217c198f2e41f184f3869f3e485557296d505b5195c513b2bfe0062dc537f1 \ - --hash=sha256:f02541ef64077f22bf4924f225c0fd1248c168f86e4b7abdedd87d6ebaceab0f \ - --hash=sha256:f1b82c27e89fffc6da125d5eb0ca6e68017faf5efc078128cfaa42cf5cb38798 \ - --hash=sha256:fba162b8872d30fea8c52b258a542c5dfd7b235fb5cb352240c8d63b414013eb \ - --hash=sha256:fbbcb7b57dc9c794843e3d1258c0fbf0f48656d46ffe9e09b63bbd6e8cd5d0a2 \ - --hash=sha256:fcb4621042ac4b7865c179bb972ed0da0218a076dc1820ffc48b1d74c1e37fe9 - # via tensorboard -promise==2.3 \ - --hash=sha256:dfd18337c523ba4b6a58801c164c1904a9d4d1b1747c7d5dbf45b693a49d93d0 - # via tensorflow-datasets -protobuf==6.32.0 \ - --hash=sha256:15eba1b86f193a407607112ceb9ea0ba9569aed24f93333fe9a497cf2fda37d3 \ - --hash=sha256:501fe6372fd1c8ea2a30b4d9be8f87955a64d6be9c88a973996cef5ef6f0abf1 \ - --hash=sha256:75a2aab2bd1aeb1f5dc7c5f33bcb11d82ea8c055c9becbb41c26a8c43fd7092c \ - --hash=sha256:7db8ed09024f115ac877a1427557b838705359f047b2ff2f2b2364892d19dacb \ - --hash=sha256:84f9e3c1ff6fb0308dbacb0950d8aa90694b0d0ee68e75719cb044b7078fe741 \ - --hash=sha256:a81439049127067fc49ec1d36e25c6ee1d1a2b7be930675f919258d03c04e7d2 \ - --hash=sha256:a8bdbb2f009cfc22a36d031f22a625a38b615b5e19e558a7b756b3279723e68e \ - --hash=sha256:ba377e5b67b908c8f3072a57b63e2c6a4cbd18aea4ed98d2584350dbf46f2783 \ - --hash=sha256:d52691e5bee6c860fff9a1c86ad26a13afbeb4b168cd4445c922b7e2cf85aaf0 - # via - # -r @release_or_nightly/requirements.in - # tensorboard - # tensorflow - # tensorflow-datasets - # tensorflow-metadata -psutil==7.1.3 \ - --hash=sha256:0005da714eee687b4b8decd3d6cc7c6db36215c9e74e5ad2264b90c3df7d92dc \ - --hash=sha256:1068c303be3a72f8e18e412c5b2a8f6d31750fb152f9cb106b54090296c9d251 \ - --hash=sha256:18349c5c24b06ac5612c0428ec2a0331c26443d259e2a0144a9b24b4395b58fa \ - --hash=sha256:19644c85dcb987e35eeeaefdc3915d059dac7bd1167cdcdbf27e0ce2df0c08c0 \ - --hash=sha256:2bdbcd0e58ca14996a42adf3621a6244f1bb2e2e528886959c72cf1e326677ab \ - --hash=sha256:31d77fcedb7529f27bb3a0472bea9334349f9a04160e8e6e5020f22c59893264 \ - --hash=sha256:3792983e23b69843aea49c8f5b8f115572c5ab64c153bada5270086a2123c7e7 \ - --hash=sha256:3bb428f9f05c1225a558f53e30ccbad9930b11c3fc206836242de1091d3e7dd3 \ - --hash=sha256:56d974e02ca2c8eb4812c3f76c30e28836fffc311d55d979f1465c1feeb2b68b \ - --hash=sha256:6c86281738d77335af7aec228328e944b30930899ea760ecf33a4dba66be5e74 \ - --hash=sha256:8f33a3702e167783a9213db10ad29650ebf383946e91bc77f28a5eb083496bc9 \ - --hash=sha256:95ef04cf2e5ba0ab9eaafc4a11eaae91b44f4ef5541acd2ee91d9108d00d59a7 \ - --hash=sha256:ad81425efc5e75da3f39b3e636293360ad8d0b49bed7df824c79764fb4ba9b8b \ - --hash=sha256:b403da1df4d6d43973dc004d19cee3b848e998ae3154cc8097d139b77156c353 \ - --hash=sha256:bc31fa00f1fbc3c3802141eede66f3a2d51d89716a194bf2cd6fc68310a19880 \ - --hash=sha256:bd0d69cee829226a761e92f28140bec9a5ee9d5b4fb4b0cc589068dbfff559b1 \ - --hash=sha256:c525ffa774fe4496282fb0b1187725793de3e7c6b29e41562733cae9ada151ee \ - --hash=sha256:f39c2c19fe824b47484b96f9692932248a54c43799a84282cfe58d05a6449efd \ - --hash=sha256:fac9cd332c67f4422504297889da5ab7e05fd11e3c4392140f7370f4208ded1f - # via tensorflow-datasets -pygments==2.19.2 \ - --hash=sha256:636cb2477cec7f8952536970bc533bc43743542f70392ae026374600add5b887 \ - --hash=sha256:86540386c03d588bb81d44bc3928634ff26449851e99741617ecb9037ee5ec0b - # via rich -requests==2.32.5 \ - --hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \ - --hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf - # via - # tensorflow - # tensorflow-datasets -rich==14.2.0 \ - --hash=sha256:73ff50c7c0c1c77c8243079283f4edb376f0f6442433aecb8ce7e6d0b92d1fe4 \ - --hash=sha256:76bc51fe2e57d2b1be1f96c524b890b816e334ab4c1e45888799bfaab0021edd - # via keras -six==1.17.0 \ - --hash=sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274 \ - --hash=sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81 - # via - # astunparse - # google-pasta - # promise - # tensorflow -tensorboard==2.20.0 \ - --hash=sha256:9dc9f978cb84c0723acf9a345d96c184f0293d18f166bb8d59ee098e6cfaaba6 - # via tensorflow -tensorboard-data-server==0.7.2 \ - --hash=sha256:7e0610d205889588983836ec05dc098e80f97b7e7bbff7e994ebb78f578d0ddb \ - --hash=sha256:9fe5d24221b29625dbc7328b0436ca7fc1c23de4acf4d272f1180856e32f9f60 \ - --hash=sha256:ef687163c24185ae9754ed5650eb5bc4d84ff257aabdc33f0cc6f74d8ba54530 - # via tensorboard -tensorflow==2.20.0 \ - --hash=sha256:02a0293d94f5c8b7125b66abf622cc4854a33ae9d618a0d41309f95e091bbaea \ - --hash=sha256:0deb5c583dfc53b54fd158a194ce0087b406bb6518af400ca3809735e4548ec3 \ - --hash=sha256:1590cbf87b6bcbd34d8e9ad70d0c696135e0aa71be31803b27358cf7ed63f8fc \ - --hash=sha256:197f0b613b38c0da5c6a12a8295ad4a05c78b853835dae8e0f9dfae3ce9ce8a5 \ - --hash=sha256:25265b0bc527e0d54b1e9cc60c44a24f44a809fe27666b905f0466471f9c52ec \ - --hash=sha256:28bc33759249c98eabcee9debd24e74506bbe29ac139e050cf0c74aa9888ebdf \ - --hash=sha256:2bfbfb3dd0e22bffc45fe1e922390d27753e99261fab8a882e802cf98a0e078f \ - --hash=sha256:3e9568c8efcb05c0266be223e3269c62ebf7ad3498f156438311735f6fa5ced5 \ - --hash=sha256:47c88e05a07f1ead4977b4894b3ecd4d8075c40191065afc4fd9355c9db3d926 \ - --hash=sha256:481499fd0f824583de8945be61d5e827898cdaa4f5ea1bc2cc28ca2ccff8229e \ - --hash=sha256:4a69ac2c2ce20720abf3abf917b4e86376326c0976fcec3df330e184b81e4088 \ - --hash=sha256:52b122f0232fd7ab10f28d537ce08470d0b6dcac7fff9685432daac7f8a06c8f \ - --hash=sha256:5f964016c5035d09b85a246a6b739be89282a7839743f3ea63640224f0c63aee \ - --hash=sha256:5fa3729b0126f75a99882b89fb7d536515721eda8014a63e259e780ba0a37372 \ - --hash=sha256:7551558a48c2e2f6c32a1537f06c654a9df1408a1c18e7b99c3caafbd03edfe3 \ - --hash=sha256:7abd7f3a010e0d354dc804182372779a722d474c4d8a3db8f4a3f5baef2a591e \ - --hash=sha256:a66cbd1b19209d3fbc45cbea80de92514ba455434013937251d65d444779783c \ - --hash=sha256:c25edad45e8cb9e76366f7a8c835279f9169028d610f3b52ce92d332a1b05438 \ - --hash=sha256:dd71a7e7c3270239f4185915e8f2c5d39608c5e18973d6e1d101b153993841eb \ - --hash=sha256:e5f169f8f5130ab255bbe854c5f0ae152e93d3d1ac44f42cb1866003b81a5357 - # via - # -r @release_or_nightly/requirements.in - # tf-keras -tensorflow-datasets==4.9.3 \ - --hash=sha256:09cd60eccab0d5a9d15f53e76ee0f1b530ee5aa3665e42be621a4810d9fa5db6 \ - --hash=sha256:90390077dde2c9e4e240754ddfc5bb50b482946d421c8a34677c3afdb0463427 - # via -r @release_or_nightly/requirements.in -tensorflow-metadata==1.17.3 \ - --hash=sha256:452912e6398b3cb7302f0de6139dea794b3be1bd0eb40e6765eb3a04e51ea991 - # via - # -r @release_or_nightly/requirements.in - # tensorflow-datasets -termcolor==2.5.0 \ - --hash=sha256:37b17b5fc1e604945c2642c872a3764b5d547a48009871aea3edd3afa180afb8 \ - --hash=sha256:998d8d27da6d48442e8e1f016119076b690d962507531df4890fcd2db2ef8a6f - # via - # tensorflow - # tensorflow-datasets -tf-keras==2.20.1 \ - --hash=sha256:3f0e0a34d9a4c8758f24fdc1053e6e335f16ab5534c7d34f1899b8924779760c \ - --hash=sha256:884be5938fb0b2b53b1583c1ae2b660ef87215377c29b5b6a77fd221b472aeaf - # via -r @release_or_nightly/requirements.in -toml==0.10.2 \ - --hash=sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b \ - --hash=sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f - # via tensorflow-datasets -tqdm==4.67.1 \ - --hash=sha256:26445eca388f82e72884e0d580d5464cd801a3ea01e63e5601bdff9ba6a48de2 \ - --hash=sha256:f8aef9c52c08c13a65f30ea34f4e5aac3fd1a34959879d7e59e63027286627f2 - # via - # etils - # tensorflow-datasets -typing-extensions==4.15.0 \ - --hash=sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466 \ - --hash=sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548 - # via - # etils - # grpcio - # optree - # tensorflow -urllib3==2.5.0 \ - --hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \ - --hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc - # via - # -r @release_or_nightly/requirements.in - # requests -werkzeug==3.1.4 \ - --hash=sha256:2ad50fb9ed09cc3af22c54698351027ace879a0b60a3b5edf5730b2f7d876905 \ - --hash=sha256:cd3cd98b1b92dc3b7b3995038826c68097dcb16f9baa63abe35f20eafeb9fe5e - # via tensorboard -wheel==0.45.1 \ - --hash=sha256:661e1abd9198507b1409a20c02106d9670b2576e916d58f520316666abca6729 \ - --hash=sha256:708e7481cc80179af0e556bbf0cc00b8444c7321e2700b8d8580231d13017248 - # via astunparse -wrapt==2.0.1 \ - --hash=sha256:09c7476ab884b74dce081ad9bfd07fe5822d8600abade571cb1f66d5fc915af6 \ - --hash=sha256:0e17283f533a0d24d6e5429a7d11f250a58d28b4ae5186f8f47853e3e70d2590 \ - --hash=sha256:115cae4beed3542e37866469a8a1f2b9ec549b4463572b000611e9946b86e6f6 \ - --hash=sha256:1218573502a8235bb8a7ecaed12736213b22dcde9feab115fa2989d42b5ded45 \ - --hash=sha256:17fb85fa4abc26a5184d93b3efd2dcc14deb4b09edcdb3535a536ad34f0b4dba \ - --hash=sha256:1e9b121e9aeb15df416c2c960b8255a49d44b4038016ee17af03975992d03931 \ - --hash=sha256:1f186e26ea0a55f809f232e92cc8556a0977e00183c3ebda039a807a42be1494 \ - --hash=sha256:1fdbb34da15450f2b1d735a0e969c24bdb8d8924892380126e2a293d9902078c \ - --hash=sha256:23097ed8bc4c93b7bf36fa2113c6c733c976316ce0ee2c816f64ca06102034ef \ - --hash=sha256:2879af909312d0baf35f08edeea918ee3af7ab57c37fe47cb6a373c9f2749c7b \ - --hash=sha256:2afa23318136709c4b23d87d543b425c399887b4057936cd20386d5b1422b6fa \ - --hash=sha256:2da620b31a90cdefa9cd0c2b661882329e2e19d1d7b9b920189956b76c564d75 \ - --hash=sha256:35cdbd478607036fee40273be8ed54a451f5f23121bd9d4be515158f9498f7ad \ - --hash=sha256:36982b26f190f4d737f04a492a68accbfc6fa042c3f42326fdfbb6c5b7a20a31 \ - --hash=sha256:3793ac154afb0e5b45d1233cb94d354ef7a983708cc3bb12563853b1d8d53747 \ - --hash=sha256:386fb54d9cd903ee0012c09291336469eb7b244f7183d40dc3e86a16a4bace62 \ - --hash=sha256:3cd1a4bd9a7a619922a8557e1318232e7269b5fb69d4ba97b04d20450a6bf970 \ - --hash=sha256:3d32794fe940b7000f0519904e247f902f0149edbe6316c710a8562fb6738841 \ - --hash=sha256:3d366aa598d69416b5afedf1faa539fac40c1d80a42f6b236c88c73a3c8f2d41 \ - --hash=sha256:3e271346f01e9c8b1130a6a3b0e11908049fe5be2d365a5f402778049147e7e9 \ - --hash=sha256:3f373a4ab5dbc528a94334f9fe444395b23c2f5332adab9ff4ea82f5a9e33bc1 \ - --hash=sha256:3fa272ca34332581e00bf7773e993d4f632594eb2d1b0b162a9038df0fd971dd \ - --hash=sha256:47434236c396d04875180171ee1f3815ca1eada05e24a1ee99546320d54d1d1b \ - --hash=sha256:47b0f8bafe90f7736151f61482c583c86b0693d80f075a58701dd1549b0010a9 \ - --hash=sha256:4811e15d88ee62dbf5c77f2c3ff3932b1e3ac92323ba3912f51fc4016ce81ecf \ - --hash=sha256:49989061a9977a8cbd6d20f2efa813f24bf657c6990a42967019ce779a878dbf \ - --hash=sha256:4ae879acc449caa9ed43fc36ba08392b9412ee67941748d31d94e3cedb36628c \ - --hash=sha256:4b55cacc57e1dc2d0991dbe74c6419ffd415fb66474a02335cb10efd1aa3f84f \ - --hash=sha256:4d2ce1bf1a48c5277d7969259232b57645aae5686dba1eaeade39442277afbca \ - --hash=sha256:4da7384b0e5d4cae05c97cd6f94faaf78cc8b0f791fc63af43436d98c4ab37bb \ - --hash=sha256:4e54bbf554ee29fcceee24fa41c4d091398b911da6e7f5d7bffda963c9aed2e1 \ - --hash=sha256:50844efc8cdf63b2d90cd3d62d4947a28311e6266ce5235a219d21b195b4ec2c \ - --hash=sha256:5a4939eae35db6b6cec8e7aa0e833dcca0acad8231672c26c2a9ab7a0f8ac9c8 \ - --hash=sha256:5dc1b852337c6792aa111ca8becff5bacf576bf4a0255b0f05eb749da6a1643e \ - --hash=sha256:5e53b428f65ece6d9dad23cb87e64506392b720a0b45076c05354d27a13351a1 \ - --hash=sha256:61c4956171c7434634401db448371277d07032a81cc21c599c22953374781395 \ - --hash=sha256:641e94e789b5f6b4822bb8d8ebbdfc10f4e4eae7756d648b717d980f657a9eb9 \ - --hash=sha256:64b103acdaa53b7caf409e8d45d39a8442fe6dcfec6ba3f3d141e0cc2b5b4dbd \ - --hash=sha256:68424221a2dc00d634b54f92441914929c5ffb1c30b3b837343978343a3512a3 \ - --hash=sha256:6bd1a18f5a797fe740cb3d7a0e853a8ce6461cc62023b630caec80171a6b8097 \ - --hash=sha256:6c72328f668cf4c503ffcf9434c2b71fdd624345ced7941bc6693e61bbe36bef \ - --hash=sha256:6d2d947d266d99a1477cd005b23cbd09465276e302515e122df56bb9511aca1b \ - --hash=sha256:7164a55f5e83a9a0b031d3ffab4d4e36bbec42e7025db560f225489fa929e509 \ - --hash=sha256:7b219cb2182f230676308cdcacd428fa837987b89e4b7c5c9025088b8a6c9faf \ - --hash=sha256:7d539241e87b650cbc4c3ac9f32c8d1ac8a54e510f6dca3f6ab60dcfd48c9b10 \ - --hash=sha256:7de3cc939be0e1174969f943f3b44e0d79b6f9a82198133a5b7fc6cc92882f16 \ - --hash=sha256:8330b42d769965e96e01fa14034b28a2a7600fbf7e8f0cc90ebb36d492c993e4 \ - --hash=sha256:837e31620e06b16030b1d126ed78e9383815cbac914693f54926d816d35d8edf \ - --hash=sha256:83ce30937f0ba0d28818807b303a412440c4b63e39d3d8fc036a94764b728c92 \ - --hash=sha256:85df8d92158cb8f3965aecc27cf821461bb5f40b450b03facc5d9f0d4d6ddec6 \ - --hash=sha256:8639b843c9efd84675f1e100ed9e99538ebea7297b62c4b45a7042edb84db03e \ - --hash=sha256:89a82053b193837bf93c0f8a57ded6e4b6d88033a499dadff5067e912c2a41e9 \ - --hash=sha256:8bacfe6e001749a3b64db47bcf0341da757c95959f592823a93931a422395013 \ - --hash=sha256:8ec3303e8a81932171f455f792f8df500fc1a09f20069e5c16bd7049ab4e8e38 \ - --hash=sha256:90897ea1cf0679763b62e79657958cd54eae5659f6360fc7d2ccc6f906342183 \ - --hash=sha256:908f8c6c71557f4deaa280f55d0728c3bca0960e8c3dd5ceeeafb3c19942719d \ - --hash=sha256:91bcc576260a274b169c3098e9a3519fb01f2989f6d3d386ef9cbf8653de1374 \ - --hash=sha256:9219a1d946a9b32bb23ccae66bdb61e35c62773ce7ca6509ceea70f344656b7b \ - --hash=sha256:949520bccc1fa227274da7d03bf238be15389cd94e32e4297b92337df9b7a349 \ - --hash=sha256:98d873ed6c8b4ee2418f7afce666751854d6d03e3c0ec2a399bb039cd2ae89db \ - --hash=sha256:9c9c635e78497cacb81e84f8b11b23e0aacac7a136e73b8e5b2109a1d9fc468f \ - --hash=sha256:9ca66b38dd642bf90c59b6738af8070747b610115a39af2498535f62b5cdc1c3 \ - --hash=sha256:a453257f19c31b31ba593c30d997d6e5be39e3b5ad9148c2af5a7314061c63eb \ - --hash=sha256:a52f93d95c8d38fed0669da2ebdb0b0376e895d84596a976c15a9eb45e3eccb3 \ - --hash=sha256:a9a83618c4f0757557c077ef71d708ddd9847ed66b7cc63416632af70d3e2308 \ - --hash=sha256:ab594f346517010050126fcd822697b25a7031d815bb4fbc238ccbe568216489 \ - --hash=sha256:ad3ee9d0f254851c71780966eb417ef8e72117155cff04821ab9b60549694a55 \ - --hash=sha256:aea9c7224c302bc8bfc892b908537f56c430802560e827b75ecbde81b604598b \ - --hash=sha256:b4c2e3d777e38e913b8ce3a6257af72fb608f86a1df471cb1d4339755d0a807c \ - --hash=sha256:b667189cf8efe008f55bbda321890bef628a67ab4147ebf90d182f2dadc78790 \ - --hash=sha256:b89ef9223d665ab255ae42cc282d27d69704d94be0deffc8b9d919179a609684 \ - --hash=sha256:be9e84e91d6497ba62594158d3d31ec0486c60055c49179edc51ee43d095f79c \ - --hash=sha256:bf4cb76f36be5de950ce13e22e7fdf462b35b04665a12b64f3ac5c1bbbcf3728 \ - --hash=sha256:bfb5539005259f8127ea9c885bdc231978c06b7a980e63a8a61c8c4c979719d0 \ - --hash=sha256:c046781d422f0830de6329fa4b16796096f28a92c8aef3850674442cdcb87b7f \ - --hash=sha256:c1be685ac7700c966b8610ccc63c3187a72e33cab53526a27b2a285a662cd4f7 \ - --hash=sha256:c1c91405fcf1d501fa5d55df21e58ea49e6b879ae829f1039faaf7e5e509b41e \ - --hash=sha256:c235095d6d090aa903f1db61f892fffb779c1eaeb2a50e566b52001f7a0f66ed \ - --hash=sha256:c4012a2bd37059d04f8209916aa771dfb564cccb86079072bdcd48a308b6a5c5 \ - --hash=sha256:c5ef2f2b8a53b7caee2f797ef166a390fef73979b15778a4a153e4b5fedce8fa \ - --hash=sha256:c654eafb01afac55246053d67a4b9a984a3567c3808bb7df2f8de1c1caba2e1c \ - --hash=sha256:c8d60527d1ecfc131426b10d93ab5d53e08a09c5fa0175f6b21b3252080c70a9 \ - --hash=sha256:c9e850f5b7fc67af856ff054c71690d54fa940c3ef74209ad9f935b4f66a0233 \ - --hash=sha256:cbeb0971e13b4bd81d34169ed57a6dda017328d1a22b62fda45e1d21dd06148f \ - --hash=sha256:d1a8a09a004ef100e614beec82862d11fc17d601092c3599afd22b1f36e4137e \ - --hash=sha256:d67956c676be5a24102c7407a71f4126d30de2a569a1c7871c9f3cabc94225d7 \ - --hash=sha256:d6cc985b9c8b235bd933990cdbf0f891f8e010b65a3911f7a55179cd7b0fc57b \ - --hash=sha256:d7b822c61ed04ee6ad64bc90d13368ad6eb094db54883b5dde2182f67a7f22c0 \ - --hash=sha256:df0b6d3b95932809c5b3fecc18fda0f1e07452d05e2662a0b35548985f256e28 \ - --hash=sha256:e042d653a4745be832d5aa190ff80ee4f02c34b21f4b785745eceacd0907b815 \ - --hash=sha256:e2f84e9af2060e3904a32cea9bb6db23ce3f91cfd90c6b426757cf7cc01c45c7 \ - --hash=sha256:e3612dc06b436968dfb9142c62e5dfa9eb5924f91120b3c8ff501ad878f90eb3 \ - --hash=sha256:e505629359cb5f751e16e30cf3f91a1d3ddb4552480c205947da415d597f7ac2 \ - --hash=sha256:e60690ba71a57424c8d9ff28f8d006b7ad7772c22a4af432188572cd7fa004a1 \ - --hash=sha256:e76e3f91f864e89db8b8d2a8311d57df93f01ad6bb1e9b9976d1f2e83e18315c \ - --hash=sha256:eb7cffe572ad0a141a7886a1d2efa5bef0bf7fe021deeea76b3ab334d2c38218 \ - --hash=sha256:ec65a78fbd9d6f083a15d7613b2800d5663dbb6bb96003899c834beaa68b242c \ - --hash=sha256:eda8e4ecd662d48c28bb86be9e837c13e45c58b8300e43ba3c9b4fa9900302f7 \ - --hash=sha256:f26f8e2ca19564e2e1fdbb6a0e47f36e0efbab1acc31e15471fad88f828c75f6 \ - --hash=sha256:f49027b0b9503bf6c8cdc297ca55006b80c2f5dd36cecc72c6835ab6e10e8a25 \ - --hash=sha256:f73f9f7a0ebd0db139253d27e5fc8d2866ceaeef19c30ab5d69dcbe35e1a6981 \ - --hash=sha256:fa4184e74197af3adad3c889a1af95b53bb0466bced92ea99a0c014e48323eec \ - --hash=sha256:fb1a5b72cbd751813adc02ef01ada0b0d05d3dcbc32976ce189a1279d80ad4a2 \ - --hash=sha256:fb3a86e703868561c5cad155a15c36c716e1ab513b7065bd2ac8ed353c503333 \ - --hash=sha256:fc007fdf480c77301ab1afdbb6ab22a5deee8885f3b1ed7afcb7e5e84a0e27be \ - --hash=sha256:fe21b118b9f58859b5ebaa4b130dee18669df4bd111daad082b7beb8799ad16b \ - --hash=sha256:fec0d993ecba3991645b4857837277469c8cc4c554a7e24d064d1ca291cfb81f - # via - # tensorflow - # tensorflow-datasets -zipp==3.23.0 \ - --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \ - --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166 - # via - # etils - # importlib-metadata - # importlib-resources - -# The following packages are considered to be unsafe in a requirements file: -setuptools==80.9.0 \ - --hash=sha256:062d34222ad13e0cc312a4c02d73f059e86a4acbfbdea8f8f76b28c99f306922 \ - --hash=sha256:f36b47402ecde768dbfafc46e8e4207b4360c654f1f3bb84475f0a28628fb19c - # via - # -r @release_or_nightly/requirements.in - # tensorboard - # tensorflow diff --git a/oss_scripts/pip_package/setup.nightly.py b/oss_scripts/pip_package/setup.nightly.py index d5a3e3e23..e7f9492ca 100644 --- a/oss_scripts/pip_package/setup.nightly.py +++ b/oss_scripts/pip_package/setup.nightly.py @@ -46,7 +46,7 @@ from setuptools.dist import Distribution project_name = 'tensorflow-text-nightly' -project_version = '2.20.0' +project_version = '2.21.0' class BinaryDistribution(Distribution): @@ -101,7 +101,6 @@ def finalize_options(self): 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', diff --git a/oss_scripts/pip_package/setup.py b/oss_scripts/pip_package/setup.py index be5cdf6e5..7d8391ce8 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.20.0' +project_version = '2.21.0' class BinaryDistribution(Distribution): @@ -87,11 +87,11 @@ def finalize_options(self): cmdclass={'install': InstallPlatlib}, distclass=BinaryDistribution, install_requires=[ - ('tensorflow>=2.20.0, <2.21',), + ('tensorflow>=2.21.0, <2.22',), ], extras_require={ 'tensorflow_cpu': [ - 'tensorflow-cpu>=2.20.0, <2.21', + 'tensorflow-cpu>=2.21.0, <2.22', ], 'tests': [ 'absl-py', @@ -106,7 +106,6 @@ def finalize_options(self): 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Apache Software License', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', 'Programming Language :: Python :: 3.12', diff --git a/tensorflow_text/BUILD b/tensorflow_text/BUILD index c65883dd5..aa502186c 100644 --- a/tensorflow_text/BUILD +++ b/tensorflow_text/BUILD @@ -1,10 +1,9 @@ load("@org_tensorflow//tensorflow/lite:build_def.bzl", "tflite_cc_shared_object") load("@rules_cc//cc:cc_library.bzl", "cc_library") -load("@xla//third_party/rules_python/python:py_test.bzl", "py_test") +load("//third_party/rules_python/python:py_test.bzl", "py_test") load("//tensorflow_text:tftext.bzl", "extra_py_deps", "if_pywrap", "py_library", "py_tf_text_library") -# [internal] load build_test.bzl -load("//tools/build_defs/license:license.bzl", "license") +load("@rules_license//rules:license.bzl", "license") # Visibility rules package( @@ -131,7 +130,7 @@ py_library( ":wordpiece_tokenizer", ":wordshape_ops", # python/util:all_util tensorflow dep, - "//tensorflow_text/core/pybinds:tflite_registrar", + "//tensorflow_text/core/pybinds:pybinds_library", "//tensorflow_text/tools/wordpiece_vocab", ] + extra_py_deps(), ) @@ -309,7 +308,7 @@ py_tf_text_library( # python/module tensorflow dep, # python/ops:array_ops_stack tensorflow dep, # python/ops/ragged:ragged_tensor tensorflow dep, - "//tensorflow_text/core/pybinds:pywrap_fast_bert_normalizer_model_builder", + "//tensorflow_text/core/pybinds:pybinds_library", ], ) @@ -390,7 +389,7 @@ py_tf_text_library( "//tensorflow_text/core/kernels/sentencepiece:sentencepiece_detokenizer_kernel", ], deps = [ - "//tensorflow_text/core/pybinds:pywrap_model_converter", + "//tensorflow_text/core/pybinds:pybinds_library", "@release_or_nightly//:tensorflow_pkg", # tensorflow package dep ], ) @@ -435,7 +434,7 @@ py_tf_text_library( # python/ops:array_ops_stack tensorflow dep, # python/ops:math_ops tensorflow dep, # python/ops/ragged:ragged_tensor tensorflow dep, - "//tensorflow_text/core/pybinds:pywrap_fast_wordpiece_tokenizer_model_builder", + "//tensorflow_text/core/pybinds:pybinds_library", ], ) @@ -482,7 +481,7 @@ py_tf_text_library( # python/ops:array_ops_stack tensorflow dep, # python/ops:math_ops tensorflow dep, # python/ops/ragged:ragged_tensor tensorflow dep, - "//tensorflow_text/core/pybinds:pywrap_phrase_tokenizer_model_builder", + "//tensorflow_text/core/pybinds:pybinds_library", ], ) @@ -1561,7 +1560,7 @@ py_tf_text_library( # python/ops/ragged:ragged_conversion_ops tensorflow dep, # python/ops/ragged:ragged_string_ops tensorflow dep, # python/ops/ragged:ragged_tensor tensorflow dep, - "//tensorflow_text/core/pybinds:pywrap_whitespace_tokenizer_config_builder", + "//tensorflow_text/core/pybinds:pybinds_library", ], ) diff --git a/tensorflow_text/__init__.py b/tensorflow_text/__init__.py index 55281df95..452ac681b 100644 --- a/tensorflow_text/__init__.py +++ b/tensorflow_text/__init__.py @@ -110,4 +110,4 @@ ] remove_undocumented(__name__, _allowed_symbols) -__version__ = "2.20.0" +__version__ = "2.21.0" diff --git a/tensorflow_text/core/kernels/BUILD b/tensorflow_text/core/kernels/BUILD index 8aba03626..7887650d7 100644 --- a/tensorflow_text/core/kernels/BUILD +++ b/tensorflow_text/core/kernels/BUILD @@ -158,14 +158,11 @@ cc_test( srcs = ["constrained_sequence_kernel_input_validation_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:constrained_sequence_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -174,14 +171,11 @@ cc_test( srcs = ["exp_greedy_constrained_sequence_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:constrained_sequence_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -190,14 +184,11 @@ cc_test( srcs = ["exp_viterbi_constrained_sequence_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:constrained_sequence_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -252,6 +243,7 @@ cc_test( deps = [ ":fast_bert_normalizer", ":fast_bert_normalizer_model_builder", + "@com_google_absl//absl/strings", "@com_google_googletest//:gtest_main", ], ) @@ -298,14 +290,11 @@ cc_test( srcs = ["log_greedy_constrained_sequence_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:constrained_sequence_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -314,14 +303,11 @@ cc_test( srcs = ["log_viterbi_constrained_sequence_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:constrained_sequence_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -359,6 +345,7 @@ cc_test( ":darts_clone_trie_builder", ":darts_clone_trie_wrapper", "@com_google_absl//absl/status", + "@com_google_absl//absl/status:status_matchers", "@com_google_googletest//:gtest_main", ], ) @@ -411,10 +398,12 @@ cc_test( deps = [ ":fast_wordpiece_tokenizer", ":fast_wordpiece_tokenizer_model_builder", - "@com_google_googletest//:gtest_main", "@com_google_absl//absl/flags:flag", + "@com_google_absl//absl/strings", + "@com_google_googletest//:gtest_main", "@icu//:headers", - # tf:lib tensorflow dep, + "@release_or_nightly//:tensorflow_libtensorflow_framework", + "@release_or_nightly//:tensorflow_tf_header_lib", ], ) @@ -570,9 +559,10 @@ cc_test( srcs = ["mst_solver_test.cc"], deps = [ ":mst_solver", + "@com_google_absl//absl/status:status_matchers", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", - # tf:test tensorflow dep, + "@release_or_nightly//:tensorflow_tf_header_lib", ], ) @@ -638,12 +628,12 @@ cc_test( name = "ngrams_kernel_test", srcs = ["ngrams_kernel_test.cc"], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, - # tf/framework:tensor_testutil tensorflow dep, "//tensorflow_text:ngrams_op_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -666,10 +656,8 @@ cc_test( ":ngrams_tflite", "@com_google_googletest//:gtest_main", "@flatbuffers", - # lite:string_util tensorflow dep, - # lite/c:common tensorflow dep, - # lite/kernels:test_util tensorflow dep, - # lite/schema:schema_fbs tensorflow dep, + "@org_tensorflow//tensorflow/lite/kernels:test_util", + "@org_tensorflow//tensorflow/lite/schema:schema_fbs", ], ) @@ -709,11 +697,8 @@ cc_test( ":ragged_tensor_to_tensor_tflite", "@com_google_googletest//:gtest_main", "@flatbuffers", - # lite:framework tensorflow dep, - # lite/c:common tensorflow dep, - # lite/kernels:test_util tensorflow dep, - # lite/kernels/internal:tensor tensorflow dep, - # lite/schema:schema_fbs tensorflow dep, + "@org_tensorflow//tensorflow/lite/kernels:test_util", + "@org_tensorflow//tensorflow/lite/schema:schema_fbs", ], ) @@ -839,11 +824,11 @@ cc_test( srcs = ["rouge_l_kernel_test.cc"], deps = [ ":rouge_l_kernel", - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", "//tensorflow_text:text_similarity_metric_ops_cc", ], ) @@ -1030,8 +1015,7 @@ cc_library( hdrs = ["text_kernels_test_util.h"], deps = [ "@com_google_googletest//:gtest", - # tf:framework tensorflow dep, - # tf:testlib tensorflow dep, + "@release_or_nightly//:tensorflow_tf_header_lib", ], ) @@ -1104,13 +1088,11 @@ cc_test( srcs = ["unicode_script_tokenize_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:unicode_script_tokenizer_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -1131,13 +1113,11 @@ cc_test( srcs = ["whitespace_tokenize_kernel_test.cc"], deps = [ ":text_kernels_test_util", - "@com_google_googletest//:gtest_main", - # tf:framework tensorflow dep, - # tf:lib tensorflow dep, - # tf:test tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, "//tensorflow_text:whitespace_tokenizer_cc", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", ], ) @@ -1274,8 +1254,8 @@ cc_test( "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", - # tf:lib tensorflow dep, - # tf:test_main tensorflow dep, + "@release_or_nightly//:tensorflow_libtensorflow_framework", + "@release_or_nightly//:tensorflow_tf_header_lib", ], ) @@ -1398,11 +1378,12 @@ cc_test( srcs = ["wordpiece_kernel_test.cc"], deps = [ ":wordpiece_kernel", - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf:testlib tensorflow dep, - # tf/kernels:ops_testutil tensorflow dep, + "@com_google_googletest//:gtest", + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/framework:fake_input", + "@org_tensorflow//tensorflow/core/kernels:ops_testutil", + "@org_tensorflow//tensorflow/core/platform:test_main", "//tensorflow_text:wordpiece_tokenizer_cc", ], ) diff --git a/tensorflow_text/core/kernels/boise_offset_converter_test.cc b/tensorflow_text/core/kernels/boise_offset_converter_test.cc index 06c279d06..86d810d16 100644 --- a/tensorflow_text/core/kernels/boise_offset_converter_test.cc +++ b/tensorflow_text/core/kernels/boise_offset_converter_test.cc @@ -63,7 +63,7 @@ TEST(OffsetsToBoiseTagsTest, ExtractSingleton) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "O", "O", "O", "S-animal", "O"})); } @@ -83,7 +83,7 @@ TEST(OffsetsToBoiseTagsTest, ExtractSingletonStrictBoundary) { OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type, use_strict_boundary_mode) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{"O", "O", "O", "O", "O"})); } @@ -102,7 +102,7 @@ TEST(OffsetsToBoiseTagsTest, ExtractBEEntity) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "O", "O", "O", "B-animal", "E-animal", "O"})); } @@ -121,7 +121,7 @@ TEST(OffsetsToBoiseTagsTest, ExtractBIEEntity) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "O", "O", "O", "B-loc", "I-loc", "E-loc", "O"})); } @@ -139,7 +139,7 @@ TEST(OffsetsToBoiseTagsTest, ExtractMutipleEntities) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{"B-org", "E-org", "O", "O", "B-loc", "I-loc", "E-loc"})); @@ -158,7 +158,7 @@ TEST(OffsetsToBoiseTagsTest, LooseBoundary) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{"B-org", "E-org", "O", "O", "B-loc", "I-loc", "E-loc"})); @@ -179,7 +179,7 @@ TEST(OffsetsToBoiseTagsTest, StrictBoundary) { OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type, use_strict_boundary_mode) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "O", "E-org", "O", "O", "B-loc", "I-loc", "O"})); } @@ -197,7 +197,7 @@ TEST(OffsetsToBoiseTagsTest, OneTokenMultiEntitiesLastPrecedes) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{"B-loc"})); } @@ -214,7 +214,7 @@ TEST(OffsetsToBoiseTagsTest, OneTokenMultEntitiesPartialOverlapLastPrecedes) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{"B-per", "B-loc"})); } @@ -232,7 +232,7 @@ TEST(OffsetsToBoiseTagsTest, MultiTokensOneEntityPartialOverlapLastPrecedes) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "B-org", "I-org", "B-loc", "I-loc", "E-loc"})); } @@ -247,7 +247,7 @@ TEST(OffsetsToBoiseTagsTest, EmptySpanOffsets) { std::vector boise_tags = OffsetsToBoiseTags(token_begin_offsets, token_end_offsets, entity_begin_offsets, entity_end_offsets, entity_type) - .ValueOrDie(); + .value(); EXPECT_THAT(boise_tags, ContainerEq(std::vector{ "O", "O", "O", "O", "O", "O", "O"})); } @@ -276,7 +276,7 @@ TEST(BoiseTagsToOffsetTest, BeginAndEndTagsAreConvertedToOffsets) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -293,7 +293,7 @@ TEST(BoiseTagsToOffsetTest, SingletonTagsAreExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"dogs"})); @@ -311,7 +311,7 @@ TEST(BoiseTagsToOffsetTest, BeginInsideAndEndLabelsAreExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, @@ -330,7 +330,7 @@ TEST(BoiseTagsToOffsetTest, InsideEndLabelsAreExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -348,7 +348,7 @@ TEST(BoiseTagsToOffsetTest, BeginInsideLabelsAreExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -367,7 +367,7 @@ TEST(BoiseTagsToOffsetTest, InsideOnlyLabelIsExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"shepherd"})); @@ -386,7 +386,7 @@ TEST(BoiseTagsToOffsetTest, BeginOnlyLabelIsExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"shepherd"})); @@ -405,7 +405,7 @@ TEST(BoiseTagsToOffsetTest, EndOnlyLabelIsExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"shepherd"})); @@ -423,7 +423,7 @@ TEST(BoiseTagsToOffsetTest, MultipleEntitiesAreExtracted) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{ @@ -442,7 +442,7 @@ TEST(BoiseTagsToOffsetTest, MultipleBeginLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -460,7 +460,7 @@ TEST(BoiseTagsToOffsetTest, MultipleInsideLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -478,7 +478,7 @@ TEST(BoiseTagsToOffsetTest, MultipleEndLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, @@ -498,7 +498,7 @@ TEST(BoiseTagsToOffsetTest, MultipleSingleLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, @@ -517,7 +517,7 @@ TEST(BoiseTagsToOffsetTest, TrailingBeginLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); auto texts = ExtractTextsFromOffsets(content, begin_offsets, end_offsets); EXPECT_THAT(texts, ContainerEq(std::vector{"german shepherd"})); @@ -531,7 +531,7 @@ TEST(BoiseTagsToOffsetTest, NoBoiseLabels) { auto [begin_offsets, end_offsets, span_types] = BoiseTagsToOffsets(token_begin_offsets, token_end_offsets, boise_tags) - .ValueOrDie(); + .value(); EXPECT_TRUE(begin_offsets.empty()); EXPECT_TRUE(end_offsets.empty()); diff --git a/tensorflow_text/core/kernels/constrained_sequence_kernel_input_validation_test.cc b/tensorflow_text/core/kernels/constrained_sequence_kernel_input_validation_test.cc index 343d2d142..d251d3585 100644 --- a/tensorflow_text/core/kernels/constrained_sequence_kernel_input_validation_test.cc +++ b/tensorflow_text/core/kernels/constrained_sequence_kernel_input_validation_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/kernels/ops_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/text_kernels_test_util.h" @@ -42,17 +42,17 @@ class ConstrainedSequenceInputValidationTest : public tensorflow::OpsTestBase { void SetUpOpWithDefaults(bool use_start_end, tensorflow::DataType input_datatype) { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") - .Attr("Tin", input_datatype) - .Attr("use_viterbi", true) - .Attr("use_log_space", true) - .Attr("use_start_and_end_states", use_start_end) - .Input(FakeInput()) - .Input(FakeInput()) - .Input(FakeInput()) - .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") + .Attr("Tin", input_datatype) + .Attr("use_viterbi", true) + .Attr("use_log_space", true) + .Attr("use_start_and_end_states", use_start_end) + .Input(FakeInput()) + .Input(FakeInput()) + .Input(FakeInput()) + .Input(FakeInput()) + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } void SetUpOpWithStartEnd() { SetUpOpWithDefaults(true, DT_INT32); } @@ -92,7 +92,7 @@ TEST_F(ConstrainedSequenceInputValidationTest, WorksWithInt64InputLengths) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. diff --git a/tensorflow_text/core/kernels/darts_clone_trie_test.cc b/tensorflow_text/core/kernels/darts_clone_trie_test.cc index a80c28353..99329e049 100644 --- a/tensorflow_text/core/kernels/darts_clone_trie_test.cc +++ b/tensorflow_text/core/kernels/darts_clone_trie_test.cc @@ -16,22 +16,25 @@ #include #include "tensorflow_text/core/kernels/darts_clone_trie_builder.h" #include "tensorflow_text/core/kernels/darts_clone_trie_wrapper.h" +#include "absl/status/status_matchers.h" namespace tensorflow { namespace text { namespace trie_utils { -using ::testing::status::StatusIs; +using ::absl_testing::StatusIs; TEST(DartsCloneTrieTest, CreateCursorPointToRootAndTryTraverseOneStep) { // The test vocabulary. std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; int data; @@ -53,10 +56,12 @@ TEST(DartsCloneTrieTest, CreateCursorAndTryTraverseSeveralSteps) { std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; int data; @@ -73,10 +78,12 @@ TEST(DartsCloneTrieTest, TraversePathNotExisted) { std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; @@ -91,10 +98,12 @@ TEST(DartsCloneTrieTest, TraverseOnUtf8Path) { std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; int data; @@ -112,10 +121,12 @@ TEST(DartsCloneTrieTest, TraverseOnPartialUtf8Path) { std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; int data; @@ -132,10 +143,12 @@ TEST(DartsCloneTrieTest, TraverseOnUtf8PathNotExisted) { std::vector vocab_tokens{"def", "\xe1\xb8\x8aZZ", "Abc"}; // Create the trie instance. - ASSERT_OK_AND_ASSIGN(std::vector trie_array, - BuildDartsCloneTrie(vocab_tokens)); - ASSERT_OK_AND_ASSIGN(DartsCloneTrieWrapper trie, - DartsCloneTrieWrapper::Create(trie_array.data())); + auto trie_array_or = BuildDartsCloneTrie(vocab_tokens); + ASSERT_TRUE(trie_array_or.ok()); + auto trie_array = trie_array_or.value(); + auto trie_or = DartsCloneTrieWrapper::Create(trie_array.data()); + ASSERT_TRUE(trie_or.ok()); + auto trie = trie_or.value(); DartsCloneTrieWrapper::TraversalCursor cursor; @@ -152,7 +165,7 @@ TEST(DartsCloneTrieBuildError, KeysValuesSizeDifferent) { // Create the trie instance. ASSERT_THAT(BuildDartsCloneTrie(keys, values), - StatusIs(util::error::INVALID_ARGUMENT)); + StatusIs(absl::StatusCode::kInvalidArgument)); } TEST(DartsCloneTrieBuildError, DuplicatedKeys) { @@ -161,7 +174,7 @@ TEST(DartsCloneTrieBuildError, DuplicatedKeys) { // Create the trie instance. ASSERT_THAT(BuildDartsCloneTrie(vocab_tokens), - StatusIs(util::error::INVALID_ARGUMENT)); + StatusIs(absl::StatusCode::kInvalidArgument)); } TEST(DartsCloneTrieBuildError, EmptyStringsInKeys) { @@ -170,7 +183,7 @@ TEST(DartsCloneTrieBuildError, EmptyStringsInKeys) { // Create the trie instance. ASSERT_THAT(BuildDartsCloneTrie(vocab_tokens), - StatusIs(util::error::INVALID_ARGUMENT)); + StatusIs(absl::StatusCode::kInvalidArgument)); } TEST(DartsCloneTrieBuildError, NegativeValues) { @@ -180,7 +193,7 @@ TEST(DartsCloneTrieBuildError, NegativeValues) { // Create the trie instance. ASSERT_THAT(BuildDartsCloneTrie(vocab_tokens, vocab_values), - StatusIs(util::error::INVALID_ARGUMENT)); + StatusIs(absl::StatusCode::kInvalidArgument)); } } // namespace trie_utils diff --git a/tensorflow_text/core/kernels/exp_greedy_constrained_sequence_kernel_test.cc b/tensorflow_text/core/kernels/exp_greedy_constrained_sequence_kernel_test.cc index 0c91e24be..ff52526fd 100644 --- a/tensorflow_text/core/kernels/exp_greedy_constrained_sequence_kernel_test.cc +++ b/tensorflow_text/core/kernels/exp_greedy_constrained_sequence_kernel_test.cc @@ -22,7 +22,6 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/kernels/ops_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/text_kernels_test_util.h" @@ -41,7 +40,7 @@ class ExpGreedyConstrainedSequenceTest : public tensorflow::OpsTestBase { public: void SetUpOpWithDefaults() { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") .Attr("Tin", DT_INT32) .Attr("use_viterbi", false) .Attr("use_log_space", false) @@ -50,8 +49,8 @@ class ExpGreedyConstrainedSequenceTest : public tensorflow::OpsTestBase { .Input(FakeInput()) .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -89,7 +88,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -135,7 +134,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -179,7 +178,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // Validate the output. @@ -221,7 +220,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, int64inint32out) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -267,7 +266,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, TwoDimensionalSequenceLengths) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -314,7 +313,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok; the next // highest is 1, but 1->OUT is not OK; the next highest is 0, which is OK. @@ -356,7 +355,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -399,7 +398,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -443,7 +442,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 0.1, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row and the last column in the // score tensor, so the real scores are: @@ -465,7 +464,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, TEST_F(ExpGreedyConstrainedSequenceTest, ComputesSingleTransitionWithNoPermissionsNotWeightedByEnd) { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") .Attr("Tin", DT_INT32) .Attr("use_viterbi", false) .Attr("use_log_space", false) @@ -474,8 +473,8 @@ TEST_F(ExpGreedyConstrainedSequenceTest, .Input(FakeInput()) .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); // Add the scores input. AddInputFromArray(TensorShape({3, 1, 4}), // @@ -497,7 +496,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, // 0.5, 0.5, 0.5, 0.5}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row and the last column in the // score tensor, so the real scores are: @@ -548,7 +547,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -603,7 +602,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 1.0, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be multiplied by the last row in the weight tensor, so @@ -665,7 +664,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.5, 0.5, 1.0, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be multiplied by the last row in the weight tensor, so @@ -719,7 +718,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); std::vector expected_transitions({3, 0, 1}); std::vector expected_offsets({0, 1, 2, 3}); @@ -758,7 +757,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, }); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // In the case of a tie between weights, the higher state number wins; // if all weights are zero, the states should all be 3. @@ -804,7 +803,7 @@ TEST_F(ExpGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // Validate the output. diff --git a/tensorflow_text/core/kernels/exp_viterbi_constrained_sequence_kernel_test.cc b/tensorflow_text/core/kernels/exp_viterbi_constrained_sequence_kernel_test.cc index 49cfa02be..23951bf1f 100644 --- a/tensorflow_text/core/kernels/exp_viterbi_constrained_sequence_kernel_test.cc +++ b/tensorflow_text/core/kernels/exp_viterbi_constrained_sequence_kernel_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/kernels/ops_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/text_kernels_test_util.h" @@ -41,17 +41,17 @@ class ExpViterbiConstrainedSequenceTest : public tensorflow::OpsTestBase { public: void SetUpOpWithDefaults() { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") - .Attr("Tin", DT_INT32) - .Attr("use_viterbi", true) - .Attr("use_log_space", false) - .Attr("use_start_and_end_states", true) - .Input(FakeInput()) - .Input(FakeInput()) - .Input(FakeInput()) - .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") + .Attr("Tin", DT_INT32) + .Attr("use_viterbi", true) + .Attr("use_log_space", false) + .Attr("use_start_and_end_states", true) + .Input(FakeInput()) + .Input(FakeInput()) + .Input(FakeInput()) + .Input(FakeInput()) + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -89,7 +89,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -135,7 +135,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -179,7 +179,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // Validate the output. @@ -221,7 +221,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, int64inint32out) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -267,7 +267,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, TwoDimensionalSequenceLengths) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -314,7 +314,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok; the next // highest is 1, but 1->OUT is not OK; the next highest is 0, which is OK. @@ -356,7 +356,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -399,7 +399,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -443,7 +443,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 0.1, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row and the last column in the // score tensor, so the real scores are: @@ -465,7 +465,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, TEST_F(ExpViterbiConstrainedSequenceTest, ComputesSingleTransitionWithNoPermissionsNotWeightedByEnd) { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") .Attr("Tin", DT_INT32) .Attr("use_viterbi", true) .Attr("use_log_space", false) @@ -474,8 +474,8 @@ TEST_F(ExpViterbiConstrainedSequenceTest, .Input(FakeInput()) .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); // Add the scores input. AddInputFromArray(TensorShape({3, 1, 4}), // @@ -497,7 +497,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, // 0.5, 0.5, 0.5, 0.5}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row and the last column in the // score tensor, so the real scores are: @@ -548,7 +548,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be multiplied by the last row in the weight tensor, so // the 'real' scores are: @@ -603,7 +603,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 1.0, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be multiplied by the last row in the weight tensor, so @@ -693,7 +693,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.5, 0.5, 1.0, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be multiplied by the last row in the weight tensor, so @@ -766,7 +766,7 @@ TEST_F(ExpViterbiConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, }); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // In the case of a tie between weights, the higher state number wins; // if all weights are zero, the states should all be 3. diff --git a/tensorflow_text/core/kernels/fast_bert_normalizer_test.cc b/tensorflow_text/core/kernels/fast_bert_normalizer_test.cc index 73b4a4c51..84fae6754 100644 --- a/tensorflow_text/core/kernels/fast_bert_normalizer_test.cc +++ b/tensorflow_text/core/kernels/fast_bert_normalizer_test.cc @@ -18,6 +18,7 @@ #include #include +#include "absl/strings/str_join.h" #include "tensorflow_text/core/kernels/fast_bert_normalizer_model_builder.h" namespace tensorflow { diff --git a/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_test.cc b/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_test.cc index fea96e3ef..118df702b 100644 --- a/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_test.cc +++ b/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_test.cc @@ -17,6 +17,7 @@ #include #include #include "absl/flags/flag.h" +#include "absl/strings/str_join.h" #include "icu4c/source/common/unicode/uchar.h" #include "tensorflow/core/platform/env.h" #include "tensorflow_text/core/kernels/fast_wordpiece_tokenizer_model_builder.h" @@ -44,8 +45,9 @@ TEST(FastWordpieceTokenizerTest, LoadAndTokenize) { // * unk_token = "" // * suffix_indicator = "##" // * max_bytes_per_token = 100 - ASSERT_OK_AND_ASSIGN( - auto tokenizer, FastWordpieceTokenizer::Create(config_flatbuffer.data())); + auto tokenizer_or = FastWordpieceTokenizer::Create(config_flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::string input = "abcdefghz"; std::vector output_tokens; @@ -84,8 +86,9 @@ TEST_P(TestPunctuationVersionMismatch, Test) { tensorflow::Env::Default(), kTestConfigUnicodePath, &config_flatbuffer); ASSERT_TRUE(status.ok()); - ASSERT_OK_AND_ASSIGN( - auto tokenizer, FastWordpieceTokenizer::Create(config_flatbuffer.data())); + auto tokenizer_or = FastWordpieceTokenizer::Create(config_flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_tokens; std::vector output_ids; @@ -1207,13 +1210,15 @@ using TestTokenizeSingleWord = testing::TestWithParam; TEST_P(TestTokenizeSingleWord, Test) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, spec.suffix_indicator, spec.unk_token, - /*no_pretokenization=*/true)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + /*no_pretokenization=*/true); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_tokens; std::vector output_ids; @@ -1229,13 +1234,15 @@ TEST_P(TestTokenizeSingleWord, Test) { TEST_P(TestTokenizeSingleWord, TestNoOutputPieces) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, spec.suffix_indicator, spec.unk_token, - true /* no_pretokenization */)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + true /* no_pretokenization */); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_ids; std::vector output_begin_offsets; @@ -1249,13 +1256,15 @@ TEST_P(TestTokenizeSingleWord, TestNoOutputPieces) { TEST_P(TestTokenizeSingleWord, TestNoOutputPiecesOnlyOutputIds) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, spec.suffix_indicator, spec.unk_token, - true /* no_pretokenization */)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + true /* no_pretokenization */); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_ids; tokenizer.Tokenize(spec.input, &output_ids); @@ -1265,13 +1274,15 @@ TEST_P(TestTokenizeSingleWord, TestNoOutputPiecesOnlyOutputIds) { TEST_P(TestTokenizeSingleWord, TestNoOutputPiecesWithPositiveSentenceOffsets) { const Spec& spec = GetParam(); const int offset_in_sentence = 123; - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, spec.suffix_indicator, spec.unk_token, - true /* no_pretokenization */)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + true /* no_pretokenization */); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_ids; std::vector output_begin_offsets; @@ -2433,12 +2444,14 @@ using TestTokenizeText = testing::TestWithParam; TEST_P(TestTokenizeText, Test) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, - spec.suffix_indicator, spec.unk_token)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + spec.suffix_indicator, spec.unk_token); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_tokens; std::vector output_ids; @@ -2454,12 +2467,14 @@ TEST_P(TestTokenizeText, Test) { TEST_P(TestTokenizeText, TestNoOutputPieces) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, - spec.suffix_indicator, spec.unk_token)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + spec.suffix_indicator, spec.unk_token); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_ids; std::vector output_begin_offsets; @@ -2473,12 +2488,14 @@ TEST_P(TestTokenizeText, TestNoOutputPieces) { TEST_P(TestTokenizeText, TestNoOutputPiecesOnlyOutputIds) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, - spec.suffix_indicator, spec.unk_token)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + spec.suffix_indicator, spec.unk_token); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); std::vector output_ids; tokenizer.Tokenize(spec.input, &output_ids); @@ -2530,18 +2547,21 @@ using TestTokenizeDetokenize = testing::TestWithParam; TEST_P(TestTokenizeDetokenize, Test) { const Spec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - std::string flatbuffer, + auto flatbuffer_or = BuildModelAndExportToFlatBuffer(spec.vocab, spec.max_bytes_per_token, spec.suffix_indicator, spec.unk_token, /*no_pretokenization=*/true, - /*support_detokenization=*/true)); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - FastWordpieceTokenizer::Create(flatbuffer.data())); + /*support_detokenization=*/true); + ASSERT_TRUE(flatbuffer_or.ok()); + std::string flatbuffer = flatbuffer_or.value(); + auto tokenizer_or = FastWordpieceTokenizer::Create(flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); // Test detokenization. - ASSERT_OK_AND_ASSIGN(auto output_text, - tokenizer.Detokenize(spec.expected_token_ids)); + auto output_text_or = tokenizer.Detokenize(spec.expected_token_ids); + ASSERT_TRUE(output_text_or.ok()); + auto output_text = output_text_or.value(); EXPECT_THAT(output_text, spec.expected_detokenized_text); } diff --git a/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_utils_test.cc b/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_utils_test.cc index a36900542..13c78a738 100644 --- a/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_utils_test.cc +++ b/tensorflow_text/core/kernels/fast_wordpiece_tokenizer_utils_test.cc @@ -82,9 +82,9 @@ using TokenEncodingDecodingTest = testing::TestWithParam; TEST_P(TokenEncodingDecodingTest, GeneralTest) { const TokenSpec& spec = GetParam(); - ASSERT_OK_AND_ASSIGN( - auto encoded_value, - EncodeToken(spec.token_id, spec.token_length, spec.is_suffix_token)); + auto encoded_value_or = EncodeToken(spec.token_id, spec.token_length, spec.is_suffix_token); + ASSERT_TRUE(encoded_value_or.ok()); + auto encoded_value = encoded_value_or.value(); EXPECT_THAT(GetTokenId(encoded_value), spec.token_id); EXPECT_THAT(GetTokenLength(encoded_value), spec.token_length); EXPECT_THAT(IsSuffixToken(encoded_value), spec.is_suffix_token); diff --git a/tensorflow_text/core/kernels/log_greedy_constrained_sequence_kernel_test.cc b/tensorflow_text/core/kernels/log_greedy_constrained_sequence_kernel_test.cc index 6d9d89054..7fe33305b 100644 --- a/tensorflow_text/core/kernels/log_greedy_constrained_sequence_kernel_test.cc +++ b/tensorflow_text/core/kernels/log_greedy_constrained_sequence_kernel_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/kernels/ops_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/text_kernels_test_util.h" @@ -41,7 +41,7 @@ class LogGreedyConstrainedSequenceTest : public tensorflow::OpsTestBase { public: void SetUpOpWithDefaults() { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") .Attr("Tin", DT_INT32) .Attr("use_viterbi", false) .Attr("use_log_space", true) @@ -50,8 +50,8 @@ class LogGreedyConstrainedSequenceTest : public tensorflow::OpsTestBase { .Input(FakeInput()) .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -89,7 +89,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -135,7 +135,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -179,7 +179,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // Validate the output. @@ -221,7 +221,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, int64inint32out) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -267,7 +267,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, TwoDimensionalSequenceLengths) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -314,7 +314,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok; the next // highest is 1, but 1->OUT is not OK; the next highest is 0, which is OK. @@ -356,7 +356,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -399,7 +399,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -443,7 +443,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 0.1, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row and the last column in the // score tensor, so the real scores are: @@ -494,7 +494,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 0.1, // 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row and the last column in the // score tensor, so the real scores are: @@ -549,7 +549,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be summed with the last row in the weight tensor, so @@ -611,7 +611,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.5, 0.5, 0.5, 0.5, 1.0, // 3 0.1, 0.5, 0.5, 1.0, 1.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be summed with the last row in the weight tensor, so @@ -665,7 +665,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); std::vector expected_transitions({3, 0, 1}); std::vector expected_offsets({0, 1, 2, 3}); @@ -704,7 +704,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, }); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // Because all weights are zero, the max values should be the max of the // scores. @@ -749,7 +749,7 @@ TEST_F(LogGreedyConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // Validate the output. diff --git a/tensorflow_text/core/kernels/log_viterbi_constrained_sequence_kernel_test.cc b/tensorflow_text/core/kernels/log_viterbi_constrained_sequence_kernel_test.cc index 7e444a496..21257ca1b 100644 --- a/tensorflow_text/core/kernels/log_viterbi_constrained_sequence_kernel_test.cc +++ b/tensorflow_text/core/kernels/log_viterbi_constrained_sequence_kernel_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/framework/types.pb.h" #include "tensorflow/core/kernels/ops_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow/core/platform/status.h" #include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/text_kernels_test_util.h" @@ -45,7 +45,7 @@ class LogViterbiConstrainedSequenceTest : public tensorflow::OpsTestBase { public: void SetUpOpWithDefaults() { // Prepare graph. - TF_ASSERT_OK(NodeDefBuilder("tested_op", "ConstrainedSequence") + ASSERT_TRUE(NodeDefBuilder("tested_op", "ConstrainedSequence") .Attr("Tin", DT_INT32) .Attr("use_viterbi", true) .Attr("use_log_space", true) @@ -54,8 +54,8 @@ class LogViterbiConstrainedSequenceTest : public tensorflow::OpsTestBase { .Input(FakeInput()) .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -89,7 +89,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -135,7 +135,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -179,7 +179,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // Validate the output. @@ -221,7 +221,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, int64inint32out) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -267,7 +267,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, TwoDimensionalSequenceLengths) { // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok, so it's 1. // The second sequence's highest score is 3, which is ok. @@ -314,7 +314,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // The first sequence's highest score is 2, but OUT->2 is not ok; the next // highest is 1, but 1->OUT is not OK; the next highest is 0, which is OK. @@ -356,7 +356,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, // 10.0, 5.0, 3.0, 1.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -399,7 +399,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, // 10.0, 5.0, 3.0, 1.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -443,7 +443,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, // 10.0, 5.0, 3.0, 1.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -494,7 +494,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, 0.0, 0.0, 0.0, 0.0, 0.0, // 10.0, 5.0, 3.0, 1.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // All scores should be summed with the last row in the weight tensor, so // the 'real' scores are: @@ -548,7 +548,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, -7.0, 7.0, -8.0, 8.0, 0.0, // 3 0.0, 1.0, 2.0, 3.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be summed with the last row in the weight tensor, so the @@ -647,7 +647,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, -7.0, 7.0, -8.0, 8.0, 0.0, // 3 0.0, 1.0, 2.0, 3.0, 0.0}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // STEP 1: // All scores should be summed with the last row in the weight tensor, so the @@ -722,7 +722,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); std::vector expected_transitions({3, 0, 1}); std::vector expected_offsets({0, 1, 2, 3}); @@ -765,7 +765,7 @@ TEST_F(LogViterbiConstrainedSequenceTest, // Add the transition_weights input. AddInputFromArray(TensorShape({0, 0}), {}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); // Validate the output. diff --git a/tensorflow_text/core/kernels/mst_solver_test.cc b/tensorflow_text/core/kernels/mst_solver_test.cc index 782f7817e..9e7581f3e 100644 --- a/tensorflow_text/core/kernels/mst_solver_test.cc +++ b/tensorflow_text/core/kernels/mst_solver_test.cc @@ -20,7 +20,7 @@ #include #include -#include "tensorflow/core/lib/core/status_test_util.h" + namespace tensorflow { namespace text { @@ -66,15 +66,15 @@ class MstSolverTest : public ::testing::Test { // As above, but expects success. Does not assert anything about the solution // produced by the solver. void SolveAndExpectOk(int argmax_array_size) { - std::vector argmax(argmax_array_size); - TF_EXPECT_OK(solver_.Solve(&argmax)); + std::vector actual_argmax(argmax_array_size); + EXPECT_TRUE(solver_.Solve(&actual_argmax).ok()); } // As above, but expects the solution to be |expected_argmax| and infers the // argmax array size. - void SolveAndExpectArgmax(const std::vector &expected_argmax) { + void SolveAndExpectArgmax(const std::vector& expected_argmax) { std::vector actual_argmax(expected_argmax.size()); - TF_ASSERT_OK(solver_.Solve(&actual_argmax)); + ASSERT_TRUE(solver_.Solve(&actual_argmax).ok()); EXPECT_EQ(expected_argmax, actual_argmax); } @@ -109,7 +109,7 @@ TYPED_TEST(MstSolverTest, FailIfTooManyNodes) { TYPED_TEST(MstSolverTest, InfeasibleIfNoRootsNoArcs) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->SolveAndExpectError(kNumNodes, "Infeasible digraph"); } } @@ -117,7 +117,7 @@ TYPED_TEST(MstSolverTest, InfeasibleIfNoRootsNoArcs) { TYPED_TEST(MstSolverTest, InfeasibleIfNoRootsAllArcs) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllArcs(kNumNodes, 0); this->SolveAndExpectError(kNumNodes, "Infeasible digraph"); } @@ -126,7 +126,7 @@ TYPED_TEST(MstSolverTest, InfeasibleIfNoRootsAllArcs) { TYPED_TEST(MstSolverTest, FeasibleForForestOnlyIfAllRootsNoArcs) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); if (forest) { this->SolveAndExpectOk(kNumNodes); // all roots is a valid forest @@ -139,7 +139,7 @@ TYPED_TEST(MstSolverTest, FeasibleForForestOnlyIfAllRootsNoArcs) { TYPED_TEST(MstSolverTest, FeasibleIfAllRootsAllArcs) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); this->SolveAndExpectOk(kNumNodes); @@ -149,7 +149,7 @@ TYPED_TEST(MstSolverTest, FeasibleIfAllRootsAllArcs) { TYPED_TEST(MstSolverTest, FailIfArgmaxArrayTooSmall) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); this->SolveAndExpectError(kNumNodes - 1, // too small @@ -160,7 +160,7 @@ TYPED_TEST(MstSolverTest, FailIfArgmaxArrayTooSmall) { TYPED_TEST(MstSolverTest, OkIfArgmaxArrayTooLarge) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); this->SolveAndExpectOk(kNumNodes + 1); // too large @@ -170,7 +170,7 @@ TYPED_TEST(MstSolverTest, OkIfArgmaxArrayTooLarge) { TYPED_TEST(MstSolverTest, SolveForAllRootsForestOnly) { const int kNumNodes = 10; const bool forest = true; - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 1); // favor all root selections this->AddAllArcs(kNumNodes, 0); this->SolveAndExpectArgmax({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}); @@ -179,7 +179,7 @@ TYPED_TEST(MstSolverTest, SolveForAllRootsForestOnly) { TYPED_TEST(MstSolverTest, SolveForLeftToRightChain) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); for (int target = 1; target < kNumNodes; ++target) { @@ -192,7 +192,7 @@ TYPED_TEST(MstSolverTest, SolveForLeftToRightChain) { TYPED_TEST(MstSolverTest, SolveForRightToLeftChain) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); for (int source = 1; source < kNumNodes; ++source) { @@ -205,7 +205,7 @@ TYPED_TEST(MstSolverTest, SolveForRightToLeftChain) { TYPED_TEST(MstSolverTest, SolveForAllFromFirstTree) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); for (int target = 1; target < kNumNodes; ++target) { @@ -218,7 +218,7 @@ TYPED_TEST(MstSolverTest, SolveForAllFromFirstTree) { TYPED_TEST(MstSolverTest, SolveForAllFromLastTree) { const int kNumNodes = 10; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); for (int target = 0; target + 1 < kNumNodes; ++target) { @@ -231,7 +231,7 @@ TYPED_TEST(MstSolverTest, SolveForAllFromLastTree) { TYPED_TEST(MstSolverTest, SolveForBinaryTree) { const int kNumNodes = 15; for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, kNumNodes)); + ASSERT_TRUE(this->solver_.Init(forest, kNumNodes).ok()); this->AddAllRoots(kNumNodes, 0); this->AddAllArcs(kNumNodes, 0); for (int target = 1; target < kNumNodes; ++target) { @@ -248,7 +248,7 @@ TYPED_TEST(MstSolverTest, SolveForBinaryTree) { TYPED_TEST(MstSolverTest, ScoreAccessors) { for (const bool forest : {false, true}) { - TF_ASSERT_OK(this->solver_.Init(forest, 10)); + ASSERT_TRUE(this->solver_.Init(forest, 10).ok()); this->solver_.AddArc(0, 1, 0); this->solver_.AddArc(1, 4, 1); this->solver_.AddArc(7, 6, 2); diff --git a/tensorflow_text/core/kernels/phrase_tokenizer_test.cc b/tensorflow_text/core/kernels/phrase_tokenizer_test.cc index e8ae06570..31e6acdbf 100644 --- a/tensorflow_text/core/kernels/phrase_tokenizer_test.cc +++ b/tensorflow_text/core/kernels/phrase_tokenizer_test.cc @@ -51,8 +51,9 @@ TEST(PhraseTokenizerTest, Tokenize) { tensorflow::Env::Default(), kTestConfigPath, &config_flatbuffer); ASSERT_TRUE(status.ok()); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - PhraseTokenizer::Create(config_flatbuffer.data())); + auto tokenizer_or = PhraseTokenizer::Create(config_flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); tokenizer.Tokenize(input, &output_tokens, &output_token_ids); EXPECT_THAT(output_tokens, ElementsAre("I", "heard", "the news today")); @@ -69,8 +70,9 @@ TEST(PhraseTokenizerTest, TokenizeLonger) { tensorflow::Env::Default(), kTestConfigPath, &config_flatbuffer); ASSERT_TRUE(status.ok()); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - PhraseTokenizer::Create(config_flatbuffer.data())); + auto tokenizer_or = PhraseTokenizer::Create(config_flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); tokenizer.Tokenize(input, &output_tokens, &output_token_ids); EXPECT_THAT(output_tokens, @@ -86,8 +88,9 @@ TEST(PhraseTokenizerTest, DeTokenize) { tensorflow::Env::Default(), kTestConfigPath, &config_flatbuffer); ASSERT_TRUE(status.ok()); - ASSERT_OK_AND_ASSIGN(auto tokenizer, - PhraseTokenizer::Create(config_flatbuffer.data())); + auto tokenizer_or = PhraseTokenizer::Create(config_flatbuffer.data()); + ASSERT_TRUE(tokenizer_or.ok()); + auto tokenizer = std::move(tokenizer_or).value(); auto output_string = tokenizer.Detokenize(input); EXPECT_EQ(output_string.value(), "I heard the news today"); diff --git a/tensorflow_text/core/kernels/sentencepiece/BUILD b/tensorflow_text/core/kernels/sentencepiece/BUILD index 78e1eb8fd..ab0140582 100644 --- a/tensorflow_text/core/kernels/sentencepiece/BUILD +++ b/tensorflow_text/core/kernels/sentencepiece/BUILD @@ -247,11 +247,11 @@ cc_test( ":encoder_config", ":model_converter", ":optimized_encoder", - "//file/base:path", - "//file/localfile", - "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/log", + "@com_google_absl//absl/log:check", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:str_format", + "@com_google_googletest//:gtest_main", "@com_google_sentencepiece//:sentencepiece_cc_proto", "@com_google_sentencepiece//:sentencepiece_processor", # tf:lib tensorflow dep, @@ -270,10 +270,10 @@ cc_test( deps = [ ":model_converter", ":optimized_decoder", - "//file/base:path", - "//file/localfile", - "@com_google_googletest//:gtest_main", + "@com_google_absl//absl/log", + "@com_google_absl//absl/log:check", "@com_google_absl//absl/strings:str_format", + "@com_google_googletest//:gtest_main", "@com_google_sentencepiece//:sentencepiece_cc_proto", "@com_google_sentencepiece//:sentencepiece_processor", # tf:lib tensorflow dep, diff --git a/tensorflow_text/core/kernels/sentencepiece/optimized_decoder_test.cc b/tensorflow_text/core/kernels/sentencepiece/optimized_decoder_test.cc index 600941e76..b15c5697f 100644 --- a/tensorflow_text/core/kernels/sentencepiece/optimized_decoder_test.cc +++ b/tensorflow_text/core/kernels/sentencepiece/optimized_decoder_test.cc @@ -31,14 +31,11 @@ limitations under the License. #include -#include "file/base/path.h" #include #include #include "absl/strings/str_format.h" -#include "src/sentencepiece.proto.h" +#include "src/sentencepiece.pb.h" #include "src/sentencepiece_processor.h" -#include "tensorflow/core/platform/env.h" -#include "tensorflow/lite/kernels/test_util.h" #include "tensorflow_text/core/kernels/sentencepiece/model_converter.h" namespace tensorflow { @@ -47,12 +44,6 @@ namespace sentencepiece { namespace internal { -absl::Status TFReadFileToString(const std::string& filepath, - std::string* data) { - return tensorflow::ReadFileToString(tensorflow::Env::Default(), filepath, - data); -} - absl::Status StdReadFileToString(const std::string& filepath, std::string* data) { std::ifstream infile(filepath); @@ -72,14 +63,13 @@ absl::Status StdReadFileToString(const std::string& filepath, namespace { static char kConfigFilePath[] = - "/tensorflow_text/python/ops/test_data/" + "tensorflow_text/python/ops/test_data/" "fast_sentencepiece.model"; TEST(OptimizedEncoder, ConfigConverter) { std::string config; - auto status = internal::TFReadFileToString( - file::JoinPath(::testing::SrcDir(), kConfigFilePath), &config); + auto status = internal::StdReadFileToString(kConfigFilePath, &config); ASSERT_TRUE(status.ok()); ::sentencepiece::SentencePieceProcessor processor; diff --git a/tensorflow_text/core/kernels/sentencepiece/optimized_encoder_test.cc b/tensorflow_text/core/kernels/sentencepiece/optimized_encoder_test.cc index ecab756f4..8c2891de7 100644 --- a/tensorflow_text/core/kernels/sentencepiece/optimized_encoder_test.cc +++ b/tensorflow_text/core/kernels/sentencepiece/optimized_encoder_test.cc @@ -31,15 +31,12 @@ limitations under the License. #include -#include "file/base/path.h" #include #include #include "absl/status/status.h" #include "absl/strings/str_format.h" -#include "src/sentencepiece.proto.h" +#include "src/sentencepiece.pb.h" #include "src/sentencepiece_processor.h" -#include "tensorflow/core/platform/env.h" -#include "tensorflow/lite/kernels/test_util.h" #include "tensorflow_text/core/kernels/sentencepiece/double_array_trie_builder.h" #include "tensorflow_text/core/kernels/sentencepiece/encoder_config_generated.h" #include "tensorflow_text/core/kernels/sentencepiece/model_converter.h" @@ -50,12 +47,6 @@ namespace sentencepiece { namespace internal { -absl::Status TFReadFileToString(const std::string& filepath, - std::string* data) { - return tensorflow::ReadFileToString(tensorflow::Env::Default(), filepath, - data); -} - absl::Status StdReadFileToString(const std::string& filepath, std::string* data) { std::ifstream infile(filepath); @@ -74,7 +65,7 @@ absl::Status StdReadFileToString(const std::string& filepath, namespace { static char kConfigFilePath[] = - "/tensorflow_text/python/ops/test_data/" + "tensorflow_text/python/ops/test_data/" "fast_sentencepiece.model"; TEST(OptimizedEncoder, NormalizeStringWhitestpaces) { @@ -160,8 +151,7 @@ TEST(OptimizedEncoder, NormalizeStringWhitespacesRemove) { TEST(OptimizedEncoder, ConfigConverter) { std::string config; - auto status = internal::TFReadFileToString( - file::JoinPath(::testing::SrcDir(), kConfigFilePath), &config); + auto status = internal::StdReadFileToString(kConfigFilePath, &config); ASSERT_TRUE(status.ok()); ::sentencepiece::SentencePieceProcessor processor; diff --git a/tensorflow_text/core/kernels/text_kernels_test_util.h b/tensorflow_text/core/kernels/text_kernels_test_util.h index 9762b385f..e0a5c6e5e 100644 --- a/tensorflow_text/core/kernels/text_kernels_test_util.h +++ b/tensorflow_text/core/kernels/text_kernels_test_util.h @@ -21,10 +21,27 @@ #ifndef TENSORFLOW_TEXT_CORE_KERNELS_TEXT_KERNELS_TEST_UTIL_H_ #define TENSORFLOW_TEXT_CORE_KERNELS_TEXT_KERNELS_TEST_UTIL_H_ +#include + #include #include "tensorflow/core/framework/tensor.h" #include "tensorflow/core/framework/tensor_shape.h" -#include "tensorflow/core/framework/tensor_testutil.h" + +namespace tensorflow { +namespace test { +// Local ODR-safe implementation of AsTensor (avoids dependency on testlib). +// Constructs a tensor from |vals| with the given |shape|. +template +Tensor AsTensor(const std::vector& vals, const TensorShape& shape) { + Tensor ret(DataTypeToEnum::value, + TensorShape({static_cast(vals.size())})); + std::copy_n(vals.data(), vals.size(), ret.flat().data()); + Tensor out; + CHECK(out.CopyFrom(ret, shape)); + return out; +} +} // namespace test +} // namespace tensorflow namespace tensorflow { namespace text_kernels_test_util { diff --git a/tensorflow_text/core/kernels/unicode_script_tokenize_kernel_test.cc b/tensorflow_text/core/kernels/unicode_script_tokenize_kernel_test.cc index ebd84b10f..55a821838 100644 --- a/tensorflow_text/core/kernels/unicode_script_tokenize_kernel_test.cc +++ b/tensorflow_text/core/kernels/unicode_script_tokenize_kernel_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/kernels/ops_testutil.h" #include "tensorflow/core/lib/core/status.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow_text/core/kernels/text_kernels_test_util.h" namespace tensorflow { @@ -38,11 +38,11 @@ class UnicodeScriptTokenizeWithOffsetsKernelTest : public tensorflow::OpsTestBase { public: void MakeOp() { - TF_ASSERT_OK(NodeDefBuilder("tested_op", "UnicodeScriptTokenizeWithOffsets") + ASSERT_TRUE(NodeDefBuilder("tested_op", "UnicodeScriptTokenizeWithOffsets") .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -50,7 +50,7 @@ TEST_F(UnicodeScriptTokenizeWithOffsetsKernelTest, Test) { MakeOp(); AddInputFromArray(TensorShape({6}), {111, 112, 32, 116, 117, 118}); AddInputFromArray(TensorShape({3}), {0, 4, 6}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); std::vector expected_values({111, 112, 116, 117, 118}); std::vector expected_values_inner_splits({0, 2, 3, 5}); diff --git a/tensorflow_text/core/kernels/whitespace_tokenize_kernel_test.cc b/tensorflow_text/core/kernels/whitespace_tokenize_kernel_test.cc index d9792be45..e4ee9600c 100644 --- a/tensorflow_text/core/kernels/whitespace_tokenize_kernel_test.cc +++ b/tensorflow_text/core/kernels/whitespace_tokenize_kernel_test.cc @@ -22,7 +22,7 @@ #include "tensorflow/core/framework/tensor_shape.h" #include "tensorflow/core/kernels/ops_testutil.h" #include "tensorflow/core/lib/core/status.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow_text/core/kernels/text_kernels_test_util.h" namespace tensorflow { @@ -38,11 +38,11 @@ class WhitespaceTokenizeWithOffsetsKernelTest : public tensorflow::OpsTestBase { public: void MakeOp() { - TF_ASSERT_OK(NodeDefBuilder("tested_op", "WhitespaceTokenizeWithOffsets") + ASSERT_TRUE(NodeDefBuilder("tested_op", "WhitespaceTokenizeWithOffsets") .Input(FakeInput()) .Input(FakeInput()) - .Finalize(node_def())); - TF_ASSERT_OK(InitOp()); + .Finalize(node_def()).ok()); + ASSERT_TRUE(InitOp().ok()); } }; @@ -50,7 +50,7 @@ TEST_F(WhitespaceTokenizeWithOffsetsKernelTest, Test) { MakeOp(); AddInputFromArray(TensorShape({6}), {111, 112, 32, 116, 117, 118}); AddInputFromArray(TensorShape({3}), {0, 4, 6}); - TF_ASSERT_OK(RunOpKernel()); + ASSERT_TRUE(RunOpKernel().ok()); std::vector expected_values({111, 112, 116, 117, 118}); std::vector expected_values_inner_splits({0, 2, 3, 5}); diff --git a/tensorflow_text/core/kernels/whitespace_tokenizer_config_builder_test.cc b/tensorflow_text/core/kernels/whitespace_tokenizer_config_builder_test.cc index 9c8a2724b..e3141b9c7 100644 --- a/tensorflow_text/core/kernels/whitespace_tokenizer_config_builder_test.cc +++ b/tensorflow_text/core/kernels/whitespace_tokenizer_config_builder_test.cc @@ -35,7 +35,6 @@ #include "icu4c/source/common/unicode/utf.h" #include "icu4c/source/common/unicode/utf8.h" #include "icu4c/source/common/unicode/utypes.h" -#include "tensorflow/core/platform/types.h" #include "tensorflow_text/core/kernels/whitespace_tokenizer.h" namespace tensorflow { diff --git a/tensorflow_text/core/kernels/whitespace_tokenizer_test.cc b/tensorflow_text/core/kernels/whitespace_tokenizer_test.cc index aa94839f7..ce1b08fd6 100644 --- a/tensorflow_text/core/kernels/whitespace_tokenizer_test.cc +++ b/tensorflow_text/core/kernels/whitespace_tokenizer_test.cc @@ -17,7 +17,6 @@ #include #include #include "absl/flags/flag.h" -#include "tensorflow/core/platform/env.h" #include "tensorflow_text/core/kernels/whitespace_tokenizer_config_builder.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/tensorflow_text/core/ops/BUILD b/tensorflow_text/core/ops/BUILD index 79b489fce..1f757e988 100644 --- a/tensorflow_text/core/ops/BUILD +++ b/tensorflow_text/core/ops/BUILD @@ -16,10 +16,10 @@ cc_test( "byte_splitter_op_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:byte_splitter_kernel", ], ) @@ -32,10 +32,10 @@ cc_test( "boise_offset_converter_op_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:boise_offset_converter_kernel", ], ) @@ -48,10 +48,10 @@ cc_test( "fast_wordpiece_tokenizer_op_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:fast_wordpiece_tokenizer_kernel", ], ) @@ -64,10 +64,10 @@ cc_test( "sentence_fragmenter_v2_op_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:sentence_fragmenter_v2_kernel", ], ) @@ -80,11 +80,10 @@ cc_test( "trimmer_ops_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, - # tf/framework:tensor_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:round_robin_trimmer_kernel", ], ) @@ -97,11 +96,10 @@ cc_test( "utf8_binarize_op_test.cc", ], deps = [ - # tf:framework tensorflow dep, - # tf:protos_all_cc tensorflow dep, - # tf:test tensorflow dep, - # tf:test_main tensorflow dep, - # tf/framework:shape_inference_testutil tensorflow dep, + "@com_google_googletest//:gtest_main", + "@org_tensorflow//tensorflow/core:testlib", + "@org_tensorflow//tensorflow/core/platform:test_main", + "@org_tensorflow//tensorflow/lite/kernels/shim:tf_op_shim", "//tensorflow_text/core/kernels:utf8_binarize_kernel", ], ) diff --git a/tensorflow_text/core/ops/trimmer_ops_test.cc b/tensorflow_text/core/ops/trimmer_ops_test.cc index aa8f29046..4da1f0aa8 100644 --- a/tensorflow_text/core/ops/trimmer_ops_test.cc +++ b/tensorflow_text/core/ops/trimmer_ops_test.cc @@ -16,7 +16,7 @@ #include "tensorflow/core/framework/op.h" #include "tensorflow/core/framework/shape_inference_testutil.h" #include "tensorflow/core/framework/tensor_testutil.h" -#include "tensorflow/core/lib/core/status_test_util.h" + #include "tensorflow/core/platform/test.h" namespace tensorflow { @@ -30,13 +30,13 @@ TEST(RoundRobinGenerateMasksOpTest, ShapeFn) { std::vector inputs, input_splits; for (int i = 0; i < n; i++) inputs.emplace_back("a", 0, DT_INT32); for (int i = 0; i < n; i++) input_splits.emplace_back("b", 0, DT_INT64); - TF_ASSERT_OK(NodeDefBuilder("test", "TFText>RoundRobinGenerateMasks") + ASSERT_TRUE(NodeDefBuilder("test", "TFText>RoundRobinGenerateMasks") .Input({"max_seq", 0, DT_INT32}) .Input(inputs) .Input(input_splits) .Attr("N", n) .Attr("Tsplits", DT_INT64) - .Finalize(&op.node_def)); + .Finalize(&op.node_def).ok()); }; set_op(1); INFER_OK(op, "?;[?];[?]", "[?]"); @@ -71,13 +71,13 @@ TEST(RoundRobinTrimOpTest, ShapeFn) { std::vector inputs, input_splits; for (int i = 0; i < n; i++) inputs.emplace_back("a", 0, DT_INT32); for (int i = 0; i < n; i++) input_splits.emplace_back("b", 0, DT_INT64); - TF_ASSERT_OK(NodeDefBuilder("test", "TFText>RoundRobinTrim") + ASSERT_TRUE(NodeDefBuilder("test", "TFText>RoundRobinTrim") .Input({"max_seq", 0, DT_INT32}) .Input(inputs) .Input(input_splits) .Attr("N", n) .Attr("Tsplits", DT_INT64) - .Finalize(&op.node_def)); + .Finalize(&op.node_def).ok()); }; set_op(1); INFER_OK(op, "?;[?];[?]", "[?];[?]"); diff --git a/tensorflow_text/core/ops/utf8_binarize_op_test.cc b/tensorflow_text/core/ops/utf8_binarize_op_test.cc index 49b8ae486..223934e89 100644 --- a/tensorflow_text/core/ops/utf8_binarize_op_test.cc +++ b/tensorflow_text/core/ops/utf8_binarize_op_test.cc @@ -13,7 +13,7 @@ // limitations under the License. #include "tensorflow/core/framework/shape_inference_testutil.h" -#include "tensorflow/core/framework/attr_value.proto.h" +#include "tensorflow/core/framework/attr_value.pb.h" #include "tensorflow/core/platform/test.h" namespace tensorflow { diff --git a/tensorflow_text/core/pybinds/BUILD b/tensorflow_text/core/pybinds/BUILD index a8f5057d2..a0adada10 100644 --- a/tensorflow_text/core/pybinds/BUILD +++ b/tensorflow_text/core/pybinds/BUILD @@ -1,6 +1,6 @@ # Code that exposes C++ libraries to Python via pybind11. -load("@xla//third_party/rules_python/python:py_test.bzl", "py_test") +load("//third_party/rules_python/python:py_test.bzl", "py_test") load("//tensorflow_text:tftext.bzl", "if_pywrap", "pybind_extension", "pywrap_binaries", "pywrap_library") licenses(["notice"]) diff --git a/tensorflow_text/tftext.bzl b/tensorflow_text/tftext.bzl index e7a5b32be..5519da7d4 100644 --- a/tensorflow_text/tftext.bzl +++ b/tensorflow_text/tftext.bzl @@ -2,10 +2,10 @@ Build rules for open source tf.text libraries. """ load( - "@local_xla//third_party/py/rules_pywrap:pywrap.default.bzl", + "@xla//third_party/py/rules_pywrap:pywrap.default.bzl", _pybind_extension = "pybind_extension", _pywrap_binaries = "pywrap_binaries", - _pywrap_library = "pywrap_library" + _pywrap_library = "pywrap_library", ) def py_tf_text_library( @@ -154,7 +154,7 @@ def tf_cc_library( oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/strings:cord") oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/time") oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/types:variant") - oss_deps = oss_deps + _dedupe(deps, "@com_google_absl//absl/utility:if_constexpr") + deps += select({ "@org_tensorflow//tensorflow:mobile": [ "@org_tensorflow//tensorflow/core:portable_tensorflow_lib_lite", @@ -244,8 +244,8 @@ def extra_py_deps(): "@pypi_tensorflow_metadata//:pkg", ] -def py_library(name, lazy_imports = False, **kwargs): - _ = lazy_imports # buildifier: disable=unused-variable +def py_library(name, lazy_imports = False, strict_deps = None, **kwargs): + _ = (lazy_imports, strict_deps) # buildifier: disable=unused-variable native.py_library( name = name, **kwargs diff --git a/tensorflow_text/tools/wordpiece_vocab/BUILD b/tensorflow_text/tools/wordpiece_vocab/BUILD index ea04734e4..94b9552e9 100644 --- a/tensorflow_text/tools/wordpiece_vocab/BUILD +++ b/tensorflow_text/tools/wordpiece_vocab/BUILD @@ -1,5 +1,5 @@ -load("@xla//third_party/rules_python/python:py_library.bzl", "py_library") -load("@xla//third_party/rules_python/python:py_test.bzl", "py_test") +load("//third_party/rules_python/python:py_library.bzl", "py_library") +load("//third_party/rules_python/python:py_test.bzl", "py_test") load("//tensorflow_text:tftext.bzl", "if_pywrap") licenses(["notice"]) diff --git a/third_party/pybind11/BUILD.bzl b/third_party/pybind11/BUILD.bzl index f6031fb0e..14126b958 100644 --- a/third_party/pybind11/BUILD.bzl +++ b/third_party/pybind11/BUILD.bzl @@ -26,6 +26,6 @@ cc_library( includes = ["include"], strip_include_prefix = "include", deps = [ - "@local_xla//third_party/python_runtime:headers", + "@xla//third_party/python_runtime:headers", ], ) diff --git a/third_party/rules_python/python/BUILD b/third_party/rules_python/python/BUILD new file mode 100644 index 000000000..0382dc1ab --- /dev/null +++ b/third_party/rules_python/python/BUILD @@ -0,0 +1,2 @@ +# Wrapper package for rules_python py_library and py_test. +# Provides compat shims that accept (and ignore) the internal strict_deps attr. diff --git a/third_party/rules_python/python/py_library.bzl b/third_party/rules_python/python/py_library.bzl new file mode 100644 index 000000000..d4769af29 --- /dev/null +++ b/third_party/rules_python/python/py_library.bzl @@ -0,0 +1,6 @@ +"""Wrapper around rules_python py_library that accepts (and ignores) strict_deps.""" + +load("@rules_python//python:py_library.bzl", _py_library = "py_library") + +def py_library(strict_deps = None, **kwargs): + _py_library(**kwargs) diff --git a/third_party/rules_python/python/py_test.bzl b/third_party/rules_python/python/py_test.bzl new file mode 100644 index 000000000..693719240 --- /dev/null +++ b/third_party/rules_python/python/py_test.bzl @@ -0,0 +1,6 @@ +"""Wrapper around rules_python py_test that accepts (and ignores) strict_deps.""" + +load("@rules_python//python:py_test.bzl", _py_test = "py_test") + +def py_test(strict_deps = None, **kwargs): + _py_test(**kwargs) diff --git a/third_party/tensorflow/tensorflow.common_runtime.BUILD.patch b/third_party/tensorflow/tensorflow.common_runtime.BUILD.patch new file mode 100644 index 000000000..b9cf49b5e --- /dev/null +++ b/third_party/tensorflow/tensorflow.common_runtime.BUILD.patch @@ -0,0 +1,52 @@ +diff --git a/tensorflow/core/common_runtime/BUILD b/tensorflow/core/common_runtime/BUILD +--- a/tensorflow/core/common_runtime/BUILD ++++ b/tensorflow/core/common_runtime/BUILD +@@ -235,8 +235,3 @@ + "@eigen_archive//:eigen3", +- ] + if_static([ +- ":graph_constructor", +- ":graph_def_builder_util", +- "@com_google_absl//absl/algorithm:container", +- "@com_google_absl//absl/strings", +- ]), ++ ], + ) +@@ -448,4 +443,4 @@ + name = "copy_tensor", +- srcs = ["copy_tensor.cc"], ++ srcs = [], + hdrs = ["copy_tensor.h"], + copts = tf_copts(), +@@ -1070,6 +1065,3 @@ + "@xla//xla/tsl/platform:types", +- ] + if_static([ +- ":executor", +- ":rendezvous_mgr", +- ]), ++ ], + ) +@@ -2113,5 +2105,5 @@ + "//tensorflow/core/grappler:grappler_item", + "@com_google_absl//absl/synchronization", +- ] + if_static([":core_cpu_impl"]) + tf_protos_all() + tf_protos_grappler(), ++ ] + tf_protos_all() + tf_protos_grappler(), + ) +@@ -2130,5 +2122,3 @@ + name = "core_cpu_internal", +- srcs = [ +- "graph_execution_state.cc", +- ], ++ srcs = [], + hdrs = [ +@@ -2152,10 +2142,4 @@ + "@com_google_absl//absl/synchronization", + "@eigen_archive//:eigen3", +- ] + tf_additional_core_deps() + if_static([ +- ":core_cpu_impl", +- "//tensorflow/core:function_ops_op_lib", +- "//tensorflow/core:functional_grad", +- "//tensorflow/core:functional_ops_op_lib", +- "//tensorflow/core/kernels:required", +- ]), ++ ] + tf_additional_core_deps(), + alwayslink = 1, diff --git a/third_party/tensorflow/tensorflow.core.BUILD.patch b/third_party/tensorflow/tensorflow.core.BUILD.patch index f31c0fb39..f01f8d69b 100644 --- a/third_party/tensorflow/tensorflow.core.BUILD.patch +++ b/third_party/tensorflow/tensorflow.core.BUILD.patch @@ -1,13 +1,38 @@ diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD -index 69a2c5fcaad..7e790302036 100644 --- a/tensorflow/core/BUILD +++ b/tensorflow/core/BUILD -@@ -1639,7 +1639,7 @@ tf_cuda_library( +@@ -342,13 +342,10 @@ + visibility = ["//visibility:public"], + deps = [ +- ":function_ops_op_lib", +- ":functional_ops_op_lib", + ":lib", + ":lib_internal", + ":protos_all_cc", +- "//tensorflow/core/kernels:required", + "@com_google_absl//absl/status:status_matchers", + "@tsl//tsl/platform:test", + "@tsl//tsl/platform:test_benchmark", + ] + tf_additional_test_deps(), +@@ -1637,7 +1634,8 @@ "@eigen_archive//:eigen3", ] + if_static( extra_deps = [ - ":framework_internal_impl", + # ":framework_internal_impl", ++ "//tensorflow/core/util:managed_stack_trace", "@com_google_protobuf//:protobuf", ], otherwise = [ +@@ -1837,10 +1835,3 @@ + visibility = ["//visibility:public"], +- deps = ["//tensorflow/core/common_runtime:core_cpu_base_no_ops"] + if_static([ +- ":function_ops_op_lib", +- ":functional_grad", +- ":functional_ops_op_lib", +- "//tensorflow/core/common_runtime:stats_publisher_interface", +- "//tensorflow/core/framework:bounds_check", +- "//tensorflow/core/kernels:required", +- ]), ++ deps = ["//tensorflow/core/common_runtime:core_cpu_base_no_ops"], + alwayslink = 1, diff --git a/third_party/tensorflow/tensorflow.core.ops.BUILD.patch b/third_party/tensorflow/tensorflow.core.ops.BUILD.patch new file mode 100644 index 000000000..c02ccff66 --- /dev/null +++ b/third_party/tensorflow/tensorflow.core.ops.BUILD.patch @@ -0,0 +1,8 @@ +diff --git a/tensorflow/core/ops/BUILD b/tensorflow/core/ops/BUILD +--- a/tensorflow/core/ops/BUILD ++++ b/tensorflow/core/ops/BUILD +@@ -295,4 +295,2 @@ + ":filesystem_ops_op_lib", +- ":function_ops_op_lib", +- ":functional_ops_op_lib", + ":image_ops_op_lib", diff --git a/third_party/tensorflow/tensorflow.device_set.BUILD.patch b/third_party/tensorflow/tensorflow.device_set.BUILD.patch new file mode 100644 index 000000000..e2ee5af88 --- /dev/null +++ b/third_party/tensorflow/tensorflow.device_set.BUILD.patch @@ -0,0 +1,22 @@ +diff --git a/tensorflow/core/common_runtime/BUILD b/tensorflow/core/common_runtime/BUILD +--- a/tensorflow/core/common_runtime/BUILD ++++ b/tensorflow/core/common_runtime/BUILD +@@ -835,6 +835,7 @@ cc_library( + deps = [ + ":device", + ":device_factory", ++ "//tensorflow/core/util:managed_stack_trace", + "//tensorflow/core:lib", + "//tensorflow/core:lib_internal", + "@com_google_absl//absl/container:flat_hash_map", +diff --git a/tensorflow/core/util/BUILD b/tensorflow/core/util/BUILD +--- a/tensorflow/core/util/BUILD ++++ b/tensorflow/core/util/BUILD +@@ -538,6 +538,7 @@ cc_library( + visibility = [ + "//tensorflow:__pkg__", + "//tensorflow/c/eager:__pkg__", ++ "//tensorflow/core/common_runtime:__pkg__", + "//tensorflow/compiler/mlir/tensorflow:__pkg__", + "//tensorflow/core:__pkg__", + "//tensorflow/core/common_runtime/eager:__pkg__", diff --git a/third_party/tensorflow/tensorflow.framework.BUILD.patch b/third_party/tensorflow/tensorflow.framework.BUILD.patch new file mode 100644 index 000000000..63bfd16a6 --- /dev/null +++ b/third_party/tensorflow/tensorflow.framework.BUILD.patch @@ -0,0 +1,16 @@ +diff --git a/tensorflow/core/framework/BUILD b/tensorflow/core/framework/BUILD +--- a/tensorflow/core/framework/BUILD ++++ b/tensorflow/core/framework/BUILD +@@ -828,11 +828,2 @@ + name = "tensor", +- srcs = [ +- "log_memory.cc", +- "tensor.cc", +- "tensor_util.cc", +- "typed_allocator.cc", +- "types.cc", +- "variant.cc", +- "variant_op_registry.cc", +- "variant_tensor_data.cc", +- ], ++ srcs = [], diff --git a/third_party/tensorflow/tensorflow.grappler_optimizers.BUILD.patch b/third_party/tensorflow/tensorflow.grappler_optimizers.BUILD.patch new file mode 100644 index 000000000..8caf89ebf --- /dev/null +++ b/third_party/tensorflow/tensorflow.grappler_optimizers.BUILD.patch @@ -0,0 +1,17 @@ +diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD +--- a/tensorflow/core/grappler/optimizers/BUILD ++++ b/tensorflow/core/grappler/optimizers/BUILD +@@ -632,5 +632,5 @@ + defines = select({ + "//tensorflow:fuchsia": ["NO_LLVM_SUPPORT=1"], + "//tensorflow:ios_x86_64": ["NO_LLVM_SUPPORT=1"], +- "//conditions:default": ["NO_LLVM_SUPPORT=0"], ++ "//conditions:default": ["NO_LLVM_SUPPORT=1"], + }), +@@ -673,5 +673,5 @@ + "//tensorflow:fuchsia": [], + # LLVM does not build on most apple platforms. + "//tensorflow:ios_x86_64": [], +- "//conditions:default": [":tfg_optimizer_hook"], ++ "//conditions:default": [], + }), diff --git a/third_party/tensorflow/tensorflow.xla_allocator_registry.BUILD.patch b/third_party/tensorflow/tensorflow.xla_allocator_registry.BUILD.patch new file mode 100644 index 000000000..a9f2adb8e --- /dev/null +++ b/third_party/tensorflow/tensorflow.xla_allocator_registry.BUILD.patch @@ -0,0 +1,17 @@ +diff --git a/third_party/xla/xla/tsl/framework/BUILD b/third_party/xla/xla/tsl/framework/BUILD +--- a/third_party/xla/xla/tsl/framework/BUILD ++++ b/third_party/xla/xla/tsl/framework/BUILD +@@ -152,9 +152,11 @@ + "allocator.h", + "allocator_registry.cc", + "allocator_registry.h", +- "cpu_allocator_impl.cc", + "tracking_allocator.h", +- ], ++ ] + select({ ++ "//xla/tsl:framework_shared_object": [], ++ "//conditions:default": ["cpu_allocator_impl.cc"], ++ }), + visibility = internal_visibility([ + "//xla:__subpackages__", + "//tensorflow/core:__subpackages__", diff --git a/third_party/tensorflow/tensorflow.xla_if_static.bzl.patch b/third_party/tensorflow/tensorflow.xla_if_static.bzl.patch new file mode 100644 index 000000000..162ed9e5f --- /dev/null +++ b/third_party/tensorflow/tensorflow.xla_if_static.bzl.patch @@ -0,0 +1,23 @@ +diff --git a/third_party/xla/xla/tsl/platform/default/build_config_root.bzl b/third_party/xla/xla/tsl/platform/default/build_config_root.bzl +--- a/third_party/xla/xla/tsl/platform/default/build_config_root.bzl ++++ b/third_party/xla/xla/tsl/platform/default/build_config_root.bzl +@@ -89,9 +89,6 @@ + # used for all framework_shared_object platforms including MacOS. + # buildifier: disable=function-docstring + def if_static(extra_deps, otherwise = [], macos = []): +- if use_pywrap_rules(): +- return extra_deps +- + ret = { + str(Label("//xla/tsl:framework_shared_object")): otherwise, + "//conditions:default": extra_deps, +@@ -102,9 +99,6 @@ + + # TODO(b/356020232): remove completely after migration is done + def if_static_and_not_mobile(extra_deps, otherwise = []): +- if use_pywrap_rules(): +- return extra_deps +- + return select({ + str(Label("//xla/tsl:framework_shared_object")): otherwise, + str(Label("//xla/tsl:android")): otherwise, diff --git a/third_party/tensorflow/tf_configure.bzl b/third_party/tensorflow/tf_configure.bzl index e224a2e7a..4bcc97ee8 100644 --- a/third_party/tensorflow/tf_configure.bzl +++ b/third_party/tensorflow/tf_configure.bzl @@ -4,11 +4,17 @@ This is used for the generation of the dynamic libraries used for custom ops. See: http://github.com/tensorflow/custom-op """ -load("@python//:defs.bzl", "interpreter") -load("@python_version_repo//:py_version.bzl", "REQUIREMENTS_WITH_LOCAL_WHEELS") +load("@python_version_repo//:py_version.bzl", "HERMETIC_PYTHON_VERSION", "REQUIREMENTS_WITH_LOCAL_WHEELS") load("@rules_python//python:pip.bzl", "package_annotation", "pip_parse") def tf_configure(): + # In TF 2.21+, python_init_toolchains() creates versioned repos + # (e.g. @python_3_10, @python_3_10_host) instead of @python. + # pip_parse needs a real executable (not a select()-based alias), so we + # use the host repo which provides the actual interpreter binary. + _ver = HERMETIC_PYTHON_VERSION.replace(".", "_") + interpreter = "@python_%s_host//:python" % _ver + tensorflow_annotation = """ cc_library( name = "tf_header_lib",