mirror of
https://github.com/zebrajr/tensorflow.git
synced 2025-12-06 12:20:11 +01:00
Update flatbuffers to 25.2.10
No longer need to specify version by git commit. Use normal release version. PiperOrigin-RevId: 799253783
This commit is contained in:
parent
9e6009cc2d
commit
b5d169b91e
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
#include "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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
#include "tflite_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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -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 == 24 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 3 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 25,
|
||||
static_assert(FLATBUFFERS_VERSION_MAJOR == 25 &&
|
||||
FLATBUFFERS_VERSION_MINOR == 2 &&
|
||||
FLATBUFFERS_VERSION_REVISION == 10,
|
||||
"Non-compatible flatbuffers version included");
|
||||
|
||||
namespace tflite {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# This will change in the future.
|
||||
absl-py ~= 1.0.0
|
||||
astunparse ~= 1.6.3
|
||||
flatbuffers ~= 24.3.25
|
||||
flatbuffers ~= 25.2.10
|
||||
google_pasta ~= 0.2
|
||||
h5py ~= 3.10.0 # Earliest version for Python 3.12
|
||||
ml_dtypes ~= 0.5.1
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ def standard_or_nightly(standard, nightly):
|
|||
REQUIRED_PACKAGES = [
|
||||
'absl-py >= 1.0.0',
|
||||
'astunparse >= 1.6.0',
|
||||
'flatbuffers >= 24.3.25',
|
||||
'flatbuffers >= 25.2.10',
|
||||
'gast >=0.2.1,!=0.5.0,!=0.5.1,!=0.5.2',
|
||||
'google_pasta >= 0.1.1',
|
||||
'libclang >= 13.0.0',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# This will change in the future.
|
||||
absl-py ~= 1.0.0
|
||||
astunparse ~= 1.6.3
|
||||
flatbuffers ~= 24.3.25
|
||||
flatbuffers ~= 25.2.10
|
||||
google_pasta ~= 0.2
|
||||
h5py ~= 3.11.0 # Earliest version for NumPy 2.0
|
||||
ml_dtypes ~= 0.5.1 # Earliest version with mxfloat types
|
||||
|
|
|
|||
13
third_party/flatbuffers/workspace.bzl
vendored
13
third_party/flatbuffers/workspace.bzl
vendored
|
|
@ -2,20 +2,17 @@
|
|||
|
||||
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 = "e6463926479bd6b330cbcf673f7e917803fd5831"
|
||||
_FLATBUFFERS_VERSION = "25.2.10"
|
||||
|
||||
# curl -L https://github.com/google/flatbuffers/archive/<_FLATBUFFERS_GIT_COMMIT>.tar.gz | shasum -a 256
|
||||
_FLATBUFFERS_SHA256 = "c9c6b8653597ed7ee5c62243979010bd0f09b29a46be414505bc5b58a874bb17"
|
||||
# curl -L https://github.com/google/flatbuffers/archive/<_FLATBUFFERS_VERSION>.tar.gz | shasum -a 256
|
||||
_FLATBUFFERS_SHA256 = "b9c2df49707c57a48fc0923d52b8c73beb72d675f9d44b2211e4569be40a7421"
|
||||
|
||||
def repo():
|
||||
tf_http_archive(
|
||||
name = "flatbuffers",
|
||||
strip_prefix = "flatbuffers-%s" % _FLATBUFFERS_GIT_COMMIT,
|
||||
strip_prefix = "flatbuffers-%s" % _FLATBUFFERS_VERSION,
|
||||
sha256 = _FLATBUFFERS_SHA256,
|
||||
urls = tf_mirror_urls("https://github.com/google/flatbuffers/archive/%s.tar.gz" % _FLATBUFFERS_GIT_COMMIT),
|
||||
urls = tf_mirror_urls("https://github.com/google/flatbuffers/archive/v%s.tar.gz" % _FLATBUFFERS_VERSION),
|
||||
build_file = "//third_party/flatbuffers:flatbuffers.BUILD",
|
||||
system_build_file = "//third_party/flatbuffers:BUILD.system",
|
||||
link_files = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user