aboutsummaryrefslogtreecommitdiff
path: root/src/armnnSerializer
diff options
context:
space:
mode:
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r--src/armnnSerializer/ArmnnSchema.fbs6
-rw-r--r--src/armnnSerializer/ArmnnSchema_generated.h89
-rw-r--r--src/armnnSerializer/Serializer.cpp16
-rw-r--r--src/armnnSerializer/Serializer.hpp3
-rw-r--r--src/armnnSerializer/test/SerializerTests.cpp64
5 files changed, 167 insertions, 11 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index c8ffce48bc..f301fce818 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -181,6 +181,7 @@ enum LayerType : uint {
ChannelShuffle = 64,
Convolution3d = 65,
Pooling3d = 66,
+ GatherNd = 67,
}
// Base layer table to be used as part of other layers
@@ -382,6 +383,10 @@ table GatherDescriptor {
axis:int = 0;
}
+table GatherNdLayer {
+ base:LayerBase;
+}
+
/// @deprecated Use ComparisonLayer instead
table GreaterLayer {
base:LayerBase;
@@ -1072,6 +1077,7 @@ union Layer {
ChannelShuffleLayer,
Convolution3dLayer,
Pooling3dLayer,
+ GatherNdLayer,
}
table AnyLayer {
diff --git a/src/armnnSerializer/ArmnnSchema_generated.h b/src/armnnSerializer/ArmnnSchema_generated.h
index 76a6460c85..8f803f5af2 100644
--- a/src/armnnSerializer/ArmnnSchema_generated.h
+++ b/src/armnnSerializer/ArmnnSchema_generated.h
@@ -1,5 +1,5 @@
//
-// Copyright © 2021 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
// SPDX-License-Identifier: MIT
//
// automatically generated by the FlatBuffers compiler, do not modify
@@ -131,6 +131,9 @@ struct GatherLayerBuilder;
struct GatherDescriptor;
struct GatherDescriptorBuilder;
+struct GatherNdLayer;
+struct GatherNdLayerBuilder;
+
struct GreaterLayer;
struct GreaterLayerBuilder;
@@ -777,11 +780,12 @@ enum LayerType {
LayerType_ChannelShuffle = 64,
LayerType_Convolution3d = 65,
LayerType_Pooling3d = 66,
+ LayerType_GatherNd = 67,
LayerType_MIN = LayerType_Addition,
- LayerType_MAX = LayerType_Pooling3d
+ LayerType_MAX = LayerType_GatherNd
};
-inline const LayerType (&EnumValuesLayerType())[67] {
+inline const LayerType (&EnumValuesLayerType())[68] {
static const LayerType values[] = {
LayerType_Addition,
LayerType_Input,
@@ -849,13 +853,14 @@ inline const LayerType (&EnumValuesLayerType())[67] {
LayerType_UnidirectionalSequenceLstm,
LayerType_ChannelShuffle,
LayerType_Convolution3d,
- LayerType_Pooling3d
+ LayerType_Pooling3d,
+ LayerType_GatherNd
};
return values;
}
inline const char * const *EnumNamesLayerType() {
- static const char * const names[68] = {
+ static const char * const names[69] = {
"Addition",
"Input",
"Multiplication",
@@ -923,13 +928,14 @@ inline const char * const *EnumNamesLayerType() {
"ChannelShuffle",
"Convolution3d",
"Pooling3d",
+ "GatherNd",
nullptr
};
return names;
}
inline const char *EnumNameLayerType(LayerType e) {
- if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_Pooling3d)) return "";
+ if (flatbuffers::IsOutRange(e, LayerType_Addition, LayerType_GatherNd)) return "";
const size_t index = static_cast<size_t>(e);
return EnumNamesLayerType()[index];
}
@@ -1309,11 +1315,12 @@ enum Layer {
Layer_ChannelShuffleLayer = 65,
Layer_Convolution3dLayer = 66,
Layer_Pooling3dLayer = 67,
+ Layer_GatherNdLayer = 68,
Layer_MIN = Layer_NONE,
- Layer_MAX = Layer_Pooling3dLayer
+ Layer_MAX = Layer_GatherNdLayer
};
-inline const Layer (&EnumValuesLayer())[68] {
+inline const Layer (&EnumValuesLayer())[69] {
static const Layer values[] = {
Layer_NONE,
Layer_ActivationLayer,
@@ -1382,13 +1389,14 @@ inline const Layer (&EnumValuesLayer())[68] {
Layer_UnidirectionalSequenceLstmLayer,
Layer_ChannelShuffleLayer,
Layer_Convolution3dLayer,
- Layer_Pooling3dLayer
+ Layer_Pooling3dLayer,
+ Layer_GatherNdLayer
};
return values;
}
inline const char * const *EnumNamesLayer() {
- static const char * const names[69] = {
+ static const char * const names[70] = {
"NONE",
"ActivationLayer",
"AdditionLayer",
@@ -1457,13 +1465,14 @@ inline const char * const *EnumNamesLayer() {
"ChannelShuffleLayer",
"Convolution3dLayer",
"Pooling3dLayer",
+ "GatherNdLayer",
nullptr
};
return names;
}
inline const char *EnumNameLayer(Layer e) {
- if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_Pooling3dLayer)) return "";
+ if (flatbuffers::IsOutRange(e, Layer_NONE, Layer_GatherNdLayer)) return "";
const size_t index = static_cast<size_t>(e);
return EnumNamesLayer()[index];
}
@@ -1740,6 +1749,10 @@ template<> struct LayerTraits<armnnSerializer::Pooling3dLayer> {
static const Layer enum_value = Layer_Pooling3dLayer;
};
+template<> struct LayerTraits<armnnSerializer::GatherNdLayer> {
+ static const Layer enum_value = Layer_GatherNdLayer;
+};
+
bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer type);
bool VerifyLayerVector(flatbuffers::Verifier &verifier, const flatbuffers::Vector<flatbuffers::Offset<void>> *values, const flatbuffers::Vector<uint8_t> *types);
@@ -4186,6 +4199,49 @@ inline flatbuffers::Offset<GatherDescriptor> CreateGatherDescriptor(
return builder_.Finish();
}
+struct GatherNdLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
+ typedef GatherNdLayerBuilder Builder;
+ enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
+ VT_BASE = 4
+ };
+ const armnnSerializer::LayerBase *base() const {
+ return GetPointer<const armnnSerializer::LayerBase *>(VT_BASE);
+ }
+ bool Verify(flatbuffers::Verifier &verifier) const {
+ return VerifyTableStart(verifier) &&
+ VerifyOffset(verifier, VT_BASE) &&
+ verifier.VerifyTable(base()) &&
+ verifier.EndTable();
+ }
+};
+
+struct GatherNdLayerBuilder {
+ typedef GatherNdLayer Table;
+ flatbuffers::FlatBufferBuilder &fbb_;
+ flatbuffers::uoffset_t start_;
+ void add_base(flatbuffers::Offset<armnnSerializer::LayerBase> base) {
+ fbb_.AddOffset(GatherNdLayer::VT_BASE, base);
+ }
+ explicit GatherNdLayerBuilder(flatbuffers::FlatBufferBuilder &_fbb)
+ : fbb_(_fbb) {
+ start_ = fbb_.StartTable();
+ }
+ GatherNdLayerBuilder &operator=(const GatherNdLayerBuilder &);
+ flatbuffers::Offset<GatherNdLayer> Finish() {
+ const auto end = fbb_.EndTable(start_);
+ auto o = flatbuffers::Offset<GatherNdLayer>(end);
+ return o;
+ }
+};
+
+inline flatbuffers::Offset<GatherNdLayer> CreateGatherNdLayer(
+ flatbuffers::FlatBufferBuilder &_fbb,
+ flatbuffers::Offset<armnnSerializer::LayerBase> base = 0) {
+ GatherNdLayerBuilder builder_(_fbb);
+ builder_.add_base(base);
+ return builder_.Finish();
+}
+
/// @deprecated Use ComparisonLayer instead
struct GreaterLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef GreaterLayerBuilder Builder;
@@ -10534,6 +10590,9 @@ struct AnyLayer FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const armnnSerializer::Pooling3dLayer *layer_as_Pooling3dLayer() const {
return layer_type() == armnnSerializer::Layer_Pooling3dLayer ? static_cast<const armnnSerializer::Pooling3dLayer *>(layer()) : nullptr;
}
+ const armnnSerializer::GatherNdLayer *layer_as_GatherNdLayer() const {
+ return layer_type() == armnnSerializer::Layer_GatherNdLayer ? static_cast<const armnnSerializer::GatherNdLayer *>(layer()) : nullptr;
+ }
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
VerifyField<uint8_t>(verifier, VT_LAYER_TYPE) &&
@@ -10811,6 +10870,10 @@ template<> inline const armnnSerializer::Pooling3dLayer *AnyLayer::layer_as<armn
return layer_as_Pooling3dLayer();
}
+template<> inline const armnnSerializer::GatherNdLayer *AnyLayer::layer_as<armnnSerializer::GatherNdLayer>() const {
+ return layer_as_GatherNdLayer();
+}
+
struct AnyLayerBuilder {
typedef AnyLayer Table;
flatbuffers::FlatBufferBuilder &fbb_;
@@ -11309,6 +11372,10 @@ inline bool VerifyLayer(flatbuffers::Verifier &verifier, const void *obj, Layer
auto ptr = reinterpret_cast<const armnnSerializer::Pooling3dLayer *>(obj);
return verifier.VerifyTable(ptr);
}
+ case Layer_GatherNdLayer: {
+ auto ptr = reinterpret_cast<const armnnSerializer::GatherNdLayer *>(obj);
+ return verifier.VerifyTable(ptr);
+ }
default: return true;
}
}
diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 971621d60c..3b9dfb0ae8 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -587,6 +587,17 @@ void SerializerStrategy::SerializeGatherLayer(const armnn::IConnectableLayer* la
CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_GatherLayer);
}
+void SerializerStrategy::SerializeGatherNdLayer(const armnn::IConnectableLayer* layer,
+ const char* name)
+{
+ IgnoreUnused(name);
+
+ auto fbGatherNdBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_GatherNd);
+ auto flatBufferLayer = serializer::CreateGatherNdLayer(m_flatBufferBuilder, fbGatherNdBaseLayer);
+
+ CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_GatherNdLayer);
+}
+
void SerializerStrategy::SerializeInstanceNormalizationLayer(
const armnn::IConnectableLayer* layer,
const armnn::InstanceNormalizationDescriptor& instanceNormalizationDescriptor,
@@ -2134,6 +2145,11 @@ void SerializerStrategy::ExecuteStrategy(const armnn::IConnectableLayer* layer,
SerializeGatherLayer(layer, layerDescriptor, name);
break;
}
+ case armnn::LayerType::GatherNd :
+ {
+ SerializeGatherNdLayer(layer, name);
+ break;
+ }
case armnn::LayerType::Input:
{
SerializeInputLayer(layer, id, name);
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index 3905e49cd1..98c1984cd2 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -191,6 +191,9 @@ private:
const armnn::GatherDescriptor& gatherDescriptor,
const char* name = nullptr);
+ void SerializeGatherNdLayer(const armnn::IConnectableLayer* layer,
+ const char* name = nullptr);
+
void SerializeInputLayer(const armnn::IConnectableLayer* layer,
armnn::LayerBindingId id,
const char* name = nullptr);
diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 966dc6c669..a765290de8 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1109,6 +1109,70 @@ TEST_CASE("SerializeGather")
deserializedNetwork->ExecuteStrategy(verifier);
}
+TEST_CASE("SerializeGatherNd")
+{
+ class GatherNdLayerVerifier : public LayerVerifierBase
+ {
+ public:
+ GatherNdLayerVerifier(const std::string& layerName,
+ const std::vector<armnn::TensorInfo>& inputInfos,
+ const std::vector<armnn::TensorInfo>& outputInfos)
+ : LayerVerifierBase(layerName, inputInfos, outputInfos) {}
+
+ void ExecuteStrategy(const armnn::IConnectableLayer* layer,
+ const armnn::BaseDescriptor& descriptor,
+ const std::vector<armnn::ConstTensor>& constants,
+ const char* name,
+ const armnn::LayerBindingId id = 0) override
+ {
+ armnn::IgnoreUnused(constants, id);
+ switch (layer->GetType())
+ {
+ case armnn::LayerType::Input:
+ case armnn::LayerType::Output:
+ case armnn::LayerType::Constant:
+ break;
+ default:
+ {
+ VerifyNameAndConnections(layer, name);
+ }
+ }
+ }
+ };
+
+ const std::string layerName("gatherNd");
+ armnn::TensorInfo paramsInfo({ 6, 3 }, armnn::DataType::QAsymmU8);
+ armnn::TensorInfo outputInfo({ 3, 3 }, armnn::DataType::QAsymmU8);
+ const armnn::TensorInfo indicesInfo({ 3, 1 }, armnn::DataType::Signed32, 0.0f, 0, true);
+
+ paramsInfo.SetQuantizationScale(1.0f);
+ paramsInfo.SetQuantizationOffset(0);
+ outputInfo.SetQuantizationScale(1.0f);
+ outputInfo.SetQuantizationOffset(0);
+
+ const std::vector<int32_t>& indicesData = {5, 1, 0};
+
+ armnn::INetworkPtr network = armnn::INetwork::Create();
+ armnn::IConnectableLayer *const inputLayer = network->AddInputLayer(0);
+ armnn::IConnectableLayer *const constantLayer =
+ network->AddConstantLayer(armnn::ConstTensor(indicesInfo, indicesData));
+ armnn::IConnectableLayer *const gatherNdLayer = network->AddGatherNdLayer(layerName.c_str());
+ armnn::IConnectableLayer *const outputLayer = network->AddOutputLayer(0);
+
+ inputLayer->GetOutputSlot(0).Connect(gatherNdLayer->GetInputSlot(0));
+ constantLayer->GetOutputSlot(0).Connect(gatherNdLayer->GetInputSlot(1));
+ gatherNdLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+
+ inputLayer->GetOutputSlot(0).SetTensorInfo(paramsInfo);
+ constantLayer->GetOutputSlot(0).SetTensorInfo(indicesInfo);
+ gatherNdLayer->GetOutputSlot(0).SetTensorInfo(outputInfo);
+
+ armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network));
+ CHECK(deserializedNetwork);
+
+ GatherNdLayerVerifier verifier(layerName, {paramsInfo, indicesInfo}, {outputInfo});
+ deserializedNetwork->ExecuteStrategy(verifier);
+}
TEST_CASE("SerializeComparisonGreater")
{
generated by cgit v1.2.1 (git 2.23.0) at 2024-05-29 04:31:24 +0000