From b392e9845b7f40ab0c389f29f13f6ec84dd814d1 Mon Sep 17 00:00:00 2001 From: mathad01 Date: Wed, 7 Apr 2021 12:07:30 +0100 Subject: IVGCVSW-5410 Add front-end support for CAST IVGCVSW-5415 Add TfLiteParser support for CAST * Added front end support for CAST, including support in the Reference workload, Serialization, Deserializtion, Unit tests, and TfLiteParser. Signed-off-by: mathad01 Change-Id: Iaf670ca5912a21ed6bc84f7f83a68b42154846bb --- src/armnnSerializer/ArmnnSchema_generated.h | 87 +++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 10 deletions(-) (limited to 'src/armnnSerializer/ArmnnSchema_generated.h') diff --git a/src/armnnSerializer/ArmnnSchema_generated.h b/src/armnnSerializer/ArmnnSchema_generated.h index 2cd88e2718..dfa496647f 100644 --- a/src/armnnSerializer/ArmnnSchema_generated.h +++ b/src/armnnSerializer/ArmnnSchema_generated.h @@ -61,6 +61,9 @@ struct ArgMinMaxLayerBuilder; struct ArgMinMaxDescriptor; struct ArgMinMaxDescriptorBuilder; +struct CastLayer; +struct CastLayerBuilder; + struct ComparisonDescriptor; struct ComparisonDescriptorBuilder; @@ -731,11 +734,12 @@ enum LayerType { LayerType_Rank = 58, LayerType_LogicalBinary = 59, LayerType_Reduce = 60, + LayerType_Cast = 61, LayerType_MIN = LayerType_Addition, - LayerType_MAX = LayerType_Reduce + LayerType_MAX = LayerType_Cast }; -inline const LayerType (&EnumValuesLayerType())[61] { +inline const LayerType (&EnumValuesLayerType())[62] { static const LayerType values[] = { LayerType_Addition, LayerType_Input, @@ -797,13 +801,14 @@ inline const LayerType (&EnumValuesLayerType())[61] { LayerType_Fill, LayerType_Rank, LayerType_LogicalBinary, - LayerType_Reduce + LayerType_Reduce, + LayerType_Cast }; return values; } inline const char * const *EnumNamesLayerType() { - static const char * const names[62] = { + static const char * const names[63] = { "Addition", "Input", "Multiplication", @@ -865,13 +870,14 @@ inline const char * const *EnumNamesLayerType() { "Rank", "LogicalBinary", "Reduce", + "Cast", nullptr }; return names; } inline const char *EnumNameLayerType(LayerType e) { - if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_Reduce)) return ""; + if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_Cast)) return ""; const size_t index = static_cast(e); return EnumNamesLayerType()[index]; } @@ -1206,11 +1212,12 @@ enum Layer { Layer_RankLayer = 59, Layer_LogicalBinaryLayer = 60, Layer_ReduceLayer = 61, + Layer_CastLayer = 62, Layer_MIN = Layer_NONE, - Layer_MAX = Layer_ReduceLayer + Layer_MAX = Layer_CastLayer }; -inline const Layer (&EnumValuesLayer())[62] { +inline const Layer (&EnumValuesLayer())[63] { static const Layer values[] = { Layer_NONE, Layer_ActivationLayer, @@ -1273,13 +1280,14 @@ inline const Layer (&EnumValuesLayer())[62] { Layer_FillLayer, Layer_RankLayer, Layer_LogicalBinaryLayer, - Layer_ReduceLayer + Layer_ReduceLayer, + Layer_CastLayer }; return values; } inline const char * const *EnumNamesLayer() { - static const char * const names[63] = { + static const char * const names[64] = { "NONE", "ActivationLayer", "AdditionLayer", @@ -1342,13 +1350,14 @@ inline const char * const *EnumNamesLayer() { "RankLayer", "LogicalBinaryLayer", "ReduceLayer", + "CastLayer", nullptr }; return names; } inline const char *EnumNameLayer(Layer e) { - if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_ReduceLayer)) return ""; + if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_CastLayer)) return ""; const size_t index = static_cast(e); return EnumNamesLayer()[index]; } @@ -1601,6 +1610,10 @@ template<> struct LayerTraits { static const Layer enum_value = Layer_ReduceLayer; }; +template<> struct LayerTraits { + static const Layer enum_value = Layer_CastLayer; +}; + bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer type); bool VerifyLayerVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector> *values, const flatbuffers::Vector *types); @@ -2640,6 +2653,49 @@ inline flatbuffers::Offset CreateArgMinMaxDescriptor( return builder_.Finish(); } +struct CastLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { + typedef CastLayerBuilder Builder; + enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { + VT_BASE = 4 + }; + const armnnSerializer::LayerBase *base() const { + return GetPointer(VT_BASE); + } + bool Verify(flatbuffers::Verifier &verifier) const { + return VerifyTableStart(verifier) && + VerifyOffset(verifier, VT_BASE) && + verifier.VerifyTable(base()) && + verifier.EndTable(); + } +}; + +struct CastLayerBuilder { + typedef CastLayer Table; + flatbuffers::FlatBufferBuilder &fbb_; + flatbuffers::uoffset_t start_; + void add_base(flatbuffers::Offset base) { + fbb_.AddOffset(CastLayer::VT_BASE, base); + } + explicit CastLayerBuilder(flatbuffers::FlatBufferBuilder &_fbb) + : fbb_(_fbb) { + start_ = fbb_.StartTable(); + } + CastLayerBuilder &operator=(const CastLayerBuilder &); + flatbuffers::Offset Finish() { + const auto end = fbb_.EndTable(start_); + auto o = flatbuffers::Offset(end); + return o; + } +}; + +inline flatbuffers::Offset CreateCastLayer( + flatbuffers::FlatBufferBuilder &_fbb, + flatbuffers::Offset base = 0) { + CastLayerBuilder builder_(_fbb); + builder_.add_base(base); + return builder_.Finish(); +} + struct ComparisonDescriptor FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { typedef ComparisonDescriptorBuilder Builder; enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE { @@ -9502,6 +9558,9 @@ struct AnyLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table { const armnnSerializer::ReduceLayer *layer_as_ReduceLayer() const { return layer_type() == armnnSerializer::Layer_ReduceLayer ? static_cast(layer()) : nullptr; } + const armnnSerializer::CastLayer *layer_as_CastLayer() const { + return layer_type() == armnnSerializer::Layer_CastLayer ? static_cast(layer()) : nullptr; + } bool Verify(flatbuffers::Verifier &verifier) const { return VerifyTableStart(verifier) && VerifyField(verifier, VT_LAYER_TYPE) && @@ -9755,6 +9814,10 @@ template<> inline const armnnSerializer::ReduceLayer *AnyLayer::layer_as inline const armnnSerializer::CastLayer *AnyLayer::layer_as() const { + return layer_as_CastLayer(); +} + struct AnyLayerBuilder { typedef AnyLayer Table; flatbuffers::FlatBufferBuilder &fbb_; @@ -10209,6 +10272,10 @@ inline bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer auto ptr = reinterpret_cast(obj); return verifier.VerifyTable(ptr); } + case Layer_CastLayer: { + auto ptr = reinterpret_cast(obj); + return verifier.VerifyTable(ptr); + } default: return true; } } -- cgit v1.2.1