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
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index a1a1ed9..13c9327 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -58,6 +58,8 @@
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 @@
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;
diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp
index 094c47c..3c3401d 100644
--- a/1.0/HalPolicy.hpp
+++ b/1.0/HalPolicy.hpp
@@ -72,6 +72,8 @@
static bool ConvertResizeBilinear(const Operation& operation, const Model& model, ConversionData& data);
+ static bool ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data);
+
static bool ValidateConv2dParameters(const Operation& operation);
static bool ValidateDepthwiseConv2dParameters(const Operation& operation);