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
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index cff678a..7e9e9ef 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -27,6 +27,8 @@
return ConvertConcatenation(operation, model, data);
case V1_0::OperationType::CONV_2D:
return ConvertConv2d(operation, model, data);
+ case V1_0::OperationType::DEPTH_TO_SPACE:
+ return ConvertDepthToSpace(operation, model, data);
case V1_0::OperationType::DEPTHWISE_CONV_2D:
return ConvertDepthwiseConv2d(operation, model, data);
case V1_0::OperationType::DEQUANTIZE:
@@ -95,6 +97,12 @@
return ::ConvertConv2d<hal_1_0::HalPolicy>(operation, model, data);
}
+bool HalPolicy::ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data)
+{
+ ALOGV("hal_1_0::HalPolicy::ConvertDepthToSpace()");
+ return ::ConvertDepthToSpace<hal_1_0::HalPolicy>(operation, model, data);
+}
+
bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data)
{
ALOGV("hal_1_0::HalPolicy::ConvertDepthwiseConv2d()");
diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp
index 4b8dc47..9eb13b4 100644
--- a/1.0/HalPolicy.hpp
+++ b/1.0/HalPolicy.hpp
@@ -38,6 +38,8 @@
static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data);
+ static bool ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data);
+
static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data);
static bool ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data);
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp
index aa650e9..53a884c 100644
--- a/1.1/HalPolicy.cpp
+++ b/1.1/HalPolicy.cpp
@@ -16,6 +16,7 @@
V1_0::OperationType::AVERAGE_POOL_2D,
V1_0::OperationType::CONCATENATION,
V1_0::OperationType::CONV_2D,
+ V1_0::OperationType::DEPTH_TO_SPACE,
V1_0::OperationType::DEPTHWISE_CONV_2D,
V1_0::OperationType::DEQUANTIZE,
V1_0::OperationType::FLOOR,
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 7aa6967..d91cb3b 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -34,6 +34,8 @@
return ConvertConcatenation(operation, model, data);
case V1_2::OperationType::CONV_2D:
return ConvertConv2d(operation, model, data);
+ case V1_2::OperationType::DEPTH_TO_SPACE:
+ return ConvertDepthToSpace(operation, model, data);
case V1_2::OperationType::DEPTHWISE_CONV_2D:
return ConvertDepthwiseConv2d(operation, model, data);
case V1_2::OperationType::DEQUANTIZE:
@@ -298,6 +300,12 @@
return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *endLayer, model, data);
}
+bool HalPolicy::ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data)
+{
+ ALOGV("hal_1_2::HalPolicy::ConvertDepthToSpace()");
+ return ::ConvertDepthToSpace<hal_1_2::HalPolicy>(operation, model, data);
+}
+
bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data)
{
ALOGV("hal_1_2::HalPolicy::ConvertDepthwiseConv2d()");
diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index c7e1d4b..82de44c 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -43,6 +43,8 @@
static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data);
+ static bool ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data);
+
static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data);
static bool ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data);
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 683da5e..2e4cadd 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1880,6 +1880,73 @@
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;
diff --git a/test/GenericLayerTests.cpp b/test/GenericLayerTests.cpp
index 3b11b72..3788e66 100644
--- a/test/GenericLayerTests.cpp
+++ b/test/GenericLayerTests.cpp
@@ -122,16 +122,26 @@
V1_0::Model model3 = {};
- AddInputOperand<HalPolicy>(model3, hidl_vec<uint32_t>{1, 1, 1, 8});
- AddIntOperand<HalPolicy>(model3, 2);
- AddOutputOperand<HalPolicy>(model3, hidl_vec<uint32_t>{1, 2, 2, 2});
+ AddInputOperand<HalPolicy>(model3,
+ hidl_vec<uint32_t>{1, 1, 3, 4},
+ HalPolicy::OperandType::TENSOR_INT32);
+ AddInputOperand<HalPolicy>(model3,
+ hidl_vec<uint32_t>{4},
+ HalPolicy::OperandType::TENSOR_INT32);
+ AddInputOperand<HalPolicy>(model3, hidl_vec<uint32_t>{1, 1, 3, 4});
+
+ AddOutputOperand<HalPolicy>(model3, hidl_vec<uint32_t>{1, 1, 3, 4});
+ AddOutputOperand<HalPolicy>(model3,
+ hidl_vec<uint32_t>{1, 1, 3, 4},
+ HalPolicy::OperandType::TENSOR_QUANT8_ASYMM,
+ 1.f / 225.f);
model3.operations.resize(1);
// Add unsupported operation, should return no error but we don't support it
- model3.operations[0].type = HalPolicy::OperationType::DEPTH_TO_SPACE;
- model3.operations[0].inputs = hidl_vec<uint32_t>{0, 1};
- model3.operations[0].outputs = hidl_vec<uint32_t>{2};
+ model3.operations[0].type = HalPolicy::OperationType::HASHTABLE_LOOKUP;
+ model3.operations[0].inputs = hidl_vec<uint32_t>{0, 1, 2};
+ model3.operations[0].outputs = hidl_vec<uint32_t>{3, 4};
driver->getSupportedOperations(model3, cb);
BOOST_TEST((int)errorStatus == (int)ErrorStatus::NONE);