From cbfd718464b8ac41f0338ae6565d8213d24c0a2a Mon Sep 17 00:00:00 2001
From: Cathal Corbett <cathal.corbett@arm.com>
Date: Wed, 15 Dec 2021 17:12:59 +0000
Subject: IVGCVSW-6632 OptimizationViews: has INetwork rather than Graph for
 holding layers

  * Deprecate the GetGraph() function in OptimizationViews & remove/fix
    occurances where OptimizationViews.GetGraph() is called.
  * OptimizationViews has member INetworkPtr.
  * OptimizationViews has GetINetwork() method.
  * Unit test added to OptimizationViewsTests.cpp.

Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: Ifc1e53f1c34d786502279631942f0472f401038e
---
 src/backends/neon/NeonBackend.cpp | 81 +++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

(limited to 'src/backends/neon')

diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index 0500ee3411..aa5ba03075 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -196,11 +196,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithWeightsAndBiases<Convolution2dLayer>(optimizationViews,
-                                                                                      baseLayer,
-                                                                                      activationLayer,
-                                                                                      activationDesc,
-                                                                                      name);
+                                    FuseConvolution2dLayer<Convolution2dLayer>(optimizationViews,
+                                                                               baseLayer,
+                                                                               activationLayer,
+                                                                               activationDesc,
+                                                                               name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -227,11 +227,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithWeightsAndBiases<DepthwiseConvolution2dLayer>(optimizationViews,
-                                                                                               baseLayer,
-                                                                                               activationLayer,
-                                                                                               activationDesc,
-                                                                                               name);
+                                    FuseDepthwiseConvolution2dLayer<DepthwiseConvolution2dLayer>(optimizationViews,
+                                                                                                 baseLayer,
+                                                                                                 activationLayer,
+                                                                                                 activationDesc,
+                                                                                                 name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -250,11 +250,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithWeightsAndBiases<FullyConnectedLayer>(optimizationViews,
-                                                                                       baseLayer,
-                                                                                       activationLayer,
-                                                                                       activationDesc,
-                                                                                       name);
+                                    FuseFullyConnectedLayer<FullyConnectedLayer>(optimizationViews,
+                                                                                 baseLayer,
+                                                                                 activationLayer,
+                                                                                 activationDesc,
+                                                                                 name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -277,12 +277,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
                                 if (status)
                                 {
                                     BatchNormalizationLayer* replacementLayer =
-                                            FuseLayerWithParameters<BatchNormalizationLayer>(
-                                                    optimizationViews,
-                                                    baseLayer,
-                                                    activationLayer,
-                                                    activationDesc,
-                                                    name);
+                                        FuseBatchNormalizationLayer<BatchNormalizationLayer>(optimizationViews,
+                                                                                             baseLayer,
+                                                                                             activationLayer,
+                                                                                             activationDesc,
+                                                                                             name);
 
                                     replacementLayer->m_Beta     = std::move(baseLayer->m_Beta);
                                     replacementLayer->m_Gamma    = std::move(baseLayer->m_Gamma);
@@ -304,11 +303,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithoutParameters<AdditionLayer>(optimizationViews,
-                                                                              baseLayer,
-                                                                              activationLayer,
-                                                                              activationDesc,
-                                                                              name);
+                                    FuseAdditionLayer<AdditionLayer>(optimizationViews,
+                                                                     baseLayer,
+                                                                     activationLayer,
+                                                                     activationDesc,
+                                                                     name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -325,11 +324,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithoutParameters<DivisionLayer>(optimizationViews,
-                                                                              baseLayer,
-                                                                              activationLayer,
-                                                                              activationDesc,
-                                                                              name);
+                                    FuseDivisionLayer<DivisionLayer>(optimizationViews,
+                                                                     baseLayer,
+                                                                     activationLayer,
+                                                                     activationDesc,
+                                                                     name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -346,11 +345,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithoutParameters<MultiplicationLayer>(optimizationViews,
-                                                                                    baseLayer,
-                                                                                    activationLayer,
-                                                                                    activationDesc,
-                                                                                    name);
+                                    FuseMultiplicationLayer<MultiplicationLayer>(optimizationViews,
+                                                                                 baseLayer,
+                                                                                 activationLayer,
+                                                                                 activationDesc,
+                                                                                 name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
@@ -367,11 +366,11 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph
 
                                 if (status)
                                 {
-                                    FuseLayerWithoutParameters<SubtractionLayer>(optimizationViews,
-                                                                                 baseLayer,
-                                                                                 activationLayer,
-                                                                                 activationDesc,
-                                                                                 name);
+                                    FuseSubtractionLayer<SubtractionLayer>(optimizationViews,
+                                                                           baseLayer,
+                                                                           activationLayer,
+                                                                           activationDesc,
+                                                                           name);
                                     untouched.erase(baseLayer->GetGuid());
                                     untouched.erase(activationLayer->GetGuid());
                                 }
-- 
cgit v1.2.1