Skip to content

Commit

Permalink
Reverts dd491d4
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 628242337
  • Loading branch information
@tensorflower-gardener
tensorflower-gardener committed Apr 26, 2024
1 parent c977e63 commit c2f3f78
Show file tree
Hide file tree
Showing 13 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions tensorflow/lite/acceleration/configuration/configuration_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/delegates/gpu/cl/compiled_program_cache_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/delegates/gpu/cl/serialization_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/delegates/gpu/common/gpu_model_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/delegates/gpu/common/task/serialization_base_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/experimental/acceleration/configuration/configuration_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/schema/conversion_metadata_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions tensorflow/lite/schema/schema_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/tools/cmake/modules/flatbuffers.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/ci_build/release/requirements_common.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/pip_package/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/tools/tf_sig_build_dockerfiles/devel.requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions third_party/flatbuffers/workspace.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit c2f3f78

Please sign in to comment.