From 6fd4cebb1737555a34a70393ea88a785937534ec Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Thu, 19 Dec 2019 15:45:35 +0000 Subject: IVGCVSW-4301 Correctly validate reshape for broadcastable inputs !android-nn-driver:2642 Signed-off-by: Derek Lamberti Change-Id: I4db6ea4ed0a192c85f124c4a9ced60b1666a3870 Signed-off-by: Teresa Charlin --- ConversionUtils.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ConversionUtils.hpp') diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index b3f1ac72..4881ec9e 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -241,7 +241,6 @@ armnn::IConnectableLayer& AddReshapeLayer(armnn::INetwork& network, bool BroadcastTensor(LayerInputHandle& input0, LayerInputHandle& input1, - const armnn::TensorInfo& outputInfo, armnn::IConnectableLayer* startLayer, ConversionData& data) { @@ -292,8 +291,8 @@ bool BroadcastTensor(LayerInputHandle& input0, IsReshapeSupported, data.m_Backends, isSupported, + smallInfo, reshapedInfo, - outputInfo, reshapeDescriptor); if (!isSupported) { @@ -1594,7 +1593,7 @@ bool ConvertAdd(const HalOperation& operation, const HalModel& model, Conversion if (endLayer != nullptr) { - bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data); + bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); if (!isReshapeSupported) { return false; @@ -2408,7 +2407,7 @@ bool ConvertDiv(const HalOperation& operation, const HalModel& model, Conversion if (endLayer) { - bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data); + bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); if (!isReshapeSupported) { return false; @@ -3009,7 +3008,7 @@ bool ConvertMul(const HalOperation& operation, const HalModel& model, Conversion if (endLayer != nullptr) { - bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data); + bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); if (!isReshapeSupported) { return false; @@ -3218,7 +3217,7 @@ bool ConvertSub(const HalOperation& operation, const HalModel& model, Conversion if (endLayer) { - bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data); + bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data); if (!isReshapeSupported) { return false; -- cgit v1.2.1