From a7240e7fe5734b777b7776c5869ee49a22f3f528 Mon Sep 17 00:00:00 2001
From: Nikhil Raj <nikhil.raj@arm.com>
Date: Mon, 17 Jun 2019 14:38:34 +0100
Subject: IVGCVSW-3273 ArmnnQuantizer:  UnimplementedException thrown for:
 VisitNormalizationLayer

Change-Id: Ic2929635c1c15c09f493053b2e64ddfbab2fe217
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
---
 src/armnn/QuantizerVisitor.cpp | 27 ++++++++++++++++++---------
 src/armnn/QuantizerVisitor.hpp |  8 ++++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/armnn/QuantizerVisitor.cpp b/src/armnn/QuantizerVisitor.cpp
index feb9205199..c6a55f404c 100644
--- a/src/armnn/QuantizerVisitor.cpp
+++ b/src/armnn/QuantizerVisitor.cpp
@@ -302,6 +302,15 @@ void QuantizerVisitor::VisitMultiplicationLayer(const IConnectableLayer* layer,
     SetQuantizedInputConnections(layer, newLayer);
 }
 
+void QuantizerVisitor::VisitNormalizationLayer(const armnn::IConnectableLayer* layer,
+                                               const armnn::NormalizationDescriptor& normalizationDescriptor,
+                                               const char* name)
+{
+    IConnectableLayer* newLayer = m_QuantizedNetwork->AddNormalizationLayer(normalizationDescriptor, name);
+    RecordLayer(layer, newLayer);
+    SetQuantizedInputConnections(layer, newLayer);
+}
+
 void QuantizerVisitor::VisitOutputLayer(const IConnectableLayer* layer, LayerBindingId id, const char* name)
 {
     const TensorInfo& info = layer->GetInputSlot(0).GetConnection()->GetTensorInfo();
@@ -376,6 +385,15 @@ void QuantizerVisitor::VisitRsqrtLayer(const IConnectableLayer* layer,
     SetQuantizedInputConnections(layer, newLayer);
 }
 
+void QuantizerVisitor::VisitSoftmaxLayer(const IConnectableLayer* layer,
+                                         const SoftmaxDescriptor& softmaxDescriptor,
+                                         const char* name)
+{
+    IConnectableLayer* newLayer = m_QuantizedNetwork->AddSoftmaxLayer(softmaxDescriptor, name);
+    RecordLayer(layer, newLayer);
+    SetQuantizedInputConnections(layer, newLayer);
+}
+
 void QuantizerVisitor::VisitSpaceToBatchNdLayer(const IConnectableLayer* layer,
                                                 const SpaceToBatchNdDescriptor& spaceToBatchNdDescriptor,
                                                 const char* name)
@@ -403,15 +421,6 @@ void QuantizerVisitor::VisitSplitterLayer(const IConnectableLayer* layer,
     SetQuantizedInputConnections(layer, newLayer);
 }
 
-void QuantizerVisitor::VisitSoftmaxLayer(const IConnectableLayer* layer,
-                                         const SoftmaxDescriptor& softmaxDescriptor,
-                                         const char* name)
-{
-    IConnectableLayer* newLayer = m_QuantizedNetwork->AddSoftmaxLayer(softmaxDescriptor, name);
-    RecordLayer(layer, newLayer);
-    SetQuantizedInputConnections(layer, newLayer);
-}
-
 void QuantizerVisitor::VisitStridedSliceLayer(const IConnectableLayer* layer,
                                               const StridedSliceDescriptor& stridedSliceDescriptor,
                                               const char* name)
diff --git a/src/armnn/QuantizerVisitor.hpp b/src/armnn/QuantizerVisitor.hpp
index ab773d42eb..1f1f651c1a 100644
--- a/src/armnn/QuantizerVisitor.hpp
+++ b/src/armnn/QuantizerVisitor.hpp
@@ -79,12 +79,16 @@ public:
     void VisitInputLayer(const IConnectableLayer* layer, LayerBindingId id, const char* name = nullptr) override;
 
     void VisitMeanLayer(const IConnectableLayer* layer,
-                          const MeanDescriptor& meanDescriptor,
-                          const char* name = nullptr) override;
+                        const MeanDescriptor& meanDescriptor,
+                        const char* name = nullptr) override;
 
     void VisitMultiplicationLayer(const IConnectableLayer* layer,
                                   const char* name = nullptr) override;
 
+    void VisitNormalizationLayer(const armnn::IConnectableLayer* layer,
+                                 const armnn::NormalizationDescriptor& normalizationDescriptor,
+                                 const char* name = nullptr) override;
+
     void VisitOutputLayer(const IConnectableLayer* layer, LayerBindingId id, const char* name = nullptr)  override;
 
     void VisitPadLayer(const IConnectableLayer*,
-- 
cgit v1.2.1