diff options
Diffstat (limited to 'src/armnn')
| -rw-r--r-- | src/armnn/InternalTypes.cpp | 1 | ||||
| -rw-r--r-- | src/armnn/InternalTypes.hpp | 1 | ||||
| -rw-r--r-- | src/armnn/LayerSupport.cpp | 9 | ||||
| -rw-r--r-- | src/armnn/LayersFwd.hpp | 2 | ||||
| -rw-r--r-- | src/armnn/Network.cpp | 5 | ||||
| -rw-r--r-- | src/armnn/Network.hpp | 2 | ||||
| -rw-r--r-- | src/armnn/layers/RsqrtLayer.cpp | 48 | ||||
| -rw-r--r-- | src/armnn/layers/RsqrtLayer.hpp | 40 |
8 files changed, 108 insertions, 0 deletions
diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index fe806f1ccb..9ffd73ac08 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -45,6 +45,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Permute: return "Permute"; case LayerType::Pooling2d: return "Pooling2d"; case LayerType::Reshape: return "Reshape"; + case LayerType::Rsqrt: return "Rsqrt"; case LayerType::ResizeBilinear: return "ResizeBilinear"; case LayerType::Softmax: return "Softmax"; case LayerType::SpaceToBatchNd: return "SpaceToBatchNd"; diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index c6b5c04665..f4996db73e 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -46,6 +46,7 @@ enum class LayerType Pooling2d, Reshape, ResizeBilinear, + Rsqrt, Softmax, SpaceToBatchNd, Splitter, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 3c864c5ae7..cf6ce27dda 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -389,6 +389,15 @@ bool IsReshapeSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsReshapeSupported, input); } +bool IsRsqrtSupported(const BackendId& backend, + const TensorInfo& input, + const TensorInfo& output, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsRsqrtSupported, input, output); +} + bool IsFloorSupported(const BackendId& backend, const TensorInfo& input, const TensorInfo& output, diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index c9a12a6643..9f55233e8e 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -38,6 +38,7 @@ #include "layers/Pooling2dLayer.hpp" #include "layers/ReshapeLayer.hpp" #include "layers/ResizeBilinearLayer.hpp" +#include "layers/RsqrtLayer.hpp" #include "layers/SoftmaxLayer.hpp" #include "layers/SpaceToBatchNdLayer.hpp" #include "layers/SplitterLayer.hpp" @@ -103,6 +104,7 @@ DECLARE_LAYER(Permute) DECLARE_LAYER(Pooling2d) DECLARE_LAYER(Reshape) DECLARE_LAYER(ResizeBilinear) +DECLARE_LAYER(Rsqrt) DECLARE_LAYER(Softmax) DECLARE_LAYER(SpaceToBatchNd) DECLARE_LAYER(Splitter) diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 0d959547e4..187d04eb2b 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -727,6 +727,11 @@ IConnectableLayer* Network::AddEqualLayer(const char* name) return m_Graph->AddLayer<EqualLayer>(name); } +IConnectableLayer* Network::AddRsqrtLayer(const char * name) +{ + return m_Graph->AddLayer<RsqrtLayer>(name); +} + OptimizedNetwork::OptimizedNetwork(std::unique_ptr<Graph> graph) : m_Graph(std::move(graph)) { diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index f36ca4fa74..ba741e9af6 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -139,6 +139,8 @@ public: IConnectableLayer* AddEqualLayer(const char* name = nullptr) override; + IConnectableLayer* AddRsqrtLayer(const char* name = nullptr) override; + private: IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, diff --git a/src/armnn/layers/RsqrtLayer.cpp b/src/armnn/layers/RsqrtLayer.cpp new file mode 100644 index 0000000000..d516810c68 --- /dev/null +++ b/src/armnn/layers/RsqrtLayer.cpp @@ -0,0 +1,48 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "RsqrtLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include <armnn/TypesUtils.hpp> +#include <backendsCommon/WorkloadData.hpp> +#include <backendsCommon/WorkloadFactory.hpp> + +namespace armnn +{ + +RsqrtLayer::RsqrtLayer(const char* name) + : Layer(1, 1, LayerType::Rsqrt, name) +{ +} + +std::unique_ptr<IWorkload> RsqrtLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + RsqrtQueueDescriptor descriptor; + return factory.CreateRsqrt(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +RsqrtLayer* RsqrtLayer::Clone(Graph& graph) const +{ + return CloneBase<RsqrtLayer>(graph, GetName()); +} + +void RsqrtLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + auto inferredShapes = InferOutputShapes({ GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape() }); + + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual<LayerValidationException>( + "RsqrtLayer: TensorShape set on OutputSlot[0] does not match the inferred shape.", + GetOutputSlot(0).GetTensorInfo().GetShape(), + inferredShapes[0]); +} + +} // namespace armnn
\ No newline at end of file diff --git a/src/armnn/layers/RsqrtLayer.hpp b/src/armnn/layers/RsqrtLayer.hpp new file mode 100644 index 0000000000..47a4ccedd6 --- /dev/null +++ b/src/armnn/layers/RsqrtLayer.hpp @@ -0,0 +1,40 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include <Layer.hpp> + +namespace armnn +{ + +class RsqrtLayer : public Layer +{ +public: + /// Makes a workload for the Rsqrt 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. + RsqrtLayer* Clone(Graph& graph) const override; + + /// Check if the input tensor shape(s) + /// will lead to a valid configuration of @ref RsqrtLayer. + void ValidateTensorShapesFromInputs() override; + +protected: + /// Constructor to create an RsqrtLayer. + /// @param [in] name Optional name for the layer. + RsqrtLayer(const char* name); + + /// Default destructor + ~RsqrtLayer() = default; +}; + +} // namespace
\ No newline at end of file |