From 9a0444164b638dddbf480aa4fb081796c687e0fd Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Mon, 17 Aug 2020 19:08:35 +0100 Subject: IVGCVSW-5220 Fix UnknownCombinationsTest/UnknownDimensionsTest Signed-off-by: Finn Williams Change-Id: I4729497e67b711a8f1fbf7c555a26e97fa6c9ab6 --- ConversionUtils.hpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index f2f95ac8..51727a31 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -1287,10 +1287,22 @@ LayerInputHandle ConvertToLayerInputHandle(const ::android::hardware::neuralnetw try { armnn::TensorInfo operandTensorInfo = GetTensorInfoForOperand(*operand); + if (IsDynamicTensor(operandTensorInfo)) { - Fail("%s: dynamic input tensors are not supported", __func__); - return LayerInputHandle(); + const uint32_t operandIndex = operation.inputs[inputIndex]; + + // Check if the dynamic input tensors have been inferred by one of the previous layers + // If not we can't support them + if(data.m_OutputSlotForOperand.size() >= operandIndex && data.m_OutputSlotForOperand[operandIndex]) + { + operandTensorInfo = data.m_OutputSlotForOperand[operandIndex]->GetTensorInfo(); + } + else + { + Fail("%s: Type 2 dynamic input tensors are not supported", __func__); + return LayerInputHandle(); + } } switch (operand->lifetime) -- cgit v1.2.1