commit 616acc602eff2a4a56a8f53b160eed51eaaf0afd
author Rob Hughes <robert.hughes@arm.com> Wed Jul 24 08:21:03 2019 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Wed Jul 24 10:08:19 2019 +0000
tree 96185b6d9b3b66b7eabd7fada7171a978d7db32d
parent a723ec5d2ac35948efb5dfd0c121a1a89cb977b7

NNXSW-1697 Remove use of SubgraphView that may become invalid.

The mainSubgraph variable held references to layers in the optimised
graph that become invalid when a graph substitution is made.

The fix is to always use the optimised graph itself rather than a
view of it. The view served no purpose anyway.

!android-nn-driver:1221

Change-Id: I579f503827db8f7fcb01443237c9d888d496425f
Signed-off-by: Rob Hughes <robert.hughes@arm.com>

src/armnn/Network.cpp

diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp
index b80e0e7..0d06042 100644
--- a/src/armnn/Network.cpp
+++ b/src/armnn/Network.cpp
@@ -334,9 +334,6 @@
     // Get the optimized graph
     Graph& optGraph = optNetObjPtr->GetGraph();
 
-    // Get the entire graph as a sub-graph
-    SubgraphView mainSubgraph(optGraph);
-
     // Run backend specific optimizations
     auto const& backendRegistry = BackendRegistryInstance();
     for (auto&& selectedBackend : backendSettings.m_SelectedBackends)
@@ -347,7 +344,7 @@
 
         // Select sub-graphs based on backend
         SubgraphViewSelector::Subgraphs subgraphs =
-                SubgraphViewSelector::SelectSubgraphs(mainSubgraph,
+                SubgraphViewSelector::SelectSubgraphs(optGraph,
                                                       // Select layers assigned to the requested backend
                                                       [&backendObjPtr](const Layer& layer)
                                                       {