diff options
author | Francis Murtagh <francis.murtagh@arm.com> | 2021-02-15 18:23:17 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2021-02-15 18:23:17 +0000 |
commit | 3d2b4b2bff3be27f12a99e0e01284078870ee954 (patch) | |
tree | 33a9ea2a3267707088fd0a4a727d73a4568bb0a6 /src/armnn/test/NetworkTests.cpp | |
parent | 052fbe9c86628cfdc534c515d9b451aa8d3d1cb6 (diff) | |
download | armnn-3d2b4b2bff3be27f12a99e0e01284078870ee954.tar.gz |
IVGCVSW-4873 Implement Pimpl Idiom for INetwork and IOptimizedNetwork
!android-nn-driver:5042
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Ia1ce8b839e81b46428ba0f78463e085e5906958d
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Diffstat (limited to 'src/armnn/test/NetworkTests.cpp')
-rw-r--r-- | src/armnn/test/NetworkTests.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index ef270d94ee..692d64e4e0 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -31,7 +31,7 @@ BOOST_AUTO_TEST_SUITE(Network) BOOST_AUTO_TEST_CASE(LayerGuids) { - armnn::Network net; + armnn::NetworkImpl net; armnn::LayerGuid inputId = net.AddInputLayer(0)->GetGuid(); armnn::LayerGuid addId = net.AddAdditionLayer()->GetGuid(); armnn::LayerGuid outputId = net.AddOutputLayer(0)->GetGuid(); @@ -43,23 +43,22 @@ BOOST_AUTO_TEST_CASE(LayerGuids) BOOST_AUTO_TEST_CASE(NetworkBasic) { - armnn::Network net; + armnn::NetworkImpl net; BOOST_TEST(net.PrintGraph() == armnn::Status::Success); } BOOST_AUTO_TEST_CASE(LayerNamesAreOptionalForINetwork) { - armnn::Network net; - armnn::INetwork& inet = net; - inet.AddInputLayer(0); - inet.AddAdditionLayer(); - inet.AddActivationLayer(armnn::ActivationDescriptor()); - inet.AddOutputLayer(0); + armnn::INetworkPtr inet(armnn::INetwork::Create()); + inet->AddInputLayer(0); + inet->AddAdditionLayer(); + inet->AddActivationLayer(armnn::ActivationDescriptor()); + inet->AddOutputLayer(0); } BOOST_AUTO_TEST_CASE(LayerNamesAreOptionalForNetwork) { - armnn::Network net; + armnn::NetworkImpl net; net.AddInputLayer(0); net.AddAdditionLayer(); net.AddActivationLayer(armnn::ActivationDescriptor()); @@ -68,7 +67,7 @@ BOOST_AUTO_TEST_CASE(LayerNamesAreOptionalForNetwork) BOOST_AUTO_TEST_CASE(NetworkModification) { - armnn::Network net; + armnn::NetworkImpl net; armnn::IConnectableLayer* const inputLayer = net.AddInputLayer(0, "input layer"); BOOST_TEST(inputLayer); @@ -228,7 +227,7 @@ BOOST_AUTO_TEST_CASE(NetworkModification) BOOST_AUTO_TEST_CASE(NetworkModification_SplitterConcat) { - armnn::Network net; + armnn::NetworkImpl net; // Adds an input layer and an input tensor descriptor. armnn::IConnectableLayer* inputLayer = net.AddInputLayer(0, "input layer"); @@ -285,7 +284,7 @@ BOOST_AUTO_TEST_CASE(NetworkModification_SplitterConcat) BOOST_AUTO_TEST_CASE(NetworkModification_SplitterAddition) { - armnn::Network net; + armnn::NetworkImpl net; // Adds an input layer and an input tensor descriptor. armnn::IConnectableLayer* layer = net.AddInputLayer(0, "input layer"); @@ -330,7 +329,7 @@ BOOST_AUTO_TEST_CASE(NetworkModification_SplitterAddition) BOOST_AUTO_TEST_CASE(NetworkModification_SplitterMultiplication) { - armnn::Network net; + armnn::NetworkImpl net; // Adds an input layer and an input tensor descriptor. armnn::IConnectableLayer* layer = net.AddInputLayer(0, "input layer"); @@ -476,7 +475,7 @@ BOOST_AUTO_TEST_CASE(Network_AddMerge) BOOST_AUTO_TEST_CASE(StandInLayerNetworkTest) { // Create a simple network with a StandIn some place in it. - armnn::Network net; + armnn::NetworkImpl net; auto input = net.AddInputLayer(0); // Add some valid layer. @@ -509,7 +508,7 @@ BOOST_AUTO_TEST_CASE(StandInLayerNetworkTest) BOOST_AUTO_TEST_CASE(StandInLayerSingleInputMultipleOutputsNetworkTest) { // Another test with one input and two outputs on the StandIn layer. - armnn::Network net; + armnn::NetworkImpl net; // Create the input. auto input = net.AddInputLayer(0); |