IVGCVSW-1863 Support NHWC for L2Normalization

 * Added L2NormalizationDescriptor struct with m_DataLyaout member
 * Updated all IsL2NormalizationSupported calls to take a descriptor
   as an argument
 * Updated L2NormalizationLayer to take a descriptor as an argument

!android-nn-driver:150116

Change-Id: I0459352d19cfd269bc864a70cf73910bf44fdc01

2 files changed, 6 insertions, 6 deletions

diff --git a/src/armnn/layers/L2NormalizationLayer.cpp b/src/armnn/layers/L2NormalizationLayer.cpp
index c114a80c30..683c7db781 100644
--- a/src/armnn/layers/L2NormalizationLayer.cpp
+++ b/src/armnn/layers/L2NormalizationLayer.cpp
@@ -13,8 +13,8 @@
 namespace armnn
 {
 
-L2NormalizationLayer::L2NormalizationLayer(const char* name)
-    : Layer(1, 1, LayerType::L2Normalization, name)
+L2NormalizationLayer::L2NormalizationLayer(const L2NormalizationDescriptor& param, const char* name)
+    : LayerWithParameters(1, 1, LayerType::L2Normalization, param, name)
 {
 }
 
@@ -27,7 +27,7 @@ std::unique_ptr<IWorkload> L2NormalizationLayer::CreateWorkload(const Graph& gra
 
 L2NormalizationLayer* L2NormalizationLayer::Clone(Graph& graph) const
 {
-    return CloneBase<L2NormalizationLayer>(graph, GetName());
+    return CloneBase<L2NormalizationLayer>(graph, m_Param, GetName());
 }
 
 void L2NormalizationLayer::ValidateTensorShapesFromInputs()
diff --git a/src/armnn/layers/L2NormalizationLayer.hpp b/src/armnn/layers/L2NormalizationLayer.hpp
index fdf46eb921..bf4d49e7c8 100644
--- a/src/armnn/layers/L2NormalizationLayer.hpp
+++ b/src/armnn/layers/L2NormalizationLayer.hpp
@@ -4,12 +4,12 @@
 //
 #pragma once
 
-#include <Layer.hpp>
+#include "LayerWithParameters.hpp"
 
 namespace armnn
 {
 
-class L2NormalizationLayer : public Layer
+class L2NormalizationLayer : public LayerWithParameters<L2NormalizationDescriptor>
 {
 public:
     virtual std::unique_ptr<IWorkload> CreateWorkload(const Graph& graph,
@@ -20,7 +20,7 @@ public:
     void ValidateTensorShapesFromInputs() override;
 
 protected:
-    L2NormalizationLayer(const char* name);
+    L2NormalizationLayer(const L2NormalizationDescriptor& param, const char* name);
     ~L2NormalizationLayer() = default;
 };