aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/Graph.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/armnn/Graph.cpp')
-rw-r--r--src/armnn/Graph.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/armnn/Graph.cpp b/src/armnn/Graph.cpp
index 0591bea99a..6d24e50bdc 100644
--- a/src/armnn/Graph.cpp
+++ b/src/armnn/Graph.cpp
@@ -435,8 +435,11 @@ void Graph::SubstituteSubgraph(SubgraphView& subgraph, IConnectableLayer* substi
{
ARMNN_ASSERT(substituteLayer != nullptr);
- ReplaceSubgraphConnections(subgraph, substituteLayer);
- EraseSubgraphLayers(subgraph);
+ // Create a new sub-graph with only the given layer, using
+ // the given sub-graph as a reference of which parent graph to use
+ SubgraphView substituteSubgraph(substituteLayer);
+
+ SubstituteSubgraph(subgraph, substituteSubgraph);
}
void Graph::SubstituteSubgraph(SubgraphView& subgraph, const SubgraphView& substituteSubgraph)
@@ -456,16 +459,6 @@ void Graph::SubstituteSubgraph(SubgraphView& subgraph, const SubgraphView& subst
TopologicalSort();
}
-void Graph::ReplaceSubgraphConnections(const SubgraphView& subgraph, IConnectableLayer* substituteLayer)
-{
- ARMNN_ASSERT(substituteLayer != nullptr);
-
- // Create a new sub-graph with only the given layer, using
- // the given sub-graph as a reference of which parent graph to use
- SubgraphView substituteSubgraph(substituteLayer);
- ReplaceSubgraphConnections(subgraph, substituteSubgraph);
-}
-
void Graph::ReplaceSubgraphConnections(const SubgraphView& subgraph, const SubgraphView& substituteSubgraph)
{
ARMNN_ASSERT_MSG(!substituteSubgraph.GetLayers().empty(), "New sub-graph used for substitution must not be empty");