diff options
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/InternalTypes.hpp | 1 | ||||
-rw-r--r-- | src/armnn/LayerSupport.cpp | 10 | ||||
-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/ArgMinMaxLayer.cpp | 52 | ||||
-rw-r--r-- | src/armnn/layers/ArgMinMaxLayer.hpp | 44 |
7 files changed, 118 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index 6141f27df5..98308f92a1 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -17,6 +17,7 @@ enum class LayerType Abs = FirstLayer, Activation, Addition, + ArgMinMax, BatchNormalization, BatchToSpaceNd, Concat, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index d730205981..f88e4e1cc9 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -91,6 +91,16 @@ bool IsAdditionSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsAdditionSupported, input0, input1, output); } +bool IsArgMinMaxSupported(const BackendId& backend, + const TensorInfo& input, + const TensorInfo& output, + const ArgMinMaxDescriptor& descriptor, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsArgMinMaxSupported, input, output, descriptor); +} + bool IsBatchNormalizationSupported(const BackendId& backend, const TensorInfo& input, const TensorInfo& output, diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index 94a3b89912..6e4cf6ab04 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -9,6 +9,7 @@ #include "layers/AbsLayer.hpp" #include "layers/ActivationLayer.hpp" #include "layers/AdditionLayer.hpp" +#include "layers/ArgMinMaxLayer.hpp" #include "layers/BatchNormalizationLayer.hpp" #include "layers/BatchToSpaceNdLayer.hpp" #include "layers/ConcatLayer.hpp" @@ -89,6 +90,7 @@ constexpr LayerType LayerEnumOf(const T* = nullptr); DECLARE_LAYER(Abs) DECLARE_LAYER(Activation) DECLARE_LAYER(Addition) +DECLARE_LAYER(ArgMinMax) DECLARE_LAYER(BatchNormalization) DECLARE_LAYER(BatchToSpaceNd) DECLARE_LAYER(Concat) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index dc26a1b372..6971cb89ba 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -1116,6 +1116,12 @@ IConnectableLayer* Network::AddActivationLayer(const ActivationDescriptor& activ return m_Graph->AddLayer<ActivationLayer>(activationDescriptor, name); } +IConnectableLayer* Network::AddArgMinMaxLayer(const ArgMinMaxDescriptor& argMinMaxDescriptor, + const char* name) +{ + return m_Graph->AddLayer<ArgMinMaxLayer>(argMinMaxDescriptor, name); +} + IConnectableLayer* Network::AddNormalizationLayer(const NormalizationDescriptor& normalizationDescriptor, const char* name) diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 4516c0a8f9..aac875aac7 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -36,6 +36,9 @@ public: IConnectableLayer* AddInputLayer(LayerBindingId id, const char* name=nullptr) override; + IConnectableLayer* AddArgMinMaxLayer(const ArgMinMaxDescriptor& desc, + const char* name = nullptr) override; + IConnectableLayer* AddBatchToSpaceNdLayer(const BatchToSpaceNdDescriptor& batchToSpaceNdDescriptor, const char* name = nullptr) override; diff --git a/src/armnn/layers/ArgMinMaxLayer.cpp b/src/armnn/layers/ArgMinMaxLayer.cpp new file mode 100644 index 0000000000..aad95eb0cf --- /dev/null +++ b/src/armnn/layers/ArgMinMaxLayer.cpp @@ -0,0 +1,52 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "ArgMinMaxLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include <armnn/TypesUtils.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +ArgMinMaxLayer::ArgMinMaxLayer(const ArgMinMaxDescriptor& param, const char* name) + : LayerWithParameters(1, 1, LayerType::ArgMinMax, param, name) +{ +} + +std::unique_ptr<IWorkload> ArgMinMaxLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + ArgMinMaxQueueDescriptor descriptor; + return factory.CreateArgMinMax(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +ArgMinMaxLayer* ArgMinMaxLayer::Clone(Graph& graph) const +{ + return CloneBase<ArgMinMaxLayer>(graph, m_Param, GetName()); +} + +void ArgMinMaxLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual<LayerValidationException>( + "ArgMinMaxLayer: TensorShape set on OutputSlot does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +void ArgMinMaxLayer::Accept(ILayerVisitor& visitor) const +{ + visitor.VisitArgMinMaxLayer(this, GetParameters(), GetName()); +} + +} // namespace armnn
\ No newline at end of file diff --git a/src/armnn/layers/ArgMinMaxLayer.hpp b/src/armnn/layers/ArgMinMaxLayer.hpp new file mode 100644 index 0000000000..ca1337f065 --- /dev/null +++ b/src/armnn/layers/ArgMinMaxLayer.hpp @@ -0,0 +1,44 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "LayerWithParameters.hpp" + +namespace armnn +{ + +/// This layer represents a ArgMinMax operation. +class ArgMinMaxLayer : public LayerWithParameters<ArgMinMaxDescriptor> +{ +public: + /// Makes a workload for the ArgMinMax 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_ptr<IWorkload> CreateWorkload(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. + ArgMinMaxLayer* Clone(Graph& graph) const override; + + /// Check if the input tensor shape(s) + /// will lead to a valid configuration of @ref ArgMinMaxLayer. + void ValidateTensorShapesFromInputs() override; + + void Accept(ILayerVisitor& visitor) const override; + +protected: + /// Constructor to create a ArgMinMaxLayer. + /// @param [in] param ArgMinMaxDescriptor to configure the ArgMinMax operation. + /// @param [in] name Optional name for the layer. + ArgMinMaxLayer(const ArgMinMaxDescriptor& param, const char* name); + + /// Default destructor + ~ArgMinMaxLayer() = default; +}; + +}
\ No newline at end of file |