commit 573a8fa04ef0774fe44a4ac6669582a6bf753d6e
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Tue Jul 23 14:01:37 2019 +0100
committer Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Tue Jul 23 14:33:20 2019 +0100
tree efb5f466c71af293597506ee77dcf9f944c6559f
parent 074c25a1535b648fdf19d7f6648e8aceef9aa7ad

IVGCVSW-3553 Fix failing zero_sized tests

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: Idd10f34babc0d2552d599872b853ba5fb5c98351

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index 8c61700..a2c8252 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -9,6 +9,7 @@
 
 #include "FullyConnected.hpp"
 #include "OutputShapeUtils.hpp"
+#include "Utils.hpp"
 
 namespace armnn_driver
 {
@@ -397,7 +398,7 @@
     }
 
     armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand);
-    if (IsDynamicOutput(outputInfo))
+    if (IsDynamicTensor(outputInfo))
     {
         ALOGD("Output shape not set, will infer from input");
         outputInfo.SetShape(input.GetTensorInfo().GetShape());
@@ -477,7 +478,7 @@
     const armnn::TensorInfo& inputInfo = input.GetTensorInfo();
     armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output);
 
-    if (IsDynamicOutput(outputInfo))
+    if (IsDynamicTensor(outputInfo))
     {
         ALOGD("Output shape not set, will infer from inputs");
         outputInfo.SetShape(inputInfo.GetShape());
@@ -1004,7 +1005,7 @@
     const armnn::TensorInfo& inputInfo  = input.GetTensorInfo();
     armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output);
 
-    if (IsDynamicOutput(outputInfo))
+    if (IsDynamicTensor(outputInfo))
     {
         ALOGD("Output shape not set, will infer from inputs");
         outputInfo.SetShape(inputInfo.GetShape());
@@ -1147,7 +1148,7 @@
     }
 
     armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*outputOperand);
-    if (IsDynamicOutput(outputInfo))
+    if (IsDynamicTensor(outputInfo))
     {
         ALOGD("Output shape not set, will infer from input");
         outputInfo.SetShape(input.GetTensorInfo().GetShape());