experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Upgrade flatbuffer schema and flatbuffer versions.

Browse Source 
- Update the flatbuffer download URL to use a pinned version.
- Had to provide a mirror url that doesn't exist, since it is required
by the validation flow, the flatbuffer version will be added later.

PiperOrigin-RevId: 214487576
This commit is contained in:
Shashi Shekhar 2018-09-25 12:52:13 -07:00 committed by TensorFlower Gardener
parent 5b86e15240
commit b62cadc151
4 changed files with 89 additions and 71 deletions
tensorflow/contrib/lite
schema
schema_generated.h
tools/make
download_dependencies.sh
third_party/flatbuffers
BUILD.bazelworkspace.bzl

147
tensorflow/contrib/lite/schema/schema_generated.h
View File

@ -264,8 +264,8 @@ enum TensorType {
TensorType_MAX = TensorType_COMPLEX64
};
inline TensorType (&EnumValuesTensorType())[9] {
static TensorType values[] = {
inline const TensorType (&EnumValuesTensorType())[9] {
static const TensorType values[] = {
TensorType_FLOAT32,
TensorType_FLOAT16,
TensorType_INT32,
@ -279,8 +279,8 @@ inline TensorType (&EnumValuesTensorType())[9] {
return values;
}
inline const char **EnumNamesTensorType() {
static const char *names[] = {
inline const char * const *EnumNamesTensorType() {
static const char * const names[] = {
"FLOAT32",
"FLOAT16",
"INT32",
@ -399,8 +399,8 @@ enum BuiltinOperator {
BuiltinOperator_MAX = BuiltinOperator_FILL
};
inline BuiltinOperator (&EnumValuesBuiltinOperator())[94] {
static BuiltinOperator values[] = {
inline const BuiltinOperator (&EnumValuesBuiltinOperator())[94] {
static const BuiltinOperator values[] = {
BuiltinOperator_ADD,
BuiltinOperator_AVERAGE_POOL_2D,
BuiltinOperator_CONCATENATION,
@ -499,8 +499,8 @@ inline BuiltinOperator (&EnumValuesBuiltinOperator())[94] {
return values;
}
inline const char **EnumNamesBuiltinOperator() {
static const char *names[] = {
inline const char * const *EnumNamesBuiltinOperator() {
static const char * const names[] = {
"ADD",
"AVERAGE_POOL_2D",
"CONCATENATION",
@ -680,8 +680,8 @@ enum BuiltinOptions {
BuiltinOptions_MAX = BuiltinOptions_FillOptions
};
inline BuiltinOptions (&EnumValuesBuiltinOptions())[69] {
static BuiltinOptions values[] = {
inline const BuiltinOptions (&EnumValuesBuiltinOptions())[69] {
static const BuiltinOptions values[] = {
BuiltinOptions_NONE,
BuiltinOptions_Conv2DOptions,
BuiltinOptions_DepthwiseConv2DOptions,
@ -755,8 +755,8 @@ inline BuiltinOptions (&EnumValuesBuiltinOptions())[69] {
return values;
}
inline const char **EnumNamesBuiltinOptions() {
static const char *names[] = {
inline const char * const *EnumNamesBuiltinOptions() {
static const char * const names[] = {
"NONE",
"Conv2DOptions",
"DepthwiseConv2DOptions",
@ -1699,16 +1699,16 @@ enum Padding {
Padding_MAX = Padding_VALID
};
inline Padding (&EnumValuesPadding())[2] {
static Padding values[] = {
inline const Padding (&EnumValuesPadding())[2] {
static const Padding values[] = {
Padding_SAME,
Padding_VALID
};
return values;
}
inline const char **EnumNamesPadding() {
static const char *names[] = {
inline const char * const *EnumNamesPadding() {
static const char * const names[] = {
"SAME",
"VALID",
nullptr
@ -1732,8 +1732,8 @@ enum ActivationFunctionType {
ActivationFunctionType_MAX = ActivationFunctionType_SIGN_BIT
};
inline ActivationFunctionType (&EnumValuesActivationFunctionType())[6] {
static ActivationFunctionType values[] = {
inline const ActivationFunctionType (&EnumValuesActivationFunctionType())[6] {
static const ActivationFunctionType values[] = {
ActivationFunctionType_NONE,
ActivationFunctionType_RELU,
ActivationFunctionType_RELU_N1_TO_1,
@ -1744,8 +1744,8 @@ inline ActivationFunctionType (&EnumValuesActivationFunctionType())[6] {
return values;
}
inline const char **EnumNamesActivationFunctionType() {
static const char *names[] = {
inline const char * const *EnumNamesActivationFunctionType() {
static const char * const names[] = {
"NONE",
"RELU",
"RELU_N1_TO_1",
@ -1770,8 +1770,8 @@ enum LSHProjectionType {
LSHProjectionType_MAX = LSHProjectionType_DENSE
};
inline LSHProjectionType (&EnumValuesLSHProjectionType())[3] {
static LSHProjectionType values[] = {
inline const LSHProjectionType (&EnumValuesLSHProjectionType())[3] {
static const LSHProjectionType values[] = {
LSHProjectionType_UNKNOWN,
LSHProjectionType_SPARSE,
LSHProjectionType_DENSE
@ -1779,8 +1779,8 @@ inline LSHProjectionType (&EnumValuesLSHProjectionType())[3] {
return values;
}
inline const char **EnumNamesLSHProjectionType() {
static const char *names[] = {
inline const char * const *EnumNamesLSHProjectionType() {
static const char * const names[] = {
"UNKNOWN",
"SPARSE",
"DENSE",
@ -1801,16 +1801,16 @@ enum FullyConnectedOptionsWeightsFormat {
FullyConnectedOptionsWeightsFormat_MAX = FullyConnectedOptionsWeightsFormat_SHUFFLED4x16INT8
};
inline FullyConnectedOptionsWeightsFormat (&EnumValuesFullyConnectedOptionsWeightsFormat())[2] {
static FullyConnectedOptionsWeightsFormat values[] = {
inline const FullyConnectedOptionsWeightsFormat (&EnumValuesFullyConnectedOptionsWeightsFormat())[2] {
static const FullyConnectedOptionsWeightsFormat values[] = {
FullyConnectedOptionsWeightsFormat_DEFAULT,
FullyConnectedOptionsWeightsFormat_SHUFFLED4x16INT8
};
return values;
}
inline const char **EnumNamesFullyConnectedOptionsWeightsFormat() {
static const char *names[] = {
inline const char * const *EnumNamesFullyConnectedOptionsWeightsFormat() {
static const char * const names[] = {
"DEFAULT",
"SHUFFLED4x16INT8",
nullptr
@ -1830,16 +1830,16 @@ enum LSTMKernelType {
LSTMKernelType_MAX = LSTMKernelType_BASIC
};
inline LSTMKernelType (&EnumValuesLSTMKernelType())[2] {
static LSTMKernelType values[] = {
inline const LSTMKernelType (&EnumValuesLSTMKernelType())[2] {
static const LSTMKernelType values[] = {
LSTMKernelType_FULL,
LSTMKernelType_BASIC
};
return values;
}
inline const char **EnumNamesLSTMKernelType() {
static const char *names[] = {
inline const char * const *EnumNamesLSTMKernelType() {
static const char * const names[] = {
"FULL",
"BASIC",
nullptr
@ -1860,8 +1860,8 @@ enum CombinerType {
CombinerType_MAX = CombinerType_SQRTN
};
inline CombinerType (&EnumValuesCombinerType())[3] {
static CombinerType values[] = {
inline const CombinerType (&EnumValuesCombinerType())[3] {
static const CombinerType values[] = {
CombinerType_SUM,
CombinerType_MEAN,
CombinerType_SQRTN
@ -1869,8 +1869,8 @@ inline CombinerType (&EnumValuesCombinerType())[3] {
return values;
}
inline const char **EnumNamesCombinerType() {
static const char *names[] = {
inline const char * const *EnumNamesCombinerType() {
static const char * const names[] = {
"SUM",
"MEAN",
"SQRTN",
@ -1890,15 +1890,15 @@ enum CustomOptionsFormat {
CustomOptionsFormat_MAX = CustomOptionsFormat_FLEXBUFFERS
};
inline CustomOptionsFormat (&EnumValuesCustomOptionsFormat())[1] {
static CustomOptionsFormat values[] = {
inline const CustomOptionsFormat (&EnumValuesCustomOptionsFormat())[1] {
static const CustomOptionsFormat values[] = {
CustomOptionsFormat_FLEXBUFFERS
};
return values;
}
inline const char **EnumNamesCustomOptionsFormat() {
static const char *names[] = {
inline const char * const *EnumNamesCustomOptionsFormat() {
static const char * const names[] = {
"FLEXBUFFERS",
nullptr
};
@ -1943,13 +1943,13 @@ struct QuantizationParameters FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tab
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_MIN) &&
verifier.Verify(min()) &&
verifier.VerifyVector(min()) &&
VerifyOffset(verifier, VT_MAX) &&
verifier.Verify(max()) &&
verifier.VerifyVector(max()) &&
VerifyOffset(verifier, VT_SCALE) &&
verifier.Verify(scale()) &&
verifier.VerifyVector(scale()) &&
VerifyOffset(verifier, VT_ZERO_POINT) &&
verifier.Verify(zero_point()) &&
verifier.VerifyVector(zero_point()) &&
verifier.EndTable();
}
QuantizationParametersT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -2060,11 +2060,11 @@ struct Tensor FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_SHAPE) &&
verifier.Verify(shape()) &&
verifier.VerifyVector(shape()) &&
VerifyField<int8_t>(verifier, VT_TYPE) &&
VerifyField<uint32_t>(verifier, VT_BUFFER) &&
VerifyOffset(verifier, VT_NAME) &&
verifier.Verify(name()) &&
verifier.VerifyString(name()) &&
VerifyOffset(verifier, VT_QUANTIZATION) &&
verifier.VerifyTable(quantization()) &&
VerifyField<uint8_t>(verifier, VT_IS_VARIABLE) &&
@ -2530,9 +2530,9 @@ struct ConcatEmbeddingsOptions FLATBUFFERS_FINAL_CLASS : private flatbuffers::Ta
return VerifyTableStart(verifier) &&
VerifyField<int32_t>(verifier, VT_NUM_CHANNELS) &&
VerifyOffset(verifier, VT_NUM_COLUMNS_PER_CHANNEL) &&
verifier.Verify(num_columns_per_channel()) &&
verifier.VerifyVector(num_columns_per_channel()) &&
VerifyOffset(verifier, VT_EMBEDDING_DIM_PER_CHANNEL) &&
verifier.Verify(embedding_dim_per_channel()) &&
verifier.VerifyVector(embedding_dim_per_channel()) &&
verifier.EndTable();
}
ConcatEmbeddingsOptionsT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -3630,7 +3630,7 @@ struct ReshapeOptions FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_NEW_SHAPE) &&
verifier.Verify(new_shape()) &&
verifier.VerifyVector(new_shape()) &&
verifier.EndTable();
}
ReshapeOptionsT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -4294,7 +4294,7 @@ struct SqueezeOptions FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_SQUEEZE_DIMS) &&
verifier.Verify(squeeze_dims()) &&
verifier.VerifyVector(squeeze_dims()) &&
verifier.EndTable();
}
SqueezeOptionsT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -6041,7 +6041,7 @@ struct OperatorCode FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
return VerifyTableStart(verifier) &&
VerifyField<int8_t>(verifier, VT_BUILTIN_CODE) &&
VerifyOffset(verifier, VT_CUSTOM_CODE) &&
verifier.Verify(custom_code()) &&
verifier.VerifyString(custom_code()) &&
VerifyField<int32_t>(verifier, VT_VERSION) &&
verifier.EndTable();
}
@ -6360,17 +6360,17 @@ struct Operator FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
return VerifyTableStart(verifier) &&
VerifyField<uint32_t>(verifier, VT_OPCODE_INDEX) &&
VerifyOffset(verifier, VT_INPUTS) &&
verifier.Verify(inputs()) &&
verifier.VerifyVector(inputs()) &&
VerifyOffset(verifier, VT_OUTPUTS) &&
verifier.Verify(outputs()) &&
verifier.VerifyVector(outputs()) &&
VerifyField<uint8_t>(verifier, VT_BUILTIN_OPTIONS_TYPE) &&
VerifyOffset(verifier, VT_BUILTIN_OPTIONS) &&
VerifyBuiltinOptions(verifier, builtin_options(), builtin_options_type()) &&
VerifyOffset(verifier, VT_CUSTOM_OPTIONS) &&
verifier.Verify(custom_options()) &&
verifier.VerifyVector(custom_options()) &&
VerifyField<int8_t>(verifier, VT_CUSTOM_OPTIONS_FORMAT) &&
VerifyOffset(verifier, VT_MUTATING_VARIABLE_INPUTS) &&
verifier.Verify(mutating_variable_inputs()) &&
verifier.VerifyVector(mutating_variable_inputs()) &&
verifier.EndTable();
}
OperatorT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -6773,17 +6773,17 @@ struct SubGraph FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_TENSORS) &&
verifier.Verify(tensors()) &&
verifier.VerifyVector(tensors()) &&
verifier.VerifyVectorOfTables(tensors()) &&
VerifyOffset(verifier, VT_INPUTS) &&
verifier.Verify(inputs()) &&
verifier.VerifyVector(inputs()) &&
VerifyOffset(verifier, VT_OUTPUTS) &&
verifier.Verify(outputs()) &&
verifier.VerifyVector(outputs()) &&
VerifyOffset(verifier, VT_OPERATORS) &&
verifier.Verify(operators()) &&
verifier.VerifyVector(operators()) &&
verifier.VerifyVectorOfTables(operators()) &&
VerifyOffset(verifier, VT_NAME) &&
verifier.Verify(name()) &&
verifier.VerifyString(name()) &&
verifier.EndTable();
}
SubGraphT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -6873,7 +6873,7 @@ struct Buffer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyOffset(verifier, VT_DATA) &&
verifier.Verify(data()) &&
verifier.VerifyVector(data()) &&
verifier.EndTable();
}
BufferT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -6962,18 +6962,18 @@ struct Model FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
return VerifyTableStart(verifier) &&
VerifyField<uint32_t>(verifier, VT_VERSION) &&
VerifyOffset(verifier, VT_OPERATOR_CODES) &&
verifier.Verify(operator_codes()) &&
verifier.VerifyVector(operator_codes()) &&
verifier.VerifyVectorOfTables(operator_codes()) &&
VerifyOffset(verifier, VT_SUBGRAPHS) &&
verifier.Verify(subgraphs()) &&
verifier.VerifyVector(subgraphs()) &&
verifier.VerifyVectorOfTables(subgraphs()) &&
VerifyOffset(verifier, VT_DESCRIPTION) &&
verifier.Verify(description()) &&
verifier.VerifyString(description()) &&
VerifyOffset(verifier, VT_BUFFERS) &&
verifier.Verify(buffers()) &&
verifier.VerifyVector(buffers()) &&
verifier.VerifyVectorOfTables(buffers()) &&
VerifyOffset(verifier, VT_METADATA_BUFFER) &&
verifier.Verify(metadata_buffer()) &&
verifier.VerifyVector(metadata_buffer()) &&
verifier.EndTable();
}
ModelT *UnPack(const flatbuffers::resolver_function_t *_resolver = nullptr) const;
@ -10628,6 +10628,10 @@ inline const tflite::Model *GetModel(const void *buf) {
return flatbuffers::GetRoot<tflite::Model>(buf);
}
inline const tflite::Model *GetSizePrefixedModel(const void *buf) {
return flatbuffers::GetSizePrefixedRoot<tflite::Model>(buf);
}
inline const char *ModelIdentifier() {
return "TFL3";
}
@ -10642,6 +10646,11 @@ inline bool VerifyModelBuffer(
return verifier.VerifyBuffer<tflite::Model>(ModelIdentifier());
}
inline bool VerifySizePrefixedModelBuffer(
flatbuffers::Verifier &verifier) {
return verifier.VerifySizePrefixedBuffer<tflite::Model>(ModelIdentifier());
}
inline const char *ModelExtension() {
return "tflite";
}
@ -10652,6 +10661,12 @@ inline void FinishModelBuffer(
fbb.Finish(root, ModelIdentifier());
}
inline void FinishSizePrefixedModelBuffer(
flatbuffers::FlatBufferBuilder &fbb,
flatbuffers::Offset<tflite::Model> root) {
fbb.FinishSizePrefixed(root, ModelIdentifier());
}
inline std::unique_ptr<ModelT> UnPackModel(
const void *buf,
const flatbuffers::resolver_function_t *res = nullptr) {

2
tensorflow/contrib/lite/tools/make/download_dependencies.sh
View File

@ -35,7 +35,7 @@ GOOGLETEST_URL="https://github.com/google/googletest/archive/release-1.8.0.tar.g
ABSL_URL="$(grep -o 'https://github.com/abseil/abseil-cpp/.*tar.gz' "${BZL_FILE_PATH}" | head -n1)"
NEON_2_SSE_URL="https://github.com/intel/ARM_NEON_2_x86_SSE/archive/master.zip"
FARMHASH_URL="https://mirror.bazel.build/github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz"
FLATBUFFERS_URL="https://github.com/google/flatbuffers/archive/v1.8.0.zip"
FLATBUFFERS_URL="https://github.com/google/flatbuffers/archive/1f5eae5d6a135ff6811724f6c57f911d1f46bb15.tar.gz"
FFT2D_URL="https://mirror.bazel.build/www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz"
# TODO(petewarden): Some new code in Eigen triggers a clang bug with iOS arm64,

3
third_party/flatbuffers/BUILD.bazel vendored
View File

@ -108,11 +108,14 @@ cc_binary(
"grpc/src/compiler/schema_interface.h",
"src/flatc_main.cpp",
"src/idl_gen_cpp.cpp",
"src/idl_gen_dart.cpp",
"src/idl_gen_general.cpp",
"src/idl_gen_go.cpp",
"src/idl_gen_grpc.cpp",
"src/idl_gen_js.cpp",
"src/idl_gen_json_schema.cpp",
"src/idl_gen_lobster.cpp",
"src/idl_gen_lua.cpp",
"src/idl_gen_php.cpp",
"src/idl_gen_python.cpp",
"src/idl_gen_text.cpp",

8
third_party/flatbuffers/workspace.bzl vendored
View File

@ -5,11 +5,11 @@ load("//third_party:repo.bzl", "third_party_http_archive")
def repo():
third_party_http_archive(
name = "flatbuffers",
strip_prefix = "flatbuffers-1.9.0",
sha256 = "5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3",
strip_prefix = "flatbuffers-1f5eae5d6a135ff6811724f6c57f911d1f46bb15",
sha256 = "b2bb0311ca40b12ebe36671bdda350b10c7728caf0cfe2d432ea3b6e409016f3",
urls = [
"https://mirror.bazel.build/github.com/google/flatbuffers/archive/v1.9.0.tar.gz",
"https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz",
"https://mirror.bazel.build/github.com/google/flatbuffers/archive/1f5eae5d6a135ff6811724f6c57f911d1f46bb15.tar.gz",
"https://github.com/google/flatbuffers/archive/1f5eae5d6a135ff6811724f6c57f911d1f46bb15.tar.gz",
],
build_file = "//third_party/flatbuffers:BUILD.bazel",
system_build_file = "//third_party/flatbuffers:BUILD.system",