commit 2c90f75496d2c0210a43f35ddb75f6492dd06490
author Derek Lamberti <derek.lamberti@arm.com> Thu Dec 19 15:45:35 2019 +0000
committer Kevin May <kevin.may@arm.com> Thu Dec 19 17:41:10 2019 +0000
tree 6cd95f16e1b5efc8aa002ea199da253d56336e93
parent d2697984e7d7989f5a8154c46a1bf37d98479415

IVGCVSW-4301 Correctly validate reshape for broadcastable inputs

Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Change-Id: I4db6ea4ed0a192c85f124c4a9ced60b1666a3870

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 4e4b4d6..a342d39 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -236,7 +236,7 @@
     return *reshapeLayer;
 }
 
-bool BroadcastTensor(LayerInputHandle& input0, LayerInputHandle& input1, const armnn::TensorInfo& outputInfo,
+bool BroadcastTensor(LayerInputHandle& input0, LayerInputHandle& input1,
                      armnn::IConnectableLayer* startLayer, ConversionData& data)
 {
     BOOST_ASSERT(startLayer != nullptr);
@@ -286,8 +286,8 @@
                                IsReshapeSupported,
                                data.m_Backends,
                                isSupported,
+                               smallInfo,
                                reshapedInfo,
-                               outputInfo,
                                reshapeDescriptor);
     if (!isSupported)
     {
@@ -1584,7 +1584,7 @@
 
     if (endLayer != nullptr)
     {
-        bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data);
+        bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
         if (!isReshapeSupported)
         {
             return false;
@@ -2398,7 +2398,7 @@
 
     if (endLayer)
     {
-        bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data);
+        bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
         if (!isReshapeSupported)
         {
             return false;
@@ -2974,7 +2974,7 @@
 
     if (endLayer != nullptr)
     {
-        bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data);
+        bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
         if (!isReshapeSupported)
         {
             return false;
@@ -3183,7 +3183,7 @@
 
     if (endLayer)
     {
-        bool isReshapeSupported = BroadcastTensor(input0, input1, outputInfo, startLayer, data);
+        bool isReshapeSupported = BroadcastTensor(input0, input1, startLayer, data);
         if (!isReshapeSupported)
         {
             return false;