diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-01 13:34:59 +0100 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2019-10-02 10:01:14 +0000 |
commit | 8edb16d884530e7f35d05983e1617c13d200bb91 (patch) | |
tree | 2eaceaac47e6dcbc7702d79e6131337ce8832ea0 /ConversionUtils.hpp | |
parent | 09a42255247ace7b317b869cf7d5747aca85d6ef (diff) | |
download | android-nn-driver-8edb16d884530e7f35d05983e1617c13d200bb91.tar.gz |
IVGCVSW-3737 Add support for converting DEPTH_TO_SPACE
* Added ConvertDepthToSpace() to hal_1_0::HalPolicy and hal_1_2::HalPolicy
* Implemented ConvertDepthToSpace() template inside ConversionUtils.hpp
* Changed unsupported operation from DEPTH_TO_SPACE to HASHTABLE_LOOKUP
in GenericLayerTests/GetSupportedOperations
Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I12bf73ea721e7b6d49cc4a76000b43a3f274c6f5
Diffstat (limited to 'ConversionUtils.hpp')
-rw-r--r-- | ConversionUtils.hpp | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 683da5e4..2e4cadd7 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -1880,6 +1880,73 @@ bool ConvertConv2d(const HalOperation& operation, const HalModel& model, Convers template<typename HalPolicy, typename HalOperation = typename HalPolicy::Operation, typename HalModel = typename HalPolicy::Model> +bool ConvertDepthToSpace(const HalOperation& operation, const HalModel& model, ConversionData& data) +{ + using HalOperand = typename HalPolicy::Operand; + using HalOperandType = typename HalPolicy::OperandType; + + LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data); + if (!input.IsValid() ) + { + return Fail("%s: Operation has invalid inputs", __func__); + } + + const armnn::TensorInfo& inputInfo = input.GetTensorInfo(); + unsigned int rank = inputInfo.GetNumDimensions(); + if (rank != 4) + { + return Fail("%s: Only inputs with rank 4 are supported", __func__); + } + + const HalOperand* output = GetOutputOperand<HalPolicy>(operation, 0, model); + if (!output) + { + return Fail("%s: Could not read output 0", __func__); + } + + const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output); + if (IsDynamicTensor(outputInfo)) + { + return Fail("%s: Dynamic output tensors are not supported", __func__); + } + + armnn::DepthToSpaceDescriptor descriptor; + + GetInputScalar<HalPolicy>(operation, 1, HalOperandType::INT32, descriptor.m_BlockSize, model, data); + if (descriptor.m_BlockSize <= 1) + { + return Fail("%s: Block size must be at least 1 in all dimensions"); + } + + descriptor.m_DataLayout = armnn::DataLayout::NHWC; + if (Is12Operand(*output)) + { + descriptor.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 2, model, data); + } + + bool isSupported = false; + FORWARD_LAYER_SUPPORT_FUNC(__func__, + IsDepthToSpaceSupported, + data.m_Backends, + isSupported, + inputInfo, + outputInfo, + descriptor); + if (!isSupported) + { + return false; + } + + armnn::IConnectableLayer* const layer = data.m_Network->AddDepthToSpaceLayer(descriptor); + assert(layer != nullptr); + input.Connect(layer->GetInputSlot(0)); + + return SetupAndTrackLayerOutputSlot<HalPolicy>(operation, 0, *layer, model, data); +} + +template<typename HalPolicy, + typename HalOperation = typename HalPolicy::Operation, + typename HalModel = typename HalPolicy::Model> bool ConvertDepthwiseConv2d(const HalOperation& operation, const HalModel& model, ConversionData& data) { using HalOperand = typename HalPolicy::Operand; |