diff options
author | Keith Davis <keith.davis@arm.com> | 2019-06-26 09:39:49 +0100 |
---|---|---|
committer | Keith Davis Arm <keith.davis@arm.com> | 2019-07-08 12:05:50 +0000 |
commit | a6bc52f6b9eeddcdebf4e660b21a4409a592ac4e (patch) | |
tree | 2dec94c73e963d1a9c537c7ec1237b5ec388af25 /1.0/HalPolicy.cpp | |
parent | cb8ac845da5a6297f7009e26df282a2bfd73f3b9 (diff) | |
download | android-nn-driver-a6bc52f6b9eeddcdebf4e660b21a4409a592ac4e.tar.gz |
IVGCVSW-3197 Support SPACE_TO_DEPTH on Android
* Added support within 1.0/HalPolicy
* Added support within 1.1/HalPolicy
* Added support within 1.2/HalPolicy
* Updated NnapiSupport.txt
Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I2dc2743ee2f858d2b3496aae0f3e3e28a96ee96e
Diffstat (limited to '1.0/HalPolicy.cpp')
-rw-r--r-- | 1.0/HalPolicy.cpp | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index a1a1ed9e..13c93277 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -58,6 +58,8 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, return ConvertReLu6(operation, model, data); case V1_0::OperationType::SOFTMAX: return ConvertSoftmax(operation, model, data); + case V1_0::OperationType::SPACE_TO_DEPTH: + return ConvertSpaceToDepth(operation, model, data); case V1_0::OperationType::TANH: return ConvertTanH(operation, model, data); case V1_0::OperationType::RESHAPE: @@ -1130,6 +1132,57 @@ bool HalPolicy::ConvertSoftmax(const Operation& operation, const Model& model, C return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation, 0, *layer, model, data); } +bool HalPolicy::ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data) +{ + LayerInputHandle input = ConvertToLayerInputHandle<hal_1_0::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__); + } + + armnn::SpaceToDepthDescriptor desc; + bool dataLayoutCheck; + + GetInputScalar<hal_1_0::HalPolicy>(operation, 1, OperandType::INT32, desc.m_BlockSize, model, data); + + if (desc.m_BlockSize <= 1) + { + return Fail("%s: Block size must be at least 1 in all dimensions"); + } + + const Operand* output = GetOutputOperand<hal_1_0::HalPolicy>(operation, 0, model); + if (!output) + { + return Fail("%s: Could not read output 0", __func__); + } + + const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output); + if (!IsLayerSupportedForAnyBackend(__func__, + armnn::IsSpaceToDepthSupported, + data.m_Backends, + inputInfo, + outputInfo, + desc)) + { + return false; + } + + armnn::IConnectableLayer* const layer = data.m_Network->AddSpaceToDepthLayer(desc); + assert(layer != nullptr); + input.Connect(layer->GetInputSlot(0)); + + return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation, 0, *layer, model, data); +} + bool HalPolicy::ConvertTanH(const Operation& operation, const Model& model, ConversionData& data) { armnn::ActivationDescriptor desc; |