From 6bda94a88536e8abb487a6ab29da4b8cfc8034e1 Mon Sep 17 00:00:00 2001
From: FinnWilliamsArm <Finn.Williams@arm.com>
Date: Thu, 11 Jul 2019 17:02:57 +0100
Subject: 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 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to '1.0')

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index cd009011..eb594427 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -968,11 +968,12 @@ bool HalPolicy::ConvertL2Normalization(const Operation& operation, const Model&
     }
 
     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 @@ bool HalPolicy::ConvertL2Normalization(const Operation& operation, const Model&
     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)
-- 
cgit v1.2.1