From 56ccf68c7858560f2ba00f19076b3cb112970881 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 13 Dec 2021 18:48:12 +0000 Subject: 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 Change-Id: I2a8611bfabf5ae09d3602fe6a4bef166e18117b9 --- src/backends/backendsCommon/OptimizationViews.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'src/backends/backendsCommon/OptimizationViews.cpp') diff --git a/src/backends/backendsCommon/OptimizationViews.cpp b/src/backends/backendsCommon/OptimizationViews.cpp index eee2c67ea9..e81a6912a1 100644 --- a/src/backends/backendsCommon/OptimizationViews.cpp +++ b/src/backends/backendsCommon/OptimizationViews.cpp @@ -17,24 +17,28 @@ bool OptimizationViews::Validate(const armnn::SubgraphView& originalSubgraph) co bool valid = true; // Create a copy of the layer list from the original subgraph and sort it - SubgraphView::Layers originalLayers = originalSubgraph.GetLayers(); + SubgraphView::IConnectableLayers originalLayers = originalSubgraph.GetIConnectableLayers(); originalLayers.sort(); // Create a new list based on the sum of all the subgraphs and sort it - SubgraphView::Layers countedLayers; + SubgraphView::IConnectableLayers countedLayers; for (auto& failed : m_FailedOptimizations) { - countedLayers.insert(countedLayers.end(), failed.GetLayers().begin(), failed.GetLayers().end()); + countedLayers.insert(countedLayers.end(), + failed.GetIConnectableLayers().begin(), + failed.GetIConnectableLayers().end()); } for (auto& untouched : m_UntouchedSubgraphs) { - countedLayers.insert(countedLayers.end(), untouched.GetLayers().begin(), untouched.GetLayers().end()); + countedLayers.insert(countedLayers.end(), + untouched.GetIConnectableLayers().begin(), + untouched.GetIConnectableLayers().end()); } for (auto& successful : m_SuccesfulOptimizations) { countedLayers.insert(countedLayers.end(), - successful.m_SubstitutableSubgraph.GetLayers().begin(), - successful.m_SubstitutableSubgraph.GetLayers().end()); + successful.m_SubstitutableSubgraph.GetIConnectableLayers().begin(), + successful.m_SubstitutableSubgraph.GetIConnectableLayers().end()); } countedLayers.sort(); @@ -56,8 +60,8 @@ bool OptimizationViews::Validate(const armnn::SubgraphView& originalSubgraph) co bool validSubstitution = true; const SubgraphView& replacement = substitution.m_ReplacementSubgraph; const SubgraphView& old = substitution.m_SubstitutableSubgraph; - validSubstitution &= replacement.GetInputSlots().size() == old.GetInputSlots().size(); - validSubstitution &= replacement.GetOutputSlots().size() == old.GetOutputSlots().size(); + validSubstitution &= replacement.GetIInputSlots().size() == old.GetIInputSlots().size(); + validSubstitution &= replacement.GetIOutputSlots().size() == old.GetIOutputSlots().size(); valid &= validSubstitution; } } -- cgit v1.2.1