IVGCVSW-3034 Updates to SubstituteSubGraph and

ReplaceSubgraphConnections to support Graphs instead of
SubGraphViews

 * Added layer iteration function to SubgraphView similar to
   the Graph's one
 * Updated SubstituteSubgraph to reparent the layers to the
   calling graph

Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: Ib2f8e70decca4a59c53ceb127e07ef5a430d1005

1 files changed, 11 insertions, 0 deletions

diff --git a/src/armnn/SubgraphView.hpp b/src/armnn/SubgraphView.hpp
index d86f1c1c93..f29e0a18ae 100644
--- a/src/armnn/SubgraphView.hpp
+++ b/src/armnn/SubgraphView.hpp
@@ -23,6 +23,17 @@ namespace armnn
 class SubgraphView final
 {
 public:
+    template <typename Func>
+    void ForEachLayer(Func func) const
+    {
+        for (auto it = m_Layers.begin(); it != m_Layers.end(); )
+        {
+             auto next = std::next(it);
+             func(*it);
+             it = next;
+        }
+    }
+
     using SubgraphViewPtr = std::unique_ptr<SubgraphView>;
     using InputSlots = std::vector<InputSlot*>;
     using OutputSlots = std::vector<OutputSlot*>;