From 4918446f3490e4edab86a5dc75aba3cdf74ae430 Mon Sep 17 00:00:00 2001 From: Finn Williams Date: Fri, 2 Oct 2020 13:28:34 +0100 Subject: IVGCVSW-5356 Fix skipping VTS DynamicOutputShape FullyConnected Signed-off-by: Finn Williams Change-Id: I011466158b6736670bafba474e8c9ce12c38e229 --- ConversionUtils.hpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index b9c4d411..5837d3df 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -3065,17 +3065,19 @@ bool ConvertFullyConnected(const HalOperation& operation, const HalModel& model, desc.m_TransposeWeightMatrix = true; desc.m_BiasEnabled = true; - if (!VerifyFullyConnectedShapes(reshapedInfo.GetShape(), - weights.GetInfo().GetShape(), - outputInfo.GetShape(), - desc.m_TransposeWeightMatrix)) - { - return Fail("%s: Expected outputShape does not match actual outputShape", __func__); - } - bool isSupported = false; auto validateFunc = [&](const armnn::TensorInfo& outputInfo, bool& isSupported) { + if (!VerifyFullyConnectedShapes(reshapedInfo.GetShape(), + weights.GetInfo().GetShape(), + outputInfo.GetShape(), + desc.m_TransposeWeightMatrix)) + { + isSupported = false; + Fail("%s: Expected outputShape does not match actual outputShape", __func__); + return; + } + FORWARD_LAYER_SUPPORT_FUNC(__func__, IsFullyConnectedSupported, data.m_Backends, -- cgit v1.2.1