IVGCVSW-7155 SubgraphView::SubstituteSubgraph IOutputSlots incorrectly overridden
Signed-off-by: Cathal Corbett <cathal.corbett@arm.com>
Change-Id: If594e291951a5f9ed1957a19a971c498f6e7843f
diff --git a/include/armnn/backends/SubgraphView.hpp b/include/armnn/backends/SubgraphView.hpp
index f2aa12c..fcb2014 100644
--- a/include/armnn/backends/SubgraphView.hpp
+++ b/include/armnn/backends/SubgraphView.hpp
@@ -177,6 +177,9 @@
/// Arrange the order of layers topologically so that nodes can be visited in valid order
void ArrangeBySortOrder();
+ /// Updates the IInputSlots and IOutputSlots variables assigned to a SubgraphView
+ void UpdateSubgraphViewSlotPointers(SubgraphView&, const SubgraphView&);
+
/// The list of pointers to the input slots of the parent graph.
InputSlots m_InputSlots;
IInputSlots m_IInputSlots;
diff --git a/src/armnn/SubgraphView.cpp b/src/armnn/SubgraphView.cpp
index 804ff73..b48529c 100644
--- a/src/armnn/SubgraphView.cpp
+++ b/src/armnn/SubgraphView.cpp
@@ -525,6 +525,44 @@
SubstituteSubgraph(subgraph, substituteSubgraph);
}
+void SubgraphView::UpdateSubgraphViewSlotPointers(SubgraphView& patternSubgraph,
+ const SubgraphView& substituteSubgraph)
+{
+ std::vector<IInputSlot*>::iterator inputSlotPosition;
+ // search for and erase any InputSlots that appear in the WorkingCopy that match those in the PatternSubgraph
+ for (auto slot : patternSubgraph.GetIInputSlots())
+ {
+ inputSlotPosition = std::find(m_IInputSlots.begin(), m_IInputSlots.end(), slot);
+ if (inputSlotPosition != m_IInputSlots.end())
+ {
+ m_IInputSlots.erase(inputSlotPosition);
+ }
+ }
+
+ std::vector<IOutputSlot*>::iterator outputSlotPosition;
+ // search for and erase any OutputSlots that appear in the WorkingCopy that match those in the PatternSubgraph
+ for (auto slot : patternSubgraph.GetIOutputSlots())
+ {
+ outputSlotPosition = std::find(m_IOutputSlots.begin(), m_IOutputSlots.end(), slot);
+ if (outputSlotPosition != m_IOutputSlots.end())
+ {
+ m_IOutputSlots.erase(outputSlotPosition);
+ }
+ }
+
+ // append InputSlots from the SubstituteSubgraph to the WorkingCopy m_IInputSlots vector variable
+ // at the position in the vector where PatternSubgraph InputSlots were last removed
+ m_IInputSlots.insert(inputSlotPosition,
+ std::make_move_iterator(substituteSubgraph.m_IInputSlots.begin()),
+ std::make_move_iterator(substituteSubgraph.m_IInputSlots.end()));
+
+ // append OutputSlots from the SubstituteSubgraph to the WorkingCopy m_IOutputSlots vector variable
+ // at the position in the vector where PatternSubgraph OutputSlots were last removed
+ m_IOutputSlots.insert(outputSlotPosition,
+ std::make_move_iterator(substituteSubgraph.m_OutputSlots.begin()),
+ std::make_move_iterator(substituteSubgraph.m_OutputSlots.end()));
+}
+
void SubgraphView::SubstituteSubgraph(SubgraphView& patternSubgraph, const SubgraphView& substituteSubgraph)
{
if (!p_WorkingCopyImpl)
@@ -556,8 +594,7 @@
workingCopyGraph->ReplaceSubgraphConnections(patternSubgraph, substituteSubgraph);
// Update input/outputSlot pointers
- m_IInputSlots = std::move(substituteSubgraph.m_IInputSlots);
- m_IOutputSlots = std::move(substituteSubgraph.m_IOutputSlots);
+ UpdateSubgraphViewSlotPointers(patternSubgraph, substituteSubgraph);
// Delete the old layers.
workingCopyGraph->EraseSubgraphLayers(patternSubgraph);
diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp
index e118100..12eba12 100644
--- a/src/armnn/test/SubgraphViewTests.cpp
+++ b/src/armnn/test/SubgraphViewTests.cpp
@@ -2384,4 +2384,194 @@
);
}
+TEST_CASE("MultipleOutputSlotsSubstituteGraph")
+{
+ // Construct graph //
+ // //
+ // input //
+ // | //
+ // splitter //
+ // / \ //
+ // conv2d output //
+ // | //
+ // output //
+ // //
+ // SubgraphView layers: splitter conv2d
+
+ Graph graph;
+ Layer* inputLayer = graph.AddLayer<InputLayer>(0, "input");
+
+ SplitterDescriptor splitDescriptor(2,4);
+ Convolution2dDescriptor convDescriptor;
+ Layer* splitLayer = graph.AddLayer<SplitterLayer>(splitDescriptor, "split");
+ Layer* convLayer = graph.AddLayer<Convolution2dLayer>(convDescriptor, "conv");
+
+ Layer* outputLayer1 = graph.AddLayer<OutputLayer>(0, "output1");
+ Layer* outputLayer2 = graph.AddLayer<OutputLayer>(1, "output2");
+
+ inputLayer->GetOutputSlot(0).Connect(splitLayer->GetInputSlot(0));
+ splitLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0));
+ splitLayer->GetOutputSlot(1).Connect(outputLayer1->GetInputSlot(0));
+ convLayer->GetOutputSlot(0).Connect(outputLayer2->GetInputSlot(0));
+
+ // main subgraph creation
+ SubgraphView::IInputSlots inputSlots = {&splitLayer->GetInputSlot(0)};
+ SubgraphView::IOutputSlots outputSlots = {&splitLayer->GetOutputSlot(1), &convLayer->GetOutputSlot(0)};
+ auto view = CreateSubgraphViewFrom({splitLayer, convLayer},
+ std::move(inputSlots),
+ std::move(outputSlots));
+
+ // substitute subgraph creation
+ OptimizationViews optimizationViews;
+ CompiledBlobPtr ptr;
+ IConnectableLayer* preCompiledLayer =
+ optimizationViews.GetINetwork()->AddPrecompiledLayer(PreCompiledDescriptor(),
+ std::move(ptr),
+ EmptyOptional(),
+ "pre-compiled");
+
+ auto substituteSubgraph = CreateSubgraphViewFrom({preCompiledLayer},
+ {&preCompiledLayer->GetInputSlot(0)},
+ {&preCompiledLayer->GetOutputSlot(0)});
+
+ // need to call GetWorkingCopy() in order for SubstituteSubgraph() to work later on
+ SubgraphView viewCopy = view->GetWorkingCopy();
+ IConnectableLayer* convCopyLayer = nullptr;
+ IOutputSlot* splitOutputSlot = nullptr;
+ for (auto layer : viewCopy.GetIConnectableLayers())
+ {
+ // GetWorkingCopy() has caused address pointer of spliter output slot to change.
+ // Finding new address pointer...
+ if (layer->GetType() == LayerType::Splitter)
+ {
+ splitOutputSlot = &layer->GetOutputSlot(1);
+ }
+
+ // GetWorkingCopy() has caused address pointer of convolution layer to change.
+ // Finding new address pointer...
+ if (layer->GetType() == LayerType::Convolution2d)
+ {
+ convCopyLayer = layer;
+ }
+ }
+
+ // pattern subgraph creation
+ SubgraphViewSelector::SubgraphViewPtr subgraph =
+ CreateSubgraphViewFrom({convCopyLayer},
+ {&convCopyLayer->GetInputSlot(0)},
+ {&convCopyLayer->GetOutputSlot(0)});
+
+ // main substitute subgraph calculation
+ viewCopy.SubstituteSubgraph(*subgraph, *substituteSubgraph);
+
+ // expecting convolution output slot to be changed with precompiled output slot
+ // splitOutputSlot MUST remain as an expected output slot
+ SubgraphView::IOutputSlots expectedOutputSlots = {splitOutputSlot,
+ &preCompiledLayer->GetOutputSlot(0)};
+
+ CHECK(expectedOutputSlots == viewCopy.GetIOutputSlots());
+}
+
+TEST_CASE("MultipleInputMultipleOutputSlots_SubstituteGraph")
+{
+ // Construct graph //
+ // //
+ // input //
+ // | //
+ // conv2d //
+ // | //
+ // const relu //
+ // \ / \ //
+ // add output //
+ // | //
+ // output //
+ // //
+ // SubgraphView layers: conv2d relu add const
+
+ Graph graph;
+ Layer* inputLayer = graph.AddLayer<InputLayer>(0, "input");
+
+ Layer* convLayer = graph.AddLayer<Convolution2dLayer>(Convolution2dDescriptor(), "conv");
+ Layer* reluLayer = graph.AddLayer<ActivationLayer>(ActivationDescriptor(), "activation");
+ Layer* constLayer = graph.AddLayer<ConstantLayer>("const");
+ Layer* addLayer = graph.AddLayer<AdditionLayer>("add");
+
+ Layer* outputLayer1 = graph.AddLayer<OutputLayer>(0, "output1");
+ Layer* outputLayer2 = graph.AddLayer<OutputLayer>(1, "output2");
+
+ inputLayer->GetOutputSlot(0).Connect(convLayer->GetInputSlot(0));
+ convLayer->GetOutputSlot(0).Connect(reluLayer->GetInputSlot(0));
+ constLayer->GetOutputSlot(0).Connect(addLayer->GetInputSlot(0));
+ reluLayer->GetOutputSlot(0).Connect(addLayer->GetInputSlot(1));
+ reluLayer->GetOutputSlot(0).Connect(outputLayer1->GetInputSlot(0));
+ addLayer->GetOutputSlot(0).Connect(outputLayer2->GetInputSlot(0));
+
+ // main subgraph creation
+ SubgraphView::IInputSlots inputSlots = {&convLayer->GetInputSlot(0)};
+ SubgraphView::IOutputSlots outputSlots = {&reluLayer->GetOutputSlot(0), &addLayer->GetOutputSlot(0)};
+ auto view = CreateSubgraphViewFrom({convLayer, reluLayer, addLayer, constLayer},
+ std::move(inputSlots),
+ std::move(outputSlots));
+
+ // substitute subgraph creation
+ OptimizationViews optimizationViews;
+ IConnectableLayer* standInLayer = optimizationViews.GetINetwork()->AddStandInLayer(StandInDescriptor(1,1),
+ "standin");
+
+ auto substituteSubgraph = CreateSubgraphViewFrom({standInLayer},
+ {&standInLayer->GetInputSlot(0)},
+ {&standInLayer->GetOutputSlot(0)});
+
+ // need to call GetWorkingCopy() in order for SubstituteSubgraph() to work later on
+ SubgraphView viewCopy = view->GetWorkingCopy();
+ IConnectableLayer* addCopyLayer = nullptr;
+ IInputSlot* convInputSlot = nullptr;
+ IOutputSlot* activationOutputSlot = nullptr;
+ for (auto layer : viewCopy.GetIConnectableLayers())
+ {
+ // GetWorkingCopy() has caused address pointer of convolution2d input slot to change.
+ // Finding new address pointer...
+ if (layer->GetType() == LayerType::Convolution2d)
+ {
+ convInputSlot = &layer->GetInputSlot(0);
+ }
+
+ // GetWorkingCopy() has caused address pointer of activation output slot to change.
+ // Finding new address pointer...
+ if (layer->GetType() == LayerType::Activation)
+ {
+ activationOutputSlot = &layer->GetOutputSlot(0);
+ }
+
+ // GetWorkingCopy() has caused address pointer of convolution layer to change.
+ // Finding new address pointer...
+ if (layer->GetType() == LayerType::Addition)
+ {
+ addCopyLayer = layer;
+ }
+ }
+
+ // pattern subgraph creation
+ IConnectableLayer* constCopyLayer = &addCopyLayer->GetInputSlot(0).GetConnection()->GetOwningIConnectableLayer();
+ SubgraphViewSelector::SubgraphViewPtr subgraph = CreateSubgraphViewFrom({addCopyLayer, constCopyLayer},
+ {&addCopyLayer->GetInputSlot(0)},
+ {&addCopyLayer->GetOutputSlot(0)});
+
+ // main substitute subgraph calculation
+ viewCopy.SubstituteSubgraph(*subgraph, *substituteSubgraph);
+
+ // expecting addition output slot to be changed with standin output slot
+ // activationOutputSlot MUST remain as an expected output slot
+ SubgraphView::IOutputSlots expectedOutputSlots = {activationOutputSlot,
+ &standInLayer->GetOutputSlot(0)};
+
+ // expecting addition input slot to be changed with standin input slot
+ // convInputSlot MUST remain as an expected input slot
+ SubgraphView::IInputSlots expectedInputSlots = {convInputSlot,
+ &standInLayer->GetInputSlot(0)};
+
+ CHECK(expectedOutputSlots == viewCopy.GetIOutputSlots());
+ CHECK(expectedInputSlots == viewCopy.GetIInputSlots());
+}
+
}