From a9075df5b704e4f4432bf26027e3ba671d4596f0 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Thu, 27 Jun 2019 15:41:57 +0100 Subject: [PATCH] IVGCVSW-3363 Add frontend support for Resize Layer Signed-off-by: Teresa Charlin Change-Id: I63493ddb7598515773073deb6db2eb3a635c5dfe --- Android.mk | 1 + CMakeLists.txt | 2 + include/armnn/Descriptors.hpp | 22 +++++++ include/armnn/DescriptorsFwd.hpp | 1 + include/armnn/ILayerSupport.hpp | 5 ++ include/armnn/ILayerVisitor.hpp | 8 +++ include/armnn/INetwork.hpp | 7 ++ include/armnn/LayerVisitorBase.hpp | 4 ++ include/armnn/Types.hpp | 6 ++ src/armnn/InternalTypes.hpp | 1 + src/armnn/LayersFwd.hpp | 2 + src/armnn/Network.cpp | 6 ++ src/armnn/Network.hpp | 3 + src/armnn/layers/ResizeLayer.cpp | 76 ++++++++++++++++++++++ src/armnn/layers/ResizeLayer.hpp | 49 ++++++++++++++ src/armnnSerializer/Serializer.cpp | 7 ++ src/armnnSerializer/Serializer.hpp | 4 ++ src/backends/backendsCommon/LayerSupportBase.cpp | 8 +++ src/backends/backendsCommon/LayerSupportBase.hpp | 5 ++ src/backends/backendsCommon/WorkloadData.hpp | 5 ++ src/backends/backendsCommon/WorkloadFactory.cpp | 17 +++++ src/backends/backendsCommon/WorkloadFactory.hpp | 3 + .../test/IsLayerSupportedTestImpl.hpp | 2 + 23 files changed, 244 insertions(+) create mode 100644 src/armnn/layers/ResizeLayer.cpp create mode 100644 src/armnn/layers/ResizeLayer.hpp diff --git a/Android.mk b/Android.mk index 7556b1f..f57f3b6 100644 --- a/Android.mk +++ b/Android.mk @@ -127,6 +127,7 @@ LOCAL_SRC_FILES := \ src/armnn/layers/QuantizeLayer.cpp \ src/armnn/layers/ReshapeLayer.cpp \ src/armnn/layers/ResizeBilinearLayer.cpp \ + src/armnn/layers/ResizeLayer.cpp \ src/armnn/layers/RsqrtLayer.cpp \ src/armnn/layers/SpaceToBatchNdLayer.cpp \ src/armnn/layers/SpaceToDepthLayer.cpp \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 836465a..52f1e1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -302,6 +302,8 @@ list(APPEND armnn_sources src/armnn/layers/ReshapeLayer.cpp src/armnn/layers/ResizeBilinearLayer.hpp src/armnn/layers/ResizeBilinearLayer.cpp + src/armnn/layers/ResizeLayer.hpp + src/armnn/layers/ResizeLayer.cpp src/armnn/layers/RsqrtLayer.cpp src/armnn/layers/RsqrtLayer.hpp src/armnn/layers/SoftmaxLayer.hpp diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp index 0655d42..8f72c54 100644 --- a/include/armnn/Descriptors.hpp +++ b/include/armnn/Descriptors.hpp @@ -503,6 +503,28 @@ struct ResizeBilinearDescriptor DataLayout m_DataLayout; }; +/// A ResizeDescriptor for the ResizeLayer. +struct ResizeDescriptor +{ + ResizeDescriptor() + : m_TargetWidth(0) + , m_TargetHeight(0) + , m_Method(ResizeMethod::NearestNeighbor) + , m_DataLayout(DataLayout::NCHW) + {} + + /// Target width value. + uint32_t m_TargetWidth; + /// Target height value. + uint32_t m_TargetHeight; + /// The Interpolation method to use + /// (Bilinear, NearestNeighbor). + ResizeMethod m_Method; + /// The data layout to be used (NCHW, NHWC). + DataLayout m_DataLayout; +}; + + /// A ReshapeDescriptor for the ReshapeLayer. struct ReshapeDescriptor { diff --git a/include/armnn/DescriptorsFwd.hpp b/include/armnn/DescriptorsFwd.hpp index b814d48..9627ddc 100644 --- a/include/armnn/DescriptorsFwd.hpp +++ b/include/armnn/DescriptorsFwd.hpp @@ -26,6 +26,7 @@ struct Pooling2dDescriptor; struct PreCompiledDescriptor; struct ReshapeDescriptor; struct ResizeBilinearDescriptor; +struct ResizeDescriptor; struct SoftmaxDescriptor; struct SpaceToBatchNdDescriptor; struct SpaceToDepthDescriptor; diff --git a/include/armnn/ILayerSupport.hpp b/include/armnn/ILayerSupport.hpp index eb581d3..bf0ac90 100644 --- a/include/armnn/ILayerSupport.hpp +++ b/include/armnn/ILayerSupport.hpp @@ -251,6 +251,11 @@ public: const TensorInfo& output, Optional reasonIfUnsupported = EmptyOptional()) const = 0; + virtual bool IsResizeSupported(const TensorInfo& input, + const TensorInfo& output, + const ResizeDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const = 0; + virtual bool IsRsqrtSupported(const TensorInfo& input, const TensorInfo& output, Optional reasonIfUnsupported = EmptyOptional()) const = 0; diff --git a/include/armnn/ILayerVisitor.hpp b/include/armnn/ILayerVisitor.hpp index c98760c..37cd383 100644 --- a/include/armnn/ILayerVisitor.hpp +++ b/include/armnn/ILayerVisitor.hpp @@ -318,6 +318,14 @@ public: const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) = 0; + /// Function that a resize layer should call back to when its Accept(ILayerVisitor&) function is invoked. + /// @param layer - pointer to the layer which is calling back to this visit function. + /// @param resizeDescriptor - Parameters for the resize operation. + /// @param name - Optional name for the layer. + virtual void VisitResizeLayer(const IConnectableLayer* layer, + const ResizeDescriptor& resizeDescriptor, + const char* name = nullptr) = 0; + /// Function a Reciprocal of square root layer should call back to when its Accept(ILayerVisitor&) /// function is invoked. /// @param layer - pointer to the layer which is calling back to this visit function. diff --git a/include/armnn/INetwork.hpp b/include/armnn/INetwork.hpp index af67764..598e1eb 100644 --- a/include/armnn/INetwork.hpp +++ b/include/armnn/INetwork.hpp @@ -296,6 +296,13 @@ public: virtual IConnectableLayer* AddResizeBilinearLayer(const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) = 0; + /// Adds a resize layer to the network. + /// @param resizeDescriptor - Parameters for the resize operation. + /// @param name - Optional name for the layer. + /// @return - Interface for configuring the layer. + virtual IConnectableLayer* AddResizeLayer(const ResizeDescriptor& resizeDescriptor, + const char* name = nullptr) = 0; + /// Adds an L2 normalization layer to the network. /// Normalization is performed along dimension 1, but requires a 4d input. /// @param desc - Parameters for the L2 normalization operation. diff --git a/include/armnn/LayerVisitorBase.hpp b/include/armnn/LayerVisitorBase.hpp index 8406efe..d657154 100644 --- a/include/armnn/LayerVisitorBase.hpp +++ b/include/armnn/LayerVisitorBase.hpp @@ -165,6 +165,10 @@ public: const ResizeBilinearDescriptor&, const char*) override { DefaultPolicy::Apply(__func__); } + void VisitResizeLayer(const IConnectableLayer*, + const ResizeDescriptor&, + const char*) override { DefaultPolicy::Apply(__func__); } + void VisitRsqrtLayer(const IConnectableLayer*, const char*) override { DefaultPolicy::Apply(__func__); } diff --git a/include/armnn/Types.hpp b/include/armnn/Types.hpp index 53aa437..12897e2 100644 --- a/include/armnn/Types.hpp +++ b/include/armnn/Types.hpp @@ -61,6 +61,12 @@ enum class PoolingAlgorithm L2 = 2 }; +enum class ResizeMethod +{ + Bilinear = 0, + NearestNeighbor = 1 +}; + /// /// The padding method modifies the output of pooling layers. /// In both supported methods, the values are ignored (they are diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index dc3dc17..6c49eac 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -53,6 +53,7 @@ enum class LayerType Quantize, Reshape, ResizeBilinear, + Resize, Rsqrt, Softmax, SpaceToBatchNd, diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index 9837cd3..2e049ec 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -45,6 +45,7 @@ #include "layers/QuantizeLayer.hpp" #include "layers/ReshapeLayer.hpp" #include "layers/ResizeBilinearLayer.hpp" +#include "layers/ResizeLayer.hpp" #include "layers/RsqrtLayer.hpp" #include "layers/SoftmaxLayer.hpp" #include "layers/SpaceToBatchNdLayer.hpp" @@ -120,6 +121,7 @@ DECLARE_LAYER(PreCompiled) DECLARE_LAYER(Prelu) DECLARE_LAYER(Quantize) DECLARE_LAYER(Reshape) +DECLARE_LAYER(Resize) DECLARE_LAYER(ResizeBilinear) DECLARE_LAYER(Rsqrt) DECLARE_LAYER(Softmax) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 58ccfb7..63432da 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -1188,6 +1188,12 @@ resizeDescriptor, const char* name) return m_Graph->AddLayer(resizeDescriptor,name); } +IConnectableLayer* Network::AddResizeLayer(const ResizeDescriptor& +resizeDescriptor, const char* name) +{ + return m_Graph->AddLayer(resizeDescriptor,name); +} + IConnectableLayer* Network::AddL2NormalizationLayer(const L2NormalizationDescriptor& desc, const char* name) { diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 8db968a..f0dfb1d 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -137,6 +137,9 @@ public: IConnectableLayer* AddResizeBilinearLayer(const ResizeBilinearDescriptor& resizeDesc, const char* name = nullptr) override; + IConnectableLayer* AddResizeLayer(const ResizeDescriptor& resizeDescriptor, + const char* name = nullptr) override; + IConnectableLayer* AddL2NormalizationLayer(const L2NormalizationDescriptor& desc, const char* name = nullptr) override; diff --git a/src/armnn/layers/ResizeLayer.cpp b/src/armnn/layers/ResizeLayer.cpp new file mode 100644 index 0000000..44b4d9d --- /dev/null +++ b/src/armnn/layers/ResizeLayer.cpp @@ -0,0 +1,76 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "ResizeLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include + +#include +#include + +#include + +using namespace armnnUtils; + +namespace armnn +{ + +ResizeLayer::ResizeLayer(const ResizeDescriptor& param, const char* name) + : LayerWithParameters(1, 1, LayerType::Resize, param, name) +{ +} + +std::unique_ptr ResizeLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + ResizeQueueDescriptor descriptor; + return factory.CreateResize(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +ResizeLayer* ResizeLayer::Clone(Graph& graph) const +{ + return CloneBase(graph, m_Param, GetName()); +} + +std::vector ResizeLayer::InferOutputShapes(const std::vector& inputShapes) const +{ + BOOST_ASSERT(inputShapes.size() == 1); + + const TensorShape& inputShape = inputShapes[0]; + const DataLayoutIndexed dimensionIndices = m_Param.m_DataLayout; + + unsigned int outWidth = m_Param.m_TargetWidth; + unsigned int outHeight = m_Param.m_TargetHeight; + unsigned int outChannels = inputShape[dimensionIndices.GetChannelsIndex()]; + unsigned int outBatch = inputShape[0]; + + TensorShape tensorShape = m_Param.m_DataLayout == armnn::DataLayout::NHWC ? + TensorShape( { outBatch, outHeight, outWidth, outChannels } ) : + TensorShape( { outBatch, outChannels, outHeight, outWidth }); + + return std::vector({ tensorShape }); +} + +void ResizeLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual( + "ResizeLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +void ResizeLayer::Accept(ILayerVisitor& visitor) const +{ + visitor.VisitResizeLayer(this, GetParameters(), GetName()); +} + +} // namespace armnn diff --git a/src/armnn/layers/ResizeLayer.hpp b/src/armnn/layers/ResizeLayer.hpp new file mode 100644 index 0000000..0d309ff --- /dev/null +++ b/src/armnn/layers/ResizeLayer.hpp @@ -0,0 +1,49 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "LayerWithParameters.hpp" + +namespace armnn +{ + +/// This layer represents a resize operation. +class ResizeLayer : public LayerWithParameters +{ +public: + /// Makes a workload for the Resize type. + /// @param [in] graph The graph where this layer can be found. + /// @param [in] factory The workload factory which will create the workload. + /// @return A pointer to the created workload, or nullptr if not created. + virtual std::unique_ptrCreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + /// Creates a dynamically-allocated copy of this layer. + /// @param [in] graph The graph into which this layer is being cloned. + ResizeLayer* Clone(Graph& graph) const override; + + /// Check if the input tensor shape(s) + /// will lead to a valid configuration of @ref ResizeLayer. + void ValidateTensorShapesFromInputs() override; + + /// By default returns inputShapes if the number of inputs are equal to number of outputs, + /// otherwise infers the output shapes from given input shapes and layer properties. + /// @param [in] inputShapes The input shapes layer has. + /// @return A vector to the inferred output shape. + std::vector InferOutputShapes(const std::vector& inputShapes) const override; + + void Accept(ILayerVisitor& visitor) const override; + +protected: + /// Constructor to create a ResizeLayerLayer. + /// @param [in] param ResizeDescriptor to configure the resize operation. + /// @param [in] name Optional name for the layer. + ResizeLayer(const ResizeDescriptor& param, const char* name); + + /// Default destructor + ~ResizeLayer() = default; +}; + +} // namespace armnn diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp index 208262b..2d5877d 100644 --- a/src/armnnSerializer/Serializer.cpp +++ b/src/armnnSerializer/Serializer.cpp @@ -656,6 +656,13 @@ void SerializerVisitor::VisitResizeBilinearLayer(const armnn::IConnectableLayer* CreateAnyLayer(flatBufferLayer.o, serializer::Layer::Layer_ResizeBilinearLayer); } +void SerializerVisitor::VisitResizeLayer(const armnn::IConnectableLayer* layer, + const armnn::ResizeDescriptor& resizeDescriptor, + const char* name) +{ + throw armnn::Exception("SerializerVisitor::VisitResizeLayer is not yet implemented"); +} + void SerializerVisitor::VisitRsqrtLayer(const armnn::IConnectableLayer* layer, const char* name) { auto fbRsqrtBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Rsqrt); diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp index 31f7d05..2529796 100644 --- a/src/armnnSerializer/Serializer.hpp +++ b/src/armnnSerializer/Serializer.hpp @@ -174,6 +174,10 @@ public: const armnn::ResizeBilinearDescriptor& resizeDescriptor, const char* name = nullptr) override; + void VisitResizeLayer(const armnn::IConnectableLayer* layer, + const armnn::ResizeDescriptor& resizeDescriptor, + const char* name = nullptr) override; + void VisitRsqrtLayer(const armnn::IConnectableLayer* layer, const char* name = nullptr) override; diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index 2eb0e41..6c25f87 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -377,6 +377,14 @@ bool LayerSupportBase::IsResizeBilinearSupported(const TensorInfo& input, return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool LayerSupportBase::IsResizeSupported(const TensorInfo& input, + const TensorInfo& output, + const ResizeDescriptor& descriptor, + Optional reasonIfUnsupported) const +{ + return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); +} + bool LayerSupportBase::IsRsqrtSupported(const TensorInfo &input, const TensorInfo &output, Optional reasonIfUnsupported) const diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp index 52ba5b2..7f63ccf 100644 --- a/src/backends/backendsCommon/LayerSupportBase.hpp +++ b/src/backends/backendsCommon/LayerSupportBase.hpp @@ -238,6 +238,11 @@ public: const TensorInfo& output, Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsResizeSupported(const TensorInfo& input, + const TensorInfo& output, + const ResizeDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsRsqrtSupported(const TensorInfo& input, const TensorInfo& output, Optional reasonIfUnsupported = EmptyOptional()) const override; diff --git a/src/backends/backendsCommon/WorkloadData.hpp b/src/backends/backendsCommon/WorkloadData.hpp index 7447583..fa9e1cd 100644 --- a/src/backends/backendsCommon/WorkloadData.hpp +++ b/src/backends/backendsCommon/WorkloadData.hpp @@ -268,6 +268,11 @@ struct ResizeBilinearQueueDescriptor : QueueDescriptorWithParameters +{ + void Validate(const WorkloadInfo& workloadInfo) const; +}; + struct FakeQuantizationQueueDescriptor : QueueDescriptorWithParameters { FakeQuantizationQueueDescriptor() diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 7cda3fe..b74b6af 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -640,6 +640,17 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, reason); break; } + case LayerType::Resize: + { + auto cLayer = boost::polymorphic_downcast(&layer); + const TensorInfo& input = layer.GetInputSlot(0).GetConnection()->GetTensorInfo(); + const TensorInfo& output = layer.GetOutputSlot(0).GetTensorInfo(); + result = layerSupportObject->IsResizeSupported(OverrideDataType(input, dataType), + OverrideDataType(output, dataType), + cLayer->GetParameters(), + reason); + break; + } case LayerType::ResizeBilinear: { const TensorInfo& input = layer.GetInputSlot(0).GetConnection()->GetTensorInfo(); @@ -1080,6 +1091,12 @@ std::unique_ptr IWorkloadFactory::CreateResizeBilinear(const ResizeBi return std::unique_ptr(); } +std::unique_ptr IWorkloadFactory::CreateResize(const ResizeQueueDescriptor& descriptor, + const WorkloadInfo& info) const +{ + return std::unique_ptr(); +} + std::unique_ptr IWorkloadFactory::CreateRsqrt(const RsqrtQueueDescriptor& descriptor, const WorkloadInfo& info) const { diff --git a/src/backends/backendsCommon/WorkloadFactory.hpp b/src/backends/backendsCommon/WorkloadFactory.hpp index 978d3a3..02a8002 100644 --- a/src/backends/backendsCommon/WorkloadFactory.hpp +++ b/src/backends/backendsCommon/WorkloadFactory.hpp @@ -167,6 +167,9 @@ public: virtual std::unique_ptr CreateResizeBilinear(const ResizeBilinearQueueDescriptor& descriptor, const WorkloadInfo& info) const; + virtual std::unique_ptr CreateResize(const ResizeQueueDescriptor& descriptor, + const WorkloadInfo& info) const; + virtual std::unique_ptr CreateRsqrt(const RsqrtQueueDescriptor& descriptor, const WorkloadInfo& info) const; diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 7c9d0f5..6f3a9d3 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -394,6 +394,8 @@ DECLARE_LAYER_POLICY_1_PARAM(Prelu) DECLARE_LAYER_POLICY_1_PARAM(Division) +DECLARE_LAYER_POLICY_2_PARAM(Resize) + DECLARE_LAYER_POLICY_2_PARAM(ResizeBilinear) DECLARE_LAYER_POLICY_2_PARAM(Reshape) -- 2.7.4