diff options
author | Ryan OShea <Ryan.OShea2@arm.com> | 2020-06-05 17:17:06 +0100 |
---|---|---|
committer | KeithARM <keith.davis@arm.com> | 2020-06-11 12:17:49 +0000 |
commit | ec6c68093eaef8a2b8e1fd64fcc765237973512e (patch) | |
tree | e4dd87466d5be44d1310f9e1c9c6e1355df43fbf /src/armnn | |
parent | 6350d27286114dfdae5f65ae1823ba1150087efb (diff) | |
download | armnn-ec6c68093eaef8a2b8e1fd64fcc765237973512e.tar.gz |
IVGCVSW-4906 Add front-end support for FILL operator
* Added new fill layer
* Added visitor tests
Signed-off-by: Ryan OShea <Ryan.OShea2@arm.com>
Change-Id: Iea677014866b4f2d514004623f59ee83f3c0eef8
Signed-off-by: Keith Davis <keith.davis@arm.com>
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/InternalTypes.hpp | 1 | ||||
-rw-r--r-- | src/armnn/LayersFwd.hpp | 2 | ||||
-rw-r--r-- | src/armnn/Network.cpp | 6 | ||||
-rw-r--r-- | src/armnn/Network.hpp | 3 | ||||
-rw-r--r-- | src/armnn/layers/FillLayer.cpp | 51 | ||||
-rw-r--r-- | src/armnn/layers/FillLayer.hpp | 41 | ||||
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp | 7 | ||||
-rw-r--r-- | src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp | 1 |
8 files changed, 112 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index 455cb60d5d..e2ad7a2ea5 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -33,6 +33,7 @@ X(Division) \ X(ElementwiseUnary) \ X(FakeQuantization) \ + X(Fill) \ X(Floor) \ X(FullyConnected) \ X(Gather) \ diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index befe3819d8..575c3e5c68 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -27,6 +27,7 @@ #include "layers/DivisionLayer.hpp" #include "layers/ElementwiseUnaryLayer.hpp" #include "layers/FakeQuantizationLayer.hpp" +#include "layers/FillLayer.hpp" #include "layers/FloorLayer.hpp" #include "layers/FullyConnectedLayer.hpp" #include "layers/GatherLayer.hpp" @@ -115,6 +116,7 @@ DECLARE_LAYER(DetectionPostProcess) DECLARE_LAYER(Division) DECLARE_LAYER(ElementwiseUnary) DECLARE_LAYER(FakeQuantization) +DECLARE_LAYER(Fill) DECLARE_LAYER(Floor) DECLARE_LAYER(FullyConnected) DECLARE_LAYER(Gather) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index fa8eaaf998..180c00b0c3 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -1186,6 +1186,12 @@ IConnectableLayer* Network::AddElementwiseUnaryLayer(const ElementwiseUnaryDescr return m_Graph->AddLayer<ElementwiseUnaryLayer>(elementwiseUnaryDescriptor, name); } +IConnectableLayer* Network::AddFillLayer(const FillDescriptor& fillDescriptor, + const char* name) +{ + return m_Graph->AddLayer<FillLayer>(fillDescriptor, name); +} + IConnectableLayer* Network::AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 1711d2e2dd..cac2b3a0e6 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -97,6 +97,9 @@ public: IConnectableLayer* AddElementwiseUnaryLayer(const ElementwiseUnaryDescriptor& elementwiseUnaryDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddFillLayer(const FillDescriptor& fillDescriptor, + const char* name = nullptr) override; + IConnectableLayer* AddFullyConnectedLayer(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, const Optional<ConstTensor>& biases, diff --git a/src/armnn/layers/FillLayer.cpp b/src/armnn/layers/FillLayer.cpp new file mode 100644 index 0000000000..03f93f76da --- /dev/null +++ b/src/armnn/layers/FillLayer.cpp @@ -0,0 +1,51 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "FillLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include <armnn/TypesUtils.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +FillLayer::FillLayer(const FillDescriptor& param, const char* name) + : LayerWithParameters(1, 1, LayerType::Fill, param, name) +{ +} + +std::unique_ptr<IWorkload> FillLayer::CreateWorkload(const IWorkloadFactory& factory) const +{ + FillQueueDescriptor descriptor; + return factory.CreateFill(descriptor, PrepInfoAndDesc(descriptor) ); +} + +FillLayer* FillLayer::Clone(Graph& graph) const +{ + return CloneBase<FillLayer>(graph, m_Param, GetName()); +} + +void FillLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + + ARMNN_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual<LayerValidationException>( + "FillLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +void FillLayer::Accept(ILayerVisitor& visitor) const +{ + visitor.VisitGatherLayer(this, GetName()); +} + +} // namespace armnn diff --git a/src/armnn/layers/FillLayer.hpp b/src/armnn/layers/FillLayer.hpp new file mode 100644 index 0000000000..b9a972a27a --- /dev/null +++ b/src/armnn/layers/FillLayer.hpp @@ -0,0 +1,41 @@ +// +// Copyright © 2020 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "LayerWithParameters.hpp" + +namespace armnn +{ + +/// This layer represents a fill operation. +class FillLayer : public LayerWithParameters<FillDescriptor> +{ +public: + /// Makes a workload for the Fill layer. + /// @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_ptr<IWorkload> CreateWorkload(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. + FillLayer* Clone(Graph& graph) const override; + + /// Check if the input tensor shape(s) + /// will lead to a valid configuration of @ref FillLayer. + void ValidateTensorShapesFromInputs() override; + + void Accept(ILayerVisitor& visitor) const override; + +protected: + /// Constructor to create a FillLayer. + /// @param [in] descriptor to configure the fill operation. + /// @param [in] name Optional name for the layer. + FillLayer(const FillDescriptor& descriptor, const char* name); + + /// Default destructor + ~FillLayer() = default; +}; + +} // namespace diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp index 431db2aa0d..e07e497ab8 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.cpp @@ -92,6 +92,12 @@ armnn::ElementwiseUnaryDescriptor GetDescriptor<armnn::ElementwiseUnaryDescripto } template<> +armnn::FillDescriptor GetDescriptor<armnn::FillDescriptor>() +{ + return armnn::FillDescriptor(1); +} + +template<> armnn::InstanceNormalizationDescriptor GetDescriptor<armnn::InstanceNormalizationDescriptor>() { armnn::InstanceNormalizationDescriptor descriptor; @@ -264,6 +270,7 @@ TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(BatchToSpaceNd) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Comparison) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Concat) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(ElementwiseUnary) +TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(Fill) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(InstanceNormalization) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(L2Normalization) TEST_SUITE_NAME_AND_DESCRIPTOR_LAYER_VISITOR(LogSoftmax) diff --git a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp index b9877a8111..c8df505db0 100644 --- a/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp +++ b/src/armnn/test/TestNameAndDescriptorLayerVisitor.hpp @@ -49,6 +49,7 @@ DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Comparison) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Concat) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(DepthToSpace) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(ElementwiseUnary) +DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(Fill) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(InstanceNormalization) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(L2Normalization) DECLARE_TEST_NAME_AND_DESCRIPTOR_LAYER_VISITOR_CLASS(LogSoftmax) |