From 64b19b548bd23f25c81006f378b7631d0288e26e Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Mon, 19 Aug 2019 09:49:58 +0100 Subject: IVGCVSW-3618 Fix VTS/Neural Netwok Test Failures * Added IsReshapeSupported check on available backend(s) after adding Reshape layer. Signed-off-by: Sadik Armagan Change-Id: I38a36d5a3db0d67f0e4b4be2ef672dedb75bff22 --- 1.2/HalPolicy.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to '1.2') diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index 7fe5f88e..3cd7ce48 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -545,7 +545,11 @@ bool HalPolicy::ConvertMaximum(const Operation& operation, const Model& model, C armnn::IConnectableLayer* layer = data.m_Network->AddMaximumLayer(); assert(layer != nullptr); - BroadcastTensor(input0, input1, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data); } @@ -596,7 +600,11 @@ bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, C armnn::IConnectableLayer* const layer = data.m_Network->AddMinimumLayer(); assert(layer != nullptr); - BroadcastTensor(input0, input1, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input0, input1, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data); } @@ -755,7 +763,11 @@ bool HalPolicy::ConvertPrelu(const Operation& operation, const Model& model, Con return Fail("%s: AddPreluLayer failed", __func__); } - BroadcastTensor(input, alpha, layer, *data.m_Network); + bool isReshapeSupported = BroadcastTensor(input, alpha, layer, data); + if (!isReshapeSupported) + { + return false; + } return SetupAndTrackLayerOutputSlot(operation, 0, *layer, model, data); } -- cgit v1.2.1