From 161d29ca4091bb1ff79736a416978b49989fc622 Mon Sep 17 00:00:00 2001 From: Derek Lamberti Date: Mon, 7 Dec 2020 13:54:12 +0000 Subject: Sort subgraphview layers on construction Make it easier for backends to traverse the subgraph during optimization Change-Id: I140cb11f78bab5f19c801a5b55efffb38c63837f Signed-off-by: Derek Lamberti --- src/armnn/test/SubgraphViewTests.cpp | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/armnn/test/SubgraphViewTests.cpp') diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp index a8cb797d17..73ef8bea91 100644 --- a/src/armnn/test/SubgraphViewTests.cpp +++ b/src/armnn/test/SubgraphViewTests.cpp @@ -1582,4 +1582,31 @@ BOOST_AUTO_TEST_CASE(SubgraphCycles) } } +BOOST_AUTO_TEST_CASE(SubgraphOrder) +{ + Graph graph; + + auto input = graph.AddLayer(0, "Input"); + auto activation = graph.AddLayer(ActivationDescriptor{}, "Activation"); + auto output = graph.AddLayer(1, "Output"); + + input->GetOutputSlot(0).Connect(activation->GetInputSlot(0)); + activation->GetOutputSlot(0).Connect(output->GetInputSlot(0)); + + //Add in out of order + auto view = CreateSubgraphViewFrom({}, + {}, + {output, input, activation}); + + // Check the layers are sorted topologically in the view + int idx=0; + LayerType expectedSorted[] = {LayerType::Input, LayerType::Activation, LayerType::Output}; + view->ForEachLayer([&idx, &expectedSorted](const Layer* l) + { + BOOST_TEST((expectedSorted[idx] == l->GetType())); + idx++; + } + ); +} + BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.1