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/CreateWorkload.hpp | |
| 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/CreateWorkload.hpp')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index c07bf6a5bc..3ea2c35061 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -1974,11 +1974,11 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre { IgnoreUnused(graph); - // To create a PreCompiled layer, create a network and Optimize it. - armnn::Network net; + // build up the structure of the network + armnn::INetworkPtr net(armnn::INetwork::Create()); // Add an input layer - armnn::IConnectableLayer* const inputLayer = net.AddInputLayer(0, "input layer"); + armnn::IConnectableLayer* const inputLayer = net->AddInputLayer(0, "input layer"); BOOST_TEST(inputLayer); // ArmNN weights tensor shape is OIHW (out channels, in channels, height, width) for NCHW @@ -2021,7 +2021,7 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre armnn::ConstTensor biases(biasTensorInfo, biasData); // Create convolution layer with biases - convLayer = net.AddConvolution2dLayer(convDesc2d, + convLayer = net->AddConvolution2dLayer(convDesc2d, weights, Optional<ConstTensor>(biases), convLayerName.c_str()); @@ -2029,7 +2029,7 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre else { // Create convolution layer without biases - convLayer = net.AddConvolution2dLayer(convDesc2d, + convLayer = net->AddConvolution2dLayer(convDesc2d, weights, EmptyOptional(), convLayerName.c_str()); @@ -2038,7 +2038,7 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre BOOST_TEST(convLayer); // Add an output layer - armnn::IConnectableLayer* const outputLayer = net.AddOutputLayer(0, "output layer"); + armnn::IConnectableLayer* const outputLayer = net->AddOutputLayer(0, "output layer"); BOOST_TEST(outputLayer); // set the tensors in the network (NHWC format) @@ -2068,12 +2068,12 @@ std::pair<armnn::IOptimizedNetworkPtr, std::unique_ptr<PreCompiledWorkload>> Cre armnn::IRuntime::CreationOptions options; armnn::IRuntimePtr runtime(armnn::IRuntime::Create(options)); armnn::OptimizerOptions optimizerOptions; - armnn::IOptimizedNetworkPtr optimizedNet = armnn::Optimize(net, backends, runtime->GetDeviceSpec(), + armnn::IOptimizedNetworkPtr optimizedNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec(), optimizerOptions); BOOST_CHECK(optimizedNet != nullptr); // Find the PreCompiled layer in the optimised graph - armnn::Graph& optimisedGraph = static_cast<armnn::OptimizedNetwork*>(optimizedNet.get())->GetGraph(); + armnn::Graph& optimisedGraph = GetGraphForTesting(optimizedNet.get()); Layer* preCompiledLayer = nullptr; for (auto& layer : optimisedGraph) { |