commit 6fb339a7d202a9c64d8c7843d630fe8ab7be9f33
author FinnWilliamsArm <Finn.Williams@arm.com> Fri Jun 28 15:07:10 2019 +0100
committer FinnWilliamsArm <Finn.Williams@arm.com> Mon Jul 01 10:53:47 2019 +0100
tree 08f7119b14c042bc009cae4ca90c0c49c5c15387
parent a9075df5b704e4f4432bf26027e3ba671d4596f0

IVGCVSW-3364 Add serialization support for Resize layer

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: I3b1af816cefc1760f63324f365de93f899c9c9ee

src/armnnDeserializer/Deserializer.cpp

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 5372606..d853a08 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -217,6 +217,7 @@
     m_ParserFunctions[Layer_QuantizeLayer]               = &Deserializer::ParseQuantize;
     m_ParserFunctions[Layer_ReshapeLayer]                = &Deserializer::ParseReshape;
     m_ParserFunctions[Layer_ResizeBilinearLayer]         = &Deserializer::ParseResizeBilinear;
+    m_ParserFunctions[Layer_ResizeLayer]                 = &Deserializer::ParseResize;
     m_ParserFunctions[Layer_RsqrtLayer]                  = &Deserializer::ParseRsqrt;
     m_ParserFunctions[Layer_SoftmaxLayer]                = &Deserializer::ParseSoftmax;
     m_ParserFunctions[Layer_SpaceToBatchNdLayer]         = &Deserializer::ParseSpaceToBatchNd;
@@ -302,6 +303,8 @@
             return graphPtr->layers()->Get(layerIndex)->layer_as_ReshapeLayer()->base();
         case Layer::Layer_ResizeBilinearLayer:
             return graphPtr->layers()->Get(layerIndex)->layer_as_ResizeBilinearLayer()->base();
+        case Layer::Layer_ResizeLayer:
+            return graphPtr->layers()->Get(layerIndex)->layer_as_ResizeLayer()->base();
         case Layer::Layer_RsqrtLayer:
             return graphPtr->layers()->Get(layerIndex)->layer_as_RsqrtLayer()->base();
         case Layer::Layer_SoftmaxLayer:
@@ -389,6 +392,19 @@
     }
 }
 
+armnn::ResizeMethod ToResizeMethod(armnnSerializer::ResizeMethod method)
+{
+    switch (method)
+    {
+        case armnnSerializer::ResizeMethod_NearestNeighbor:
+            return armnn::ResizeMethod::NearestNeighbor;
+        case armnnSerializer::ResizeMethod_Bilinear:
+            return armnn::ResizeMethod::NearestNeighbor;
+        default:
+            return armnn::ResizeMethod::NearestNeighbor;
+    }
+}
+
 armnn::TensorInfo ToTensorInfo(Deserializer::TensorRawPtr tensorPtr)
 {
     armnn::DataType type;
@@ -1643,6 +1659,34 @@
     RegisterOutputSlots(graph, layerIndex, layer);
 }
 
+void Deserializer::ParseResize(GraphPtr graph, unsigned int layerIndex)
+{
+    CHECK_LAYERS(graph, 0, layerIndex);
+
+    Deserializer::TensorRawPtrVector inputs = GetInputs(graph, layerIndex);
+    CHECK_VALID_SIZE(inputs.size(), 1);
+
+    Deserializer::TensorRawPtrVector outputs = GetOutputs(graph, layerIndex);
+    CHECK_VALID_SIZE(outputs.size(), 1);
+
+    auto flatBufferDescriptor = graph->layers()->Get(layerIndex)->layer_as_ResizeLayer()->descriptor();
+
+    armnn::ResizeDescriptor descriptor;
+    descriptor.m_TargetWidth = flatBufferDescriptor->targetWidth();
+    descriptor.m_TargetHeight = flatBufferDescriptor->targetHeight();
+    descriptor.m_Method = ToResizeMethod(flatBufferDescriptor->method());
+    descriptor.m_DataLayout = ToDataLayout(flatBufferDescriptor->dataLayout());
+
+    auto layerName = GetLayerName(graph, layerIndex);
+    IConnectableLayer* layer = m_Network->AddResizeLayer(descriptor, layerName.c_str());
+
+    armnn::TensorInfo outputTensorInfo = ToTensorInfo(outputs[0]);
+    layer->GetOutputSlot(0).SetTensorInfo(outputTensorInfo);
+
+    RegisterInputSlots(graph, layerIndex, layer);
+    RegisterOutputSlots(graph, layerIndex, layer);
+}
+
 void Deserializer::ParseResizeBilinear(GraphPtr graph, unsigned int layerIndex)
 {
     CHECK_LAYERS(graph, 0, layerIndex);

src/armnnDeserializer/Deserializer.hpp

diff --git a/src/armnnDeserializer/Deserializer.hpp b/src/armnnDeserializer/Deserializer.hpp
index 1807e86..6a63f0f 100644
--- a/src/armnnDeserializer/Deserializer.hpp
+++ b/src/armnnDeserializer/Deserializer.hpp
@@ -106,6 +106,7 @@
     void ParsePrelu(GraphPtr graph, unsigned int layerIndex);
     void ParseQuantize(GraphPtr graph, unsigned int layerIndex);
     void ParseReshape(GraphPtr graph, unsigned int layerIndex);
+    void ParseResize(GraphPtr graph, unsigned int layerIndex);
     void ParseResizeBilinear(GraphPtr graph, unsigned int layerIndex);
     void ParseRsqrt(GraphPtr graph, unsigned int layerIndex);
     void ParseSoftmax(GraphPtr graph, unsigned int layerIndex);

src/armnnDeserializer/DeserializerSupport.md

diff --git a/src/armnnDeserializer/DeserializerSupport.md b/src/armnnDeserializer/DeserializerSupport.md
index d074be4..1f51cd3 100644
--- a/src/armnnDeserializer/DeserializerSupport.md
+++ b/src/armnnDeserializer/DeserializerSupport.md
@@ -46,5 +46,6 @@
 * Subtraction
 * Switch
 * TransposeConvolution2d
+* Resize
 
 More machine learning layers will be supported in future releases.