diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2021-12-13 18:48:12 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2022-01-14 16:01:58 +0000 |
commit | 56ccf68c7858560f2ba00f19076b3cb112970881 (patch) | |
tree | 6e19cd38aa1d452ca3b9a9a1f68ff42dd64dc1d7 /src/backends/neon | |
parent | 2db6d5aff3d4f596d4b4018a7b454c2a2c8f7122 (diff) | |
download | armnn-56ccf68c7858560f2ba00f19076b3cb112970881.tar.gz |
IVGCVSW-6633 SubgraphView uses IConnectableLayer rather than Layer in its m_Layers
* Added IInputSlot, IOutputSlot and IConnectableLayer to SubgraphView
* Deprecated old member functions
* Removed deprecated calls in ArmNN
* Added GetOwningIConnectableLayer function to IOutputSlot
* Updates ArmNN Core Major version for IOutputSlot ABI break
* Updated Minor version of TfliteParser, OnnxParser and Delegate
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I2a8611bfabf5ae09d3602fe6a4bef166e18117b9
Diffstat (limited to 'src/backends/neon')
-rw-r--r-- | src/backends/neon/NeonBackend.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp index aa5ba03075..54af14e30b 100644 --- a/src/backends/neon/NeonBackend.cpp +++ b/src/backends/neon/NeonBackend.cpp @@ -132,21 +132,21 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph { OptimizationViews optimizationViews; - auto it = subgraph.end(); + auto it = subgraph.endIConnectable(); std::map<LayerGuid, Layer*> untouched; - while (it != subgraph.begin()) + while (it != subgraph.beginIConnectable()) { --it; - Layer& base = **it; + Layer& base = *(PolymorphicDowncast<Layer*>(*it)); untouched.insert({base.GetGuid(), &base}); } - it = subgraph.end(); - while (it != subgraph.begin()) + it = subgraph.endIConnectable(); + while (it != subgraph.beginIConnectable()) { --it; - Layer& base = **it; + Layer& base = *(PolymorphicDowncast<Layer*>(*it)); // Fuse activation into previous layer if supported by backend if ((base.GetType() == LayerType::DepthwiseConvolution2d || base.GetType() == LayerType::Convolution2d @@ -390,9 +390,9 @@ OptimizationViews NeonBackend::OptimizeSubgraphView(const SubgraphView& subgraph if (!reduceDescriptor.m_vAxis.empty() && reduceDescriptor.m_vAxis.size() > 1) { // Add new layers to the graph and connect them. - std::vector<Layer*> layers = ChainReduceLayers<ReduceLayer>(optimizationViews, - baseLayer, - reduceDescriptor); + std::vector<IConnectableLayer*> layers = ChainReduceLayers<ReduceLayer>(optimizationViews, + baseLayer, + reduceDescriptor); // Replace existing baselayer with new subgraph. ReplaceLayers<ReduceLayer>(optimizationViews, baseLayer, layers); |