From cb8ac845da5a6297f7009e26df282a2bfd73f3b9 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Fri, 5 Jul 2019 15:47:07 +0100 Subject: IVGCVSW-3301 Support PAD_V2 in HAL1.2 driver Signed-off-by: Aron Virginas-Tar Change-Id: If3da7b9015fb816bb27b85ab491102005859b3b0 --- ConversionUtils.hpp | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'ConversionUtils.hpp') diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 9a711cb7..d30b8a4e 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -5,11 +5,12 @@ #pragma once +#include "Utils.hpp" + #include #include "armnn/src/armnnUtils/DataLayoutIndexed.hpp" #include "armnn/src/armnnUtils/Permute.hpp" -#include "Utils.hpp" #include #include @@ -1136,6 +1137,49 @@ bool ConvertToActivation(const HalOperation& operation, return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data); } +template +bool ConvertPaddings(const HalOperation& operation, + const HalModel& model, + ConversionData& data, + unsigned int rank, + armnn::PadDescriptor& padDescriptor) +{ + using HalOperand = typename HalPolicy::Operand; + + const HalOperand* paddingsOperand = GetInputOperand(operation, 1, model); + if (!paddingsOperand) + { + return Fail("%s: Could not read paddings operand", __func__); + } + + armnn::TensorShape paddingsOperandShape = GetTensorShapeForOperand(*paddingsOperand); + if (paddingsOperandShape.GetNumDimensions() != 2 || paddingsOperandShape.GetNumElements() != rank * 2) + { + return Fail("%s: Operation has invalid paddings operand: expected shape [%d, 2]", __func__, rank); + } + + std::vector paddings; + GetTensorInt32Values(*paddingsOperand, paddings, model, data); + + // add padding for each dimension of input tensor. + for (unsigned int i = 0; i < paddings.size() - 1; i += 2) + { + int paddingBeforeInput = paddings[i]; + int paddingAfterInput = paddings[i + 1]; + + if (paddingBeforeInput < 0 || paddingAfterInput < 0) + { + return Fail("%s: Operation has invalid paddings operand, invalid padding values.", __func__); + } + + padDescriptor.m_PadList.emplace_back((unsigned int) paddingBeforeInput, (unsigned int) paddingAfterInput); + } + + return true; +} + template -- cgit v1.2.1