IVGCVSW-3457 Fix VTS pad dynamic_output_shape test failures
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Icb9a308f19ac6adbcf0d1de4d8733b95bab3bf0a
diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp
index dbd380a..9f2c9be 100644
--- a/1.1/HalPolicy.cpp
+++ b/1.1/HalPolicy.cpp
@@ -297,10 +297,11 @@
return Fail("%s: Could not read output", __func__);
}
- const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output);
+ armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output);
if (IsDynamicOutput(outputInfo))
{
- return Fail("%s: Dynamic output not supported", __func__);
+ ALOGD("Output shape not set, will infer from inputs");
+ outputInfo.SetShape(InferPadOutputShape(inputInfo.GetShape(), descriptor.m_PadList));
}
if (!IsLayerSupportedForAnyBackend(__func__,
@@ -318,7 +319,12 @@
input.Connect(layer->GetInputSlot(0));
layer->GetOutputSlot(0).SetTensorInfo(outputInfo);
- return SetupAndTrackLayerOutputSlot<hal_1_1::HalPolicy>(operation, 0, *layer, model, data);
+ return SetupAndTrackLayerOutputSlot<hal_1_1::HalPolicy>(operation,
+ 0,
+ *layer,
+ model,
+ data,
+ armnn::Optional<armnn::TensorInfo>(outputInfo));
}
bool HalPolicy::ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data)