commit 92ec725cb80f6c04f4bc952422fe285f3f42d559
author FinnWilliamsArm <Finn.Williams@arm.com> Tue Jul 16 12:15:18 2019 +0100
committer Áron Virginás-Tar <aron.virginas-tar@arm.com> Tue Jul 16 14:05:32 2019 +0000
tree 76c3a9c412ecdd8b673616a87dfaa99b41b47c51
parent be5d356c1663009c69c934fd860db1f91863e3d1

IVGCVSW-3498 Fix Vts 1.2 fully_connected dynamic output tests

Signed-off-by: FinnWilliamsArm <Finn.Williams@arm.com>
Change-Id: Id28e4bd1d55f02c5011f8a364d4b715d1a9190db

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index b87727c..8c61700 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -475,7 +475,13 @@
     }
 
     const armnn::TensorInfo& inputInfo = input.GetTensorInfo();
-    const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output);
+    armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output);
+
+    if (IsDynamicOutput(outputInfo))
+    {
+        ALOGD("Output shape not set, will infer from inputs");
+        outputInfo.SetShape(inputInfo.GetShape());
+    }
 
     // ArmNN does not currently support non-fixed weights or bias
     ConstTensorPin weightsPin =
@@ -549,7 +555,12 @@
             input.Connect(startLayer->GetInputSlot(0));
         }
 
-        return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation, 0, *endLayer, model, data);
+        return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation,
+                                                                0,
+                                                                *endLayer,
+                                                                model,
+                                                                data,
+                                                                armnn::Optional<armnn::TensorInfo>(outputInfo));
     }
     else
     {