IVGCVSW-7830 Add backend optimizations to remove Reshapes where possible

 * Added optimization to remove reshapes for Neon and Ref Backends
   by using overridden TensorInfos
 * Added ability to delete Subgraphs during Optimization
 * Fixed naming error in NeonEndToEndTests and CLEndToEndTests
 * Added LayerNameAndTypeCheck for testing.
 * Fixed error where layers were not marked as altered when removed in
   CLBackend

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I1ac25cd4ec9821470d961831ae2c8d24882276cc

1 files changed, 22 insertions, 0 deletions

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index 2abaf44587..ae5bde17ca 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -1310,6 +1310,28 @@ OptimizationResult ApplyBackendOptimizations(OptimizedNetworkImpl* optNetObjPtr,
                     });
             }
 
+            // Remove deleted sub-graphs
+            for (auto& deletedSubgraph : optimizationViews.GetDeletedSubgraphs())
+            {
+                for (auto& l : deletedSubgraph.GetIConnectableLayers())
+                {
+                    Layer* deletedLayer = PolymorphicDowncast<Layer*>(l);
+                    for (unsigned int in = deletedLayer->GetNumInputSlots(); in > 0; --in)
+                    {
+                        auto inputSlot = deletedLayer->GetInputSlot(in -1);
+                        OutputSlot* parentOut = inputSlot.GetConnectedOutputSlot();
+                        parentOut->Disconnect(inputSlot);
+                        for (unsigned int out = deletedLayer->GetOutputSlot(in -1).GetNumConnections(); out > 0; --out)
+                        {
+                            InputSlot *childIn = deletedLayer->GetOutputSlot(in - 1).GetConnection(out -1);
+                            deletedLayer->GetOutputSlot(in - 1).Disconnect(*childIn);
+                            parentOut->Connect(*childIn);
+                        }
+                    }
+                    optGraph.EraseLayer(deletedLayer);
+                }
+            }
+
             if (!optimizationViews.GetFailedSubgraphs().empty())
             {
                 std::stringstream warningMsg;