From d92a6e4c19567cb03de76963068c002353cea528 Mon Sep 17 00:00:00 2001 From: Kevin May Date: Thu, 4 Feb 2021 10:27:41 +0000 Subject: IVGCVSW-4873 Implement Pimpl Idiom for IRuntime Signed-off-by: Kevin May Change-Id: I52448938735b2aa678c47e0f3061c87fa0c693b1 --- .../backendsCommon/test/BackendProfilingTests.cpp | 2 +- .../backendsCommon/test/RuntimeTestImpl.hpp | 2 +- src/backends/cl/test/ClRuntimeTests.cpp | 2 +- src/backends/neon/test/NeonRuntimeTests.cpp | 2 +- .../reference/test/RefOptimizedNetworkTests.cpp | 28 ++++++++++++---------- src/backends/reference/test/RefRuntimeTests.cpp | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 4b0d26e0c3..d0f8fbe9c3 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(BackendProfilingCounterRegisterMockBackendTest) armnn::MockBackendInitialiser initialiser; // Create a runtime - armnn::Runtime runtime(options); + armnn::RuntimeImpl runtime(options); unsigned int shiftedId = 0; diff --git a/src/backends/backendsCommon/test/RuntimeTestImpl.hpp b/src/backends/backendsCommon/test/RuntimeTestImpl.hpp index 33a629faac..4afa9bfb24 100644 --- a/src/backends/backendsCommon/test/RuntimeTestImpl.hpp +++ b/src/backends/backendsCommon/test/RuntimeTestImpl.hpp @@ -10,7 +10,7 @@ namespace { -inline void CreateAndDropDummyNetwork(const std::vector& backends, armnn::Runtime& runtime) +inline void CreateAndDropDummyNetwork(const std::vector& backends, armnn::RuntimeImpl& runtime) { armnn::NetworkId networkIdentifier; { diff --git a/src/backends/cl/test/ClRuntimeTests.cpp b/src/backends/cl/test/ClRuntimeTests.cpp index a0d7963aa8..33e86b6fc4 100644 --- a/src/backends/cl/test/ClRuntimeTests.cpp +++ b/src/backends/cl/test/ClRuntimeTests.cpp @@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(RuntimeMemoryLeaksGpuAcc) { BOOST_TEST(ARMNN_LEAK_CHECKER_IS_ACTIVE()); armnn::IRuntime::CreationOptions options; - armnn::Runtime runtime(options); + armnn::RuntimeImpl runtime(options); armnn::RuntimeLoadedNetworksReserve(&runtime); std::vector backends = {armnn::Compute::GpuAcc}; diff --git a/src/backends/neon/test/NeonRuntimeTests.cpp b/src/backends/neon/test/NeonRuntimeTests.cpp index 2aaf422a68..27361dd43d 100644 --- a/src/backends/neon/test/NeonRuntimeTests.cpp +++ b/src/backends/neon/test/NeonRuntimeTests.cpp @@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(RuntimeMemoryLeaksCpuAcc) { BOOST_TEST(ARMNN_LEAK_CHECKER_IS_ACTIVE()); armnn::IRuntime::CreationOptions options; - armnn::Runtime runtime(options); + armnn::RuntimeImpl runtime(options); armnn::RuntimeLoadedNetworksReserve(&runtime); std::vector backends = {armnn::Compute::CpuAcc}; diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp index d430f251a4..16ff202f70 100644 --- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp +++ b/src/backends/reference/test/RefOptimizedNetworkTests.cpp @@ -17,7 +17,8 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuRefWorkloads) { const armnn::TensorInfo desc({3, 5}, armnn::DataType::Float32); - armnn::Network net; + // build up the structure of the network + armnn::INetworkPtr net(armnn::INetwork::Create()); armnn::NormalizationDescriptor nmDesc; armnn::ActivationDescriptor acDesc; @@ -33,21 +34,21 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuRefWorkloads) // sm // | // ot - armnn::IConnectableLayer* layer = net.AddInputLayer(0, "in"); + armnn::IConnectableLayer* layer = net->AddInputLayer(0, "in"); layer->GetOutputSlot(0).SetTensorInfo(desc); - armnn::IConnectableLayer* const normLayer = net.AddNormalizationLayer(nmDesc, "nm"); + armnn::IConnectableLayer* const normLayer = net->AddNormalizationLayer(nmDesc, "nm"); layer->GetOutputSlot(0).Connect(normLayer->GetInputSlot(0)); normLayer->GetOutputSlot(0).SetTensorInfo(desc); - layer = net.AddActivationLayer(acDesc, "ac"); + layer = net->AddActivationLayer(acDesc, "ac"); normLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(0)); layer->GetOutputSlot(0).SetTensorInfo(desc); armnn::IConnectableLayer* prevLayer = layer; - layer = net.AddMultiplicationLayer("ml"); + layer = net->AddMultiplicationLayer("ml"); prevLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(0)); normLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(1)); @@ -55,13 +56,13 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuRefWorkloads) prevLayer = layer; armnn::SoftmaxDescriptor softmaxDescriptor; - layer = net.AddSoftmaxLayer(softmaxDescriptor, "sm"); + layer = net->AddSoftmaxLayer(softmaxDescriptor, "sm"); prevLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(0)); layer->GetOutputSlot(0).SetTensorInfo(desc); prevLayer = layer; - layer = net.AddOutputLayer(0, "ot"); + layer = net->AddOutputLayer(0, "ot"); prevLayer->GetOutputSlot(0).Connect(layer->GetInputSlot(0)); @@ -69,7 +70,7 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuRefWorkloads) armnn::IRuntimePtr runtime(armnn::IRuntime::Create(options)); std::vector backends = { armnn::Compute::CpuRef }; - armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(net, backends, runtime->GetDeviceSpec()); + armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); static_cast(optNet.get())->GetGraph().AllocateDynamicBuffers(); BOOST_CHECK(optNet); @@ -149,7 +150,8 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateWorkloadsCpuRefMeanLayer) BOOST_AUTO_TEST_CASE(DebugTestOnCpuRef) { - armnn::Network net; + // build up the structure of the network + armnn::INetworkPtr net(armnn::INetwork::Create()); armnn::ActivationDescriptor activation1Descriptor; activation1Descriptor.m_Function = armnn::ActivationFunction::BoundedReLu; @@ -157,9 +159,9 @@ BOOST_AUTO_TEST_CASE(DebugTestOnCpuRef) activation1Descriptor.m_B = -1.f; // Defines layers. - auto input = net.AddInputLayer(0, "InputLayer"); - auto activation = net.AddActivationLayer(activation1Descriptor, "ActivationLayer"); - auto output = net.AddOutputLayer(0, "OutputLayer"); + auto input = net->AddInputLayer(0, "InputLayer"); + auto activation = net->AddActivationLayer(activation1Descriptor, "ActivationLayer"); + auto output = net->AddOutputLayer(0, "OutputLayer"); // Connects layers. input->GetOutputSlot(0).Connect(activation->GetInputSlot(0)); @@ -178,7 +180,7 @@ BOOST_AUTO_TEST_CASE(DebugTestOnCpuRef) armnn::OptimizerOptions optimizerOptions; optimizerOptions.m_Debug = true; - armnn::IOptimizedNetworkPtr optimizedNet = armnn::Optimize(net, backends, runtime->GetDeviceSpec(), + armnn::IOptimizedNetworkPtr optimizedNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec(), optimizerOptions); const armnn::Graph& graph = static_cast(optimizedNet.get())->GetGraph(); diff --git a/src/backends/reference/test/RefRuntimeTests.cpp b/src/backends/reference/test/RefRuntimeTests.cpp index ae49366c62..17d5816b9b 100644 --- a/src/backends/reference/test/RefRuntimeTests.cpp +++ b/src/backends/reference/test/RefRuntimeTests.cpp @@ -19,7 +19,7 @@ BOOST_AUTO_TEST_CASE(RuntimeMemoryLeaksCpuRef) BOOST_TEST(ARMNN_LEAK_CHECKER_IS_ACTIVE()); armnn::IRuntime::CreationOptions options; - armnn::Runtime runtime(options); + armnn::RuntimeImpl runtime(options); armnn::RuntimeLoadedNetworksReserve(&runtime); std::vector backends = {armnn::Compute::CpuRef}; -- cgit v1.2.1