commit 58f7109a50a58f106bd3d12cd508785aa5e2a8a4
author Matteo Martincigh <matteo.martincigh@arm.com> Tue Sep 25 15:58:52 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Fri Oct 12 11:59:53 2018 +0100
tree c97755cc70abe637b6fff4e75e2003e86e6696b2
parent 96bedf0a0c6b48a884d4ff90192244259e9efb6d

IVGCVSW-1863 Support NHWC for L2Normalization

 * Added L2NormalizationDescriptor to ConvertL2Normalization

!armnn:150051

Change-Id: I622d7a8af2bfd27e7d4543a24c59e53988cb5d82

1.0/HalPolicy.cpp

diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp
index d3c6dba..1375df3 100644
--- a/1.0/HalPolicy.cpp
+++ b/1.0/HalPolicy.cpp
@@ -1084,16 +1084,19 @@
     const armnn::TensorInfo swizzledInputInfo  = armnnUtils::Permuted(inputInfo, NHWCToArmNN);
     const armnn::TensorInfo swizzledOutputInfo = armnnUtils::Permuted(outputInfo, NHWCToArmNN);
 
+    armnn::L2NormalizationDescriptor desc;
+
     if (!IsLayerSupported(__func__,
                           armnn::IsL2NormalizationSupported,
                           data.m_Compute,
                           swizzledInputInfo,
-                          swizzledOutputInfo))
+                          swizzledOutputInfo,
+                          desc))
     {
         return false;
     }
 
-    armnn::IConnectableLayer* layer = data.m_Network->AddL2NormalizationLayer();
+    armnn::IConnectableLayer* layer = data.m_Network->AddL2NormalizationLayer(desc);
     assert(layer != nullptr);
     layer->GetOutputSlot(0).SetTensorInfo(swizzledOutputInfo);
 
@@ -1357,4 +1360,4 @@
 }
 
 } // namespace hal_1_0
-} // namespace armnn_driver
\ No newline at end of file
+} // namespace armnn_driver