diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-03 11:15:39 +0100 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-10-03 12:35:20 +0000 |
commit | 781ced9d1472486f86314e320a00d62329dcd363 (patch) | |
tree | 727c7081c84c023b4004202eeee025f0451ae904 /src/armnnSerializer | |
parent | ce5045a00485f8a8c35814c0781ccbcca5678e5c (diff) | |
download | armnn-781ced9d1472486f86314e320a00d62329dcd363.tar.gz |
IVGCVSW-3934 Add serialization support for INSTANCE_NORMALIZATION
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: If9b4d30cbd625206ec1c7d37dd8b449983442147
Diffstat (limited to 'src/armnnSerializer')
-rw-r--r-- | src/armnnSerializer/ArmnnSchema.fbs | 18 | ||||
-rw-r--r-- | src/armnnSerializer/Serializer.cpp | 12 | ||||
-rw-r--r-- | src/armnnSerializer/SerializerSupport.md | 1 | ||||
-rw-r--r-- | src/armnnSerializer/test/SerializerTests.cpp | 60 |
4 files changed, 88 insertions, 3 deletions
diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs index 3f3e8fcb0b..7588b9d11e 100644 --- a/src/armnnSerializer/ArmnnSchema.fbs +++ b/src/armnnSerializer/ArmnnSchema.fbs @@ -141,7 +141,8 @@ enum LayerType : uint { Abs = 46, ArgMinMax = 47, Slice = 48, - DepthToSpace = 49 + DepthToSpace = 49, + InstanceNormalization = 50 } // Base layer table to be used as part of other layers @@ -260,6 +261,18 @@ table InputLayer { base:BindableLayerBase; } +table InstanceNormalizationLayer { + base:LayerBase; + descriptor:InstanceNormalizationDescriptor; +} + +table InstanceNormalizationDescriptor { + gamma:float; + beta:float; + eps:float; + dataLayout:DataLayout; +} + table L2NormalizationLayer { base:LayerBase; descriptor:L2NormalizationDescriptor; @@ -734,7 +747,8 @@ union Layer { AbsLayer, ArgMinMaxLayer, SliceLayer, - DepthToSpaceLayer + DepthToSpaceLayer, + InstanceNormalizationLayer } table AnyLayer { diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 84a1b6b18e..5949d1d9fa 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -431,7 +431,17 @@ void SerializerVisitor::VisitInstanceNormalizationLayer( const armnn::InstanceNormalizationDescriptor& instanceNormalizationDescriptor, const char* name) { - throw UnimplementedException("SerializerVisitor::InstanceNormalizationLayer is not implemented"); + auto fbDescriptor = serializer::CreateInstanceNormalizationDescriptor( + m_flatBufferBuilder, + instanceNormalizationDescriptor.m_Gamma, + instanceNormalizationDescriptor.m_Beta, + instanceNormalizationDescriptor.m_Eps, + GetFlatBufferDataLayout(instanceNormalizationDescriptor.m_DataLayout)); + + auto fbBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_InstanceNormalization); + auto fbLayer = serializer::CreateInstanceNormalizationLayer(m_flatBufferBuilder, fbBaseLayer, fbDescriptor); + + CreateAnyLayer(fbLayer.o, serializer::Layer::Layer_InstanceNormalizationLayer); } void SerializerVisitor::VisitL2NormalizationLayer(const armnn::IConnectableLayer* layer, diff --git a/src/armnnSerializer/SerializerSupport.md b/src/armnnSerializer/SerializerSupport.md index 2e6263b390..e628253f19 100644 --- a/src/armnnSerializer/SerializerSupport.md +++ b/src/armnnSerializer/SerializerSupport.md @@ -26,6 +26,7 @@ The Arm NN SDK Serializer currently supports the following layers: * Gather * Greater * Input +* InstanceNormalization * L2Normalization * Lstm * Maximum diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp index dfa98acbcd..98893a59cf 100644 --- a/src/armnnSerializer/test/SerializerTests.cpp +++ b/src/armnnSerializer/test/SerializerTests.cpp @@ -1267,6 +1267,66 @@ BOOST_AUTO_TEST_CASE(SerializeGreater) deserializedNetwork->Accept(verifier); } +BOOST_AUTO_TEST_CASE(SerializeInstanceNormalization) +{ + class InstanceNormalizationLayerVerifier : public LayerVerifierBase + { + public: + InstanceNormalizationLayerVerifier(const std::string& layerName, + const std::vector<armnn::TensorInfo>& inputInfos, + const std::vector<armnn::TensorInfo>& outputInfos, + const armnn::InstanceNormalizationDescriptor& descriptor) + : LayerVerifierBase(layerName, inputInfos, outputInfos) + , m_Descriptor(descriptor) {} + + void VisitInstanceNormalizationLayer(const armnn::IConnectableLayer* layer, + const armnn::InstanceNormalizationDescriptor& descriptor, + const char* name) override + { + VerifyNameAndConnections(layer, name); + VerifyDescriptor(descriptor); + } + + private: + void VerifyDescriptor(const armnn::InstanceNormalizationDescriptor& descriptor) + { + BOOST_CHECK(descriptor.m_Gamma == m_Descriptor.m_Gamma); + BOOST_CHECK(descriptor.m_Beta == m_Descriptor.m_Beta); + BOOST_CHECK(descriptor.m_Eps == m_Descriptor.m_Eps); + BOOST_CHECK(descriptor.m_DataLayout == m_Descriptor.m_DataLayout); + } + + armnn::InstanceNormalizationDescriptor m_Descriptor; + }; + + const std::string layerName("instanceNormalization"); + const armnn::TensorInfo info({ 1, 2, 1, 5 }, armnn::DataType::Float32); + + armnn::InstanceNormalizationDescriptor descriptor; + descriptor.m_Gamma = 1.1f; + descriptor.m_Beta = 0.1f; + descriptor.m_Eps = 0.0001f; + descriptor.m_DataLayout = armnn::DataLayout::NHWC; + + armnn::INetworkPtr network = armnn::INetwork::Create(); + armnn::IConnectableLayer* const inputLayer = network->AddInputLayer(0); + armnn::IConnectableLayer* const instanceNormLayer = + network->AddInstanceNormalizationLayer(descriptor, layerName.c_str()); + armnn::IConnectableLayer* const outputLayer = network->AddOutputLayer(0); + + inputLayer->GetOutputSlot(0).Connect(instanceNormLayer->GetInputSlot(0)); + instanceNormLayer->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0)); + + inputLayer->GetOutputSlot(0).SetTensorInfo(info); + instanceNormLayer->GetOutputSlot(0).SetTensorInfo(info); + + armnn::INetworkPtr deserializedNetwork = DeserializeNetwork(SerializeNetwork(*network)); + BOOST_CHECK(deserializedNetwork); + + InstanceNormalizationLayerVerifier verifier(layerName, {info}, {info}, descriptor); + deserializedNetwork->Accept(verifier); +} + class L2NormalizationLayerVerifier : public LayerVerifierBase { public: |