commit bdf2aab823c123bb9d91e584cd53778f9b0524d1
author David Monahan <david.monahan@arm.com> Fri May 10 15:08:53 2019 +0100
committer David Monahan <david.monahan@arm.com> Fri May 10 16:14:35 2019 +0100
tree 5bc7bad264f9bae9ca3ab6ae54a5460e3d6a39db
parent 5696bff29143667ffd69856e4939cecfbcbd03b3

IVGCVSW-3034 Adding a unit test to check substituteSubGraph
now works when substituting layers from another Graph

Signed-off-by: David Monahan <david.monahan@arm.com>

Change-Id: Iebd21a4975dd0ea1fc9d62708555dae4b1809623

src/armnn/test/SubgraphViewTests.cpp

diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp
index 7938171..8369fc4 100644
--- a/src/armnn/test/SubgraphViewTests.cpp
+++ b/src/armnn/test/SubgraphViewTests.cpp
@@ -166,6 +166,49 @@
     BOOST_CHECK_EQUAL(preCompiledLayer->GetOutputSlot(0).GetConnection(0), subgraphOutputConn);
 }
 
+BOOST_AUTO_TEST_CASE(SingleInputSingleOutputSubstituteGraph)
+{
+    // Construct graph
+    Graph graph;
+
+    Layer* const inputLayer = graph.AddLayer<InputLayer>(0, "input");
+
+    Convolution2dDescriptor convDescriptor;
+    Layer* const convLayer1 = graph.AddLayer<Convolution2dLayer>(convDescriptor, "conv1");
+    Layer* const convLayer2 = graph.AddLayer<Convolution2dLayer>(convDescriptor, "conv2");
+
+    Layer* const outputLayer = graph.AddLayer<OutputLayer>(0, "output");
+
+    inputLayer->GetOutputSlot(0).Connect(convLayer1->GetInputSlot(0));
+    convLayer1->GetOutputSlot(0).Connect(convLayer2->GetInputSlot(0));
+    convLayer2->GetOutputSlot(0).Connect(outputLayer->GetInputSlot(0));
+
+    // Construct sub-graph
+    SubgraphViewSelector::SubgraphViewPtr subgraph = CreateSubgraphViewFrom(CreateInputsFrom({convLayer1}),
+                                                                            CreateOutputsFrom({convLayer2}),
+                                                                            {});
+
+    // Save sub-graph connections for comparison after substitution
+    IOutputSlot* subgraphInputConn = subgraph->GetInputSlot(0)->GetConnection();
+    IInputSlot* subgraphOutputConn = subgraph->GetOutputSlot(0)->GetConnection(0);
+
+    // Construct second graph with a single pre-compiled layer
+    Graph substituteGraph;
+    PreCompiledDescriptor preCompiledDescriptor(1, 1);
+    Layer* const preCompiledLayer = substituteGraph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled");
+
+    SubgraphViewSelector::SubgraphViewPtr substituteSubgraph =
+                                          CreateSubgraphViewFrom(CreateInputsFrom({preCompiledLayer}),
+                                                                 CreateOutputsFrom({preCompiledLayer}),
+                                                                 {preCompiledLayer});
+    // Substitute subgraph with pre-compiled layer
+    graph.SubstituteSubgraph(*subgraph, *substituteSubgraph);
+
+    // Check that connections are correct after substitution
+    BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn);
+    BOOST_CHECK_EQUAL(preCompiledLayer->GetOutputSlot(0).GetConnection(0), subgraphOutputConn);
+}
+
 BOOST_AUTO_TEST_CASE(MultiInputSingleOutput)
 {
     // Construct graph