commit 6bda94a88536e8abb487a6ab29da4b8cfc8034e1
author FinnWilliamsArm <Finn.Williams@arm.com> Thu Jul 11 17:02:57 2019 +0100
committer FinnWilliamsArm <Finn.Williams@arm.com> Fri Jul 12 10:25:30 2019 +0100
tree d6573512781c15a39655265442b2ea4756d76390
parent aeae97353e2c7041b7b9aabafcdd5da9a683895b

IVGCVSW-3460 Fix VTS l2_normalization dynamic_output_shape test failures

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

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index cd00901..eb59442 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -968,11 +968,12 @@
     }
 
     const armnn::TensorInfo& inputInfo  = input.GetTensorInfo();
-    const armnn::TensorInfo& outputInfo = GetTensorInfoForOperand(*output);
+    armnn::TensorInfo outputInfo = GetTensorInfoForOperand(*output);
 
     if (IsDynamicOutput(outputInfo))
     {
-        return Fail("%s: Dynamic output not supported", __func__);
+        ALOGD("Output shape not set, will infer from inputs");
+        outputInfo.SetShape(inputInfo.GetShape());
     }
 
     armnn::L2NormalizationDescriptor desc;
@@ -992,7 +993,12 @@
     assert(layer != nullptr);
     input.Connect(layer->GetInputSlot(0));
 
-    return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation, 0, *layer, model, data);
+    return SetupAndTrackLayerOutputSlot<hal_1_0::HalPolicy>(operation,
+                                                            0,
+                                                            *layer,
+                                                            model,
+                                                            data,
+                                                            armnn::Optional<armnn::TensorInfo>(outputInfo));
 }
 
 bool HalPolicy::ConvertL2Pool2d(const Operation& operation, const Model& model, ConversionData& data)