diff options
| author | Derek Lamberti <derek.lamberti@arm.com> | 2019-05-08 10:23:08 +0100 |
|---|---|---|
| committer | Derek Lamberti <derek.lamberti@arm.com> | 2019-05-08 11:52:29 +0100 |
| commit | c2fe5fb3a070ce2c7daebf63d0def3d57cec09d3 (patch) | |
| tree | e21332cfe689c08f9939d251a2d8fa56a9f81e1e /src/armnn/test/SubgraphViewTests.cpp | |
| parent | 59f32f96c0fc5c451e0fdbbfc24b072b07dc226b (diff) | |
| download | armnn-c2fe5fb3a070ce2c7daebf63d0def3d57cec09d3.tar.gz | |
IVGCVSW-3031 Finer grained backend optimization API
Change-Id: I9b93bc81b97f3d89fa046ba001854f732040e63a
Signed-off-by: Derek Lamberti <derek.lamberti@arm.com>
Diffstat (limited to 'src/armnn/test/SubgraphViewTests.cpp')
| -rw-r--r-- | src/armnn/test/SubgraphViewTests.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/armnn/test/SubgraphViewTests.cpp b/src/armnn/test/SubgraphViewTests.cpp index d580385797..7938171a33 100644 --- a/src/armnn/test/SubgraphViewTests.cpp +++ b/src/armnn/test/SubgraphViewTests.cpp @@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(SingleInputSingleOutput) Layer* const preCompiledLayer = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph(std::move(subgraph), preCompiledLayer); + graph.SubstituteSubgraph(*subgraph, preCompiledLayer); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn); @@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(MultiInputSingleOutput) Layer* const preCompiledLayer = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph(std::move(subgraph), preCompiledLayer); + graph.SubstituteSubgraph(*subgraph, preCompiledLayer); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn1); @@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(SingleInputMultiOutput) Layer* const preCompiledLayer = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph(std::move(subgraph), preCompiledLayer); + graph.SubstituteSubgraph(*subgraph, preCompiledLayer); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn1); @@ -309,7 +309,7 @@ BOOST_AUTO_TEST_CASE(MultiInputMultiOutput) Layer* const preCompiledLayer = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph(std::move(subgraph), preCompiledLayer); + graph.SubstituteSubgraph(*subgraph, preCompiledLayer); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn1); @@ -354,7 +354,7 @@ BOOST_AUTO_TEST_CASE(EraseReplacedLayers) const SubgraphView::Layers subgraphLayers = subgraph->GetLayers(); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph(std::move(subgraph), preCompiledLayer); + graph.SubstituteSubgraph(*subgraph, preCompiledLayer); // Check that the layers belonging to the sub-graph have been erased from the graph after substitution BOOST_CHECK(!AreAnySubgraphLayersPresentInGraph(subgraphLayers, graph)); @@ -923,7 +923,7 @@ BOOST_AUTO_TEST_CASE(SingleSubgraph) Layer* const preCompiledLayer = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor, "pre-compiled"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph((std::move(subgraphs[0])), preCompiledLayer); + graph.SubstituteSubgraph(*subgraphs[0], preCompiledLayer); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer->GetInputSlot(0).GetConnection(), subgraphInputConn1); @@ -1013,8 +1013,8 @@ BOOST_AUTO_TEST_CASE(MultipleSubgraphs) Layer* const preCompiledLayer2 = graph.AddLayer<PreCompiledLayer>(preCompiledDescriptor2, "pre-compiled2"); // Substitute sub-graph with pre-compiled layer - graph.SubstituteSubgraph((std::move(subgraphs[0])), preCompiledLayer1); - graph.SubstituteSubgraph((std::move(subgraphs[1])), preCompiledLayer2); + graph.SubstituteSubgraph(*subgraphs[0], preCompiledLayer1); + graph.SubstituteSubgraph(*subgraphs[1], preCompiledLayer2); // Check that connections are correct after substitution BOOST_CHECK_EQUAL(preCompiledLayer1->GetInputSlot(0).GetConnection(), subgraph1InputConn); |