From 291a16b28522c75e1f44cb37f6b61585320da215 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Wed, 19 Aug 2020 22:54:00 +0100 Subject: IVGCVSW-5220 Set all operations to unsupported after encountering an unsupported operation with with dynamic inputs Change-Id: Ia30698d608810dabb419d7d326ad985789d50603 Signed-off-by: Finn Williams --- ConversionUtils.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ConversionUtils.hpp') diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 27d07200..830502df 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -44,12 +44,14 @@ struct ConversionData ConversionData(const std::vector& backends) : m_Backends(backends) , m_Network(nullptr, nullptr) + , m_DynamicInputsEncountered(false) {} const std::vector m_Backends; armnn::INetworkPtr m_Network; std::vector m_OutputSlotForOperand; std::vector m_MemPools; + bool m_DynamicInputsEncountered; }; class LayerInputHandle @@ -1290,11 +1292,13 @@ LayerInputHandle ConvertToLayerInputHandle(const ::android::hardware::neuralnetw if (IsDynamicTensor(operandTensorInfo)) { + data.m_DynamicInputsEncountered = true; + 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]) + if (data.m_OutputSlotForOperand.size() >= operandIndex && data.m_OutputSlotForOperand[operandIndex]) { operandTensorInfo = data.m_OutputSlotForOperand[operandIndex]->GetTensorInfo(); } -- cgit v1.2.1