From c2f3f78e10f6e8c0de7b9d2577e5426cdc9c7370 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Thu, 25 Apr 2024 17:39:56 -0700 Subject: [PATCH] Reverts dd491d46f1737d41774e6efeabf694ef59845126 PiperOrigin-RevId: 628242337 --- .../acceleration/configuration/configuration_generated.h | 6 +++--- .../delegates/gpu/cl/compiled_program_cache_generated.h | 6 +++--- tensorflow/lite/delegates/gpu/cl/serialization_generated.h | 6 +++--- tensorflow/lite/delegates/gpu/common/gpu_model_generated.h | 6 +++--- .../gpu/common/task/serialization_base_generated.h | 6 +++--- .../acceleration/configuration/configuration_generated.h | 6 +++--- tensorflow/lite/schema/conversion_metadata_generated.h | 6 +++--- tensorflow/lite/schema/schema_generated.h | 6 +++--- tensorflow/lite/tools/cmake/modules/flatbuffers.cmake | 2 +- tensorflow/tools/ci_build/release/requirements_common.txt | 2 +- tensorflow/tools/pip_package/setup.py | 2 +- .../tools/tf_sig_build_dockerfiles/devel.requirements.txt | 2 +- third_party/flatbuffers/workspace.bzl | 4 ++-- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tensorflow/lite/acceleration/configuration/configuration_generated.h b/tensorflow/lite/acceleration/configuration/configuration_generated.h index aa6d94af9e30d8..ddc3b906c52fbf 100644 --- a/tensorflow/lite/acceleration/configuration/configuration_generated.h +++ b/tensorflow/lite/acceleration/configuration/configuration_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/delegates/gpu/cl/compiled_program_cache_generated.h b/tensorflow/lite/delegates/gpu/cl/compiled_program_cache_generated.h index 18cd2993d4c3a7..e40e15d201634d 100755 --- a/tensorflow/lite/delegates/gpu/cl/compiled_program_cache_generated.h +++ b/tensorflow/lite/delegates/gpu/cl/compiled_program_cache_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/delegates/gpu/cl/serialization_generated.h b/tensorflow/lite/delegates/gpu/cl/serialization_generated.h index 3f9912890fc1cf..f6ab567c69b92a 100755 --- a/tensorflow/lite/delegates/gpu/cl/serialization_generated.h +++ b/tensorflow/lite/delegates/gpu/cl/serialization_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); #include "gpu_model_generated.h" diff --git a/tensorflow/lite/delegates/gpu/common/gpu_model_generated.h b/tensorflow/lite/delegates/gpu/common/gpu_model_generated.h index d7bed1160faa23..be3afc53e41903 100755 --- a/tensorflow/lite/delegates/gpu/common/gpu_model_generated.h +++ b/tensorflow/lite/delegates/gpu/common/gpu_model_generated.h @@ -21,9 +21,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); #include "serialization_base_generated.h" diff --git a/tensorflow/lite/delegates/gpu/common/task/serialization_base_generated.h b/tensorflow/lite/delegates/gpu/common/task/serialization_base_generated.h index a700ba1716f8c0..7655fd0a6da73c 100755 --- a/tensorflow/lite/delegates/gpu/common/task/serialization_base_generated.h +++ b/tensorflow/lite/delegates/gpu/common/task/serialization_base_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h b/tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h index e49884e8e8f04f..e0364e0b603ef6 100644 --- a/tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h +++ b/tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/schema/conversion_metadata_generated.h b/tensorflow/lite/schema/conversion_metadata_generated.h index 2a059f65032a85..da28e045d33872 100755 --- a/tensorflow/lite/schema/conversion_metadata_generated.h +++ b/tensorflow/lite/schema/conversion_metadata_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/schema/schema_generated.h b/tensorflow/lite/schema/schema_generated.h index e8d6fba38fe9fa..c67b127cb40366 100755 --- a/tensorflow/lite/schema/schema_generated.h +++ b/tensorflow/lite/schema/schema_generated.h @@ -22,9 +22,9 @@ limitations under the License. // Ensure the included flatbuffers.h is the same version as when this file was // generated, otherwise it may not be compatible. -static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && - FLATBUFFERS_VERSION_MINOR == 5 && - FLATBUFFERS_VERSION_REVISION == 26, +static_assert(FLATBUFFERS_VERSION_MAJOR == 24 && + FLATBUFFERS_VERSION_MINOR == 3 && + FLATBUFFERS_VERSION_REVISION == 7, "Non-compatible flatbuffers version included"); namespace tflite { diff --git a/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake b/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake index 45d5b7f224948e..07edfd636a54eb 100644 --- a/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake +++ b/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake @@ -23,7 +23,7 @@ OverridableFetchContent_Declare( flatbuffers GIT_REPOSITORY https://github.com/google/flatbuffers # Sync with tensorflow/third_party/flatbuffers/workspace.bzl - GIT_TAG v23.5.26 + GIT_TAG v24.3.7 GIT_SHALLOW TRUE GIT_PROGRESS TRUE SOURCE_DIR "${CMAKE_BINARY_DIR}/flatbuffers" diff --git a/tensorflow/tools/ci_build/release/requirements_common.txt b/tensorflow/tools/ci_build/release/requirements_common.txt index f1ce7485a3dca2..39f630bd7f56da 100644 --- a/tensorflow/tools/ci_build/release/requirements_common.txt +++ b/tensorflow/tools/ci_build/release/requirements_common.txt @@ -3,7 +3,7 @@ # This will change in the future. absl-py ~= 1.0.0 astunparse ~= 1.6.3 -flatbuffers ~= 23.5.26 +flatbuffers ~= 24.3.7 google_pasta ~= 0.2 h5py ~= 3.10.0 # Earliest version for Python 3.12 ml_dtypes ~= 0.3.1 diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py index 20229d7aabf9dd..a02c7a80bb6854 100644 --- a/tensorflow/tools/pip_package/setup.py +++ b/tensorflow/tools/pip_package/setup.py @@ -78,7 +78,7 @@ def standard_or_nightly(standard, nightly): REQUIRED_PACKAGES = [ 'absl-py >= 1.0.0', 'astunparse >= 1.6.0', - 'flatbuffers >= 23.5.26', + 'flatbuffers >= 24.3.7', 'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2', 'google_pasta >= 0.1.1', 'h5py >= 3.10.0', diff --git a/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt b/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt index 480cdc54385e5a..c49e9d9c0f777e 100644 --- a/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt +++ b/tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt @@ -6,7 +6,7 @@ # This will change in the future. absl-py ~= 1.0.0 astunparse ~= 1.6.3 -flatbuffers ~= 23.5.26 +flatbuffers ~= 24.3.7 google_pasta ~= 0.2 h5py ~= 3.10.0 # Earliest version for Python 3.12 ml_dtypes ~= 0.3.1 diff --git a/third_party/flatbuffers/workspace.bzl b/third_party/flatbuffers/workspace.bzl index a0b943d7a9487b..1b2fe13661c2e5 100644 --- a/third_party/flatbuffers/workspace.bzl +++ b/third_party/flatbuffers/workspace.bzl @@ -5,10 +5,10 @@ load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls") # _FLATBUFFERS_GIT_COMMIT / _FLATBUFFERS_SHA256 were added due to an urgent change being made to # Flatbuffers that needed to be updated in order for Flatbuffers/TfLite be compatible with Android # API level >= 23. They can be removed next flatbuffers offical release / update. -_FLATBUFFERS_GIT_COMMIT = "7d6d99c6befa635780a4e944d37ebfd58e68a108" +_FLATBUFFERS_GIT_COMMIT = "6ff9e90e7e399f3977e99a315856b57c8afe5b4d" # curl -L https://github.com/google/flatbuffers/archive/<_FLATBUFFERS_GIT_COMMIT>.tar.gz | shasum -a 256 -_FLATBUFFERS_SHA256 = "d27761f6b2fb1017ec00ed317a7b98cb7aed86b81d90528b498fb17ec13579a1" +_FLATBUFFERS_SHA256 = "f4b3dfed9f8f4f0fd9f857fe96a46199cb5745ddb458cad20caf6837230ea188" def repo(): tf_http_archive(