From 013c390c2d9829fede2d8b1d59c3f2a497730462 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Mon, 21 Oct 2019 10:46:16 +0100 Subject: IVGCVSW-4009 StandInLayer frontend API Change-Id: I058c57b554769799c6775813215070ef47790e3d Signed-off-by: Derek Lamberti --- src/backends/backendsCommon/LayerSupportBase.cpp | 16 +++++++++ src/backends/backendsCommon/LayerSupportBase.hpp | 5 +++ src/backends/backendsCommon/WorkloadFactory.cpp | 41 ++++++++++++++++++++++ .../test/IsLayerSupportedTestImpl.hpp | 21 +++++++++++ 4 files changed, 83 insertions(+) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/LayerSupportBase.cpp b/src/backends/backendsCommon/LayerSupportBase.cpp index 358106e5e9..9ffad7b8e2 100644 --- a/src/backends/backendsCommon/LayerSupportBase.cpp +++ b/src/backends/backendsCommon/LayerSupportBase.cpp @@ -502,6 +502,22 @@ bool LayerSupportBase::IsStackSupported(const std::vector& in return DefaultLayerSupport(__func__, __FILE__, __LINE__, reasonIfUnsupported); } +bool LayerSupportBase::IsStandInSupported(const std::vector& inputs, + const std::vector& outputs, + const StandInDescriptor& descriptor, + Optional reasonIfUnsupported) const +{ + if (reasonIfUnsupported) + { + std::stringstream message; + message << "StandIn layer is not executable via backends"; + + reasonIfUnsupported.value() = message.str(); + } + + return false; +} + bool LayerSupportBase::IsStridedSliceSupported(const TensorInfo& input, const TensorInfo& output, const StridedSliceDescriptor& descriptor, diff --git a/src/backends/backendsCommon/LayerSupportBase.hpp b/src/backends/backendsCommon/LayerSupportBase.hpp index d4c37c1a91..e99cb67614 100644 --- a/src/backends/backendsCommon/LayerSupportBase.hpp +++ b/src/backends/backendsCommon/LayerSupportBase.hpp @@ -312,6 +312,11 @@ public: const StackDescriptor& descriptor, Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsStandInSupported(const std::vector& inputs, + const std::vector& outputs, + const StandInDescriptor& descriptor, + Optional reasonIfUnsupported = EmptyOptional()) const override; + bool IsStridedSliceSupported(const TensorInfo& input, const TensorInfo& output, const StridedSliceDescriptor& descriptor, diff --git a/src/backends/backendsCommon/WorkloadFactory.cpp b/src/backends/backendsCommon/WorkloadFactory.cpp index 30dfa023f9..34e4cbe579 100644 --- a/src/backends/backendsCommon/WorkloadFactory.cpp +++ b/src/backends/backendsCommon/WorkloadFactory.cpp @@ -902,6 +902,47 @@ bool IWorkloadFactory::IsLayerSupported(const BackendId& backendId, break; } + case LayerType::StandIn: + { + auto cLayer = boost::polymorphic_downcast(&layer); + + // Get vector of all inputs. + auto getTensorInfoIn = [&dataType](const InputSlot& slot) + { + return OverrideDataType(slot.GetConnectedOutputSlot()->GetTensorInfo(), dataType); + }; + auto getTensorInfoOut = [&dataType](const OutputSlot& slot) + { + return OverrideDataType(slot.GetTensorInfo(), dataType); + }; + auto beginI = boost::make_transform_iterator(layer.GetInputSlots().begin(), getTensorInfoIn); + auto endI = boost::make_transform_iterator(layer.GetInputSlots().end(), getTensorInfoIn); + std::vector inputs(beginI, endI); + + auto beginO = boost::make_transform_iterator(layer.GetOutputSlots().begin(), getTensorInfoOut); + auto endO = boost::make_transform_iterator(layer.GetOutputSlots().end(), getTensorInfoOut); + std::vector outputs(beginO, endO); + + + auto getTensorInfoPtr = [](const TensorInfo& info) + { + return &info; + }; + auto beginPtrI = boost::make_transform_iterator(inputs.begin(), getTensorInfoPtr); + auto endPtrI = boost::make_transform_iterator(inputs.end(), getTensorInfoPtr); + std::vector inputPtrs(beginPtrI, endPtrI); + + auto beginPtrO = boost::make_transform_iterator(outputs.begin(), getTensorInfoPtr); + auto endPtrO = boost::make_transform_iterator(outputs.end(), getTensorInfoPtr); + std::vector outputPtrs(beginPtrO, endPtrO); + + + result = layerSupportObject->IsStandInSupported(inputPtrs, + outputPtrs, + cLayer->GetParameters(), + reason); + break; + } case LayerType::StridedSlice: { auto cLayer = boost::polymorphic_downcast(&layer); diff --git a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp index 9bddae9759..c52d6a9511 100644 --- a/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp +++ b/src/backends/backendsCommon/test/IsLayerSupportedTestImpl.hpp @@ -380,6 +380,25 @@ struct LayerTypePolicy \ // Use this version for layers whose constructor takes 2 parameters(descriptor and name). #define DECLARE_LAYER_POLICY_2_PARAM(name) DECLARE_LAYER_POLICY_CUSTOM_PARAM(name, armnn::name##Descriptor) + +#define DECLARE_LAYER_POLICY_EXCEPTION(name, descType) \ +template \ +struct LayerTypePolicy \ +{ \ + using Type = armnn::name##Layer; \ + using Desc = descType; \ + constexpr static const char* NameStr = #name; \ + \ + static std::unique_ptr MakeDummyWorkload(armnn::IWorkloadFactory *factory, \ + unsigned int nIn, unsigned int nOut) \ + { \ + return std::unique_ptr(); \ + } \ +}; + +#define DECLARE_LAYER_POLICY_EXCEPTION_1_PARAM(name) DECLARE_LAYER_POLICY_EXCEPTION(name, void) +#define DECLARE_LAYER_POLICY_EXCEPTION_2_PARAM(name) DECLARE_LAYER_POLICY_EXCEPTION(name, armnn::name##Descriptor) + // Layer policy template. template struct LayerTypePolicy; @@ -489,6 +508,8 @@ DECLARE_LAYER_POLICY_2_PARAM(Splitter) DECLARE_LAYER_POLICY_2_PARAM(Stack) +DECLARE_LAYER_POLICY_EXCEPTION_2_PARAM(StandIn) + DECLARE_LAYER_POLICY_2_PARAM(StridedSlice) DECLARE_LAYER_POLICY_1_PARAM(Subtraction) -- cgit v1.2.1