From 430b5d824a17ddfb31bb29c18407e45e0def958c Mon Sep 17 00:00:00 2001 From: Conor Kennedy Date: Wed, 14 Nov 2018 15:28:28 +0000 Subject: IVGCVSW-2086: Add StridedSlice layer & corresponding no-op factory implementations Change-Id: I906dcb8b4c9b491bf3a661f208c09d0ea1c0fa35 --- src/armnn/InternalTypes.cpp | 1 + src/armnn/InternalTypes.hpp | 1 + src/armnn/LayerSupport.cpp | 10 ++++++ src/armnn/LayersFwd.hpp | 2 ++ src/armnn/Network.cpp | 6 ++++ src/armnn/Network.hpp | 3 ++ src/armnn/layers/StridedSliceLayer.cpp | 58 ++++++++++++++++++++++++++++++++++ src/armnn/layers/StridedSliceLayer.hpp | 27 ++++++++++++++++ 8 files changed, 108 insertions(+) create mode 100644 src/armnn/layers/StridedSliceLayer.cpp create mode 100644 src/armnn/layers/StridedSliceLayer.hpp (limited to 'src/armnn') diff --git a/src/armnn/InternalTypes.cpp b/src/armnn/InternalTypes.cpp index 3493a3d5a2..dade1f70c3 100644 --- a/src/armnn/InternalTypes.cpp +++ b/src/armnn/InternalTypes.cpp @@ -43,6 +43,7 @@ char const* GetLayerTypeAsCString(LayerType type) case LayerType::Softmax: return "Softmax"; case LayerType::SpaceToBatchNd: return "SpaceToBatchNd"; case LayerType::Splitter: return "Splitter"; + case LayerType::StridedSlice: return "StridedSlice"; case LayerType::Subtraction: return "Subtraction"; default: BOOST_ASSERT_MSG(false, "Unknown layer type"); diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp index dc3c55edac..3e2f298119 100644 --- a/src/armnn/InternalTypes.hpp +++ b/src/armnn/InternalTypes.hpp @@ -44,6 +44,7 @@ enum class LayerType Softmax, SpaceToBatchNd, Splitter, + StridedSlice, // Last layer goes here. LastLayer, Subtraction = LastLayer, diff --git a/src/armnn/LayerSupport.cpp b/src/armnn/LayerSupport.cpp index 78a184a7ce..91aca4ea41 100644 --- a/src/armnn/LayerSupport.cpp +++ b/src/armnn/LayerSupport.cpp @@ -403,4 +403,14 @@ bool IsPadSupported(const BackendId& backend, FORWARD_LAYER_SUPPORT_FUNC(backend, IsPadSupported, input, output, descriptor); } +bool IsStridedSliceSupported(const BackendId& backend, + const TensorInfo& input, + const TensorInfo& output, + const StridedSliceDescriptor& descriptor, + char* reasonIfUnsupported, + size_t reasonIfUnsupportedMaxLength) +{ + FORWARD_LAYER_SUPPORT_FUNC(backend, IsStridedSliceSupported, input, output, descriptor); +} + } diff --git a/src/armnn/LayersFwd.hpp b/src/armnn/LayersFwd.hpp index bd1297b550..0e873d7c70 100644 --- a/src/armnn/LayersFwd.hpp +++ b/src/armnn/LayersFwd.hpp @@ -36,6 +36,7 @@ #include "layers/SoftmaxLayer.hpp" #include "layers/SpaceToBatchNdLayer.hpp" #include "layers/SplitterLayer.hpp" +#include "layers/StridedSliceLayer.hpp" #include "layers/SubtractionLayer.hpp" namespace armnn @@ -95,6 +96,7 @@ DECLARE_LAYER(ResizeBilinear) DECLARE_LAYER(Softmax) DECLARE_LAYER(SpaceToBatchNd) DECLARE_LAYER(Splitter) +DECLARE_LAYER(StridedSlice) DECLARE_LAYER(Subtraction) } diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 3b3ee3146a..32464f7757 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -694,6 +694,12 @@ IConnectableLayer* Network::AddPadLayer(const PadDescriptor& padDescriptor, cons return m_Graph->AddLayer(padDescriptor,name); } +IConnectableLayer* Network::AddStridedSliceLayer(const StridedSliceDescriptor& stridedSliceDescriptor, + const char* name) +{ + return m_Graph->AddLayer(stridedSliceDescriptor, name); +} + OptimizedNetwork::OptimizedNetwork(std::unique_ptr graph) : m_Graph(std::move(graph)) { diff --git a/src/armnn/Network.hpp b/src/armnn/Network.hpp index 95cdb28bfb..471ce3ec68 100644 --- a/src/armnn/Network.hpp +++ b/src/armnn/Network.hpp @@ -128,6 +128,9 @@ public: IConnectableLayer* AddPadLayer(const PadDescriptor& padDescriptor, const char* name = nullptr) override; + IConnectableLayer* AddStridedSliceLayer(const StridedSliceDescriptor& stridedSliceDescriptor, + const char* name = nullptr) override; + private: IConnectableLayer* AddFullyConnectedLayerImpl(const FullyConnectedDescriptor& fullyConnectedDescriptor, const ConstTensor& weights, diff --git a/src/armnn/layers/StridedSliceLayer.cpp b/src/armnn/layers/StridedSliceLayer.cpp new file mode 100644 index 0000000000..f5e001c03f --- /dev/null +++ b/src/armnn/layers/StridedSliceLayer.cpp @@ -0,0 +1,58 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#include "StridedSliceLayer.hpp" + +#include "LayerCloneBase.hpp" + +#include +#include + +namespace armnn +{ + +StridedSliceLayer::StridedSliceLayer(const armnn::StridedSliceDescriptor& param, const char* name) + : LayerWithParameters(1, 1, LayerType::StridedSlice, param, name) +{ +} + +std::unique_ptr StridedSliceLayer::CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const +{ + StridedSliceQueueDescriptor descriptor; + + descriptor.m_Parameters.m_Begin = m_Param.m_Begin; + descriptor.m_Parameters.m_End = m_Param.m_End; + descriptor.m_Parameters.m_Stride = m_Param.m_Stride; + + // Optional parameters + descriptor.m_Parameters.m_BeginMask = m_Param.m_BeginMask; + descriptor.m_Parameters.m_EndMask = m_Param.m_EndMask; + descriptor.m_Parameters.m_EllipsisMask = m_Param.m_EllipsisMask; + descriptor.m_Parameters.m_NewAxisMask = m_Param.m_NewAxisMask; + descriptor.m_Parameters.m_ShrinkAxisMask = m_Param.m_ShrinkAxisMask; + + return factory.CreateStridedSlice(descriptor, PrepInfoAndDesc(descriptor, graph)); +} + +StridedSliceLayer* StridedSliceLayer::Clone(Graph& graph) const +{ + return CloneBase(graph, m_Param, GetName()); +} + +void StridedSliceLayer::ValidateTensorShapesFromInputs() +{ + VerifyLayerConnections(1, CHECK_LOCATION()); + + auto inferredShapes = InferOutputShapes({GetInputSlot(0).GetConnection()->GetTensorInfo().GetShape()}); + + BOOST_ASSERT(inferredShapes.size() == 1); + + ConditionalThrowIfNotEqual( + "StridedSlice: 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/StridedSliceLayer.hpp b/src/armnn/layers/StridedSliceLayer.hpp new file mode 100644 index 0000000000..33a44243a5 --- /dev/null +++ b/src/armnn/layers/StridedSliceLayer.hpp @@ -0,0 +1,27 @@ +// +// Copyright © 2017 Arm Ltd. All rights reserved. +// SPDX-License-Identifier: MIT +// +#pragma once + +#include "LayerWithParameters.hpp" + +namespace armnn +{ + +class StridedSliceLayer : public LayerWithParameters +{ +public: + virtual std::unique_ptr CreateWorkload(const Graph& graph, + const IWorkloadFactory& factory) const override; + + StridedSliceLayer* Clone(Graph& graph) const override; + + void ValidateTensorShapesFromInputs() override; + +protected: + StridedSliceLayer(const StridedSliceDescriptor& param, const char* name); + ~StridedSliceLayer() = default; +}; + +} // namespace \ No newline at end of file -- cgit v1.2.1