diff options
author | Rob Hughes <robert.hughes@arm.com> | 2019-07-24 08:21:03 +0000 |
---|---|---|
committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-07-24 10:08:19 +0000 |
commit | 616acc602eff2a4a56a8f53b160eed51eaaf0afd (patch) | |
tree | 96185b6d9b3b66b7eabd7fada7171a978d7db32d /src/armnn/Network.cpp | |
parent | a723ec5d2ac35948efb5dfd0c121a1a89cb977b7 (diff) | |
download | armnn-branches/armnn_19_05.tar.gz |
NNXSW-1697 Remove use of SubgraphView that may become invalid.branches/armnn_19_05
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>
Diffstat (limited to 'src/armnn/Network.cpp')
-rw-r--r-- | src/armnn/Network.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index b80e0e7eec..0d06042abe 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -334,9 +334,6 @@ OptimizationResult ApplyBackendOptimizations(OptimizedNetwork* optNetObjPtr, // 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 @@ OptimizationResult ApplyBackendOptimizations(OptimizedNetwork* optNetObjPtr, // 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) { |