From 3d2b4b2bff3be27f12a99e0e01284078870ee954 Mon Sep 17 00:00:00 2001 From: Francis Murtagh Date: Mon, 15 Feb 2021 18:23:17 +0000 Subject: IVGCVSW-4873 Implement Pimpl Idiom for INetwork and IOptimizedNetwork !android-nn-driver:5042 Signed-off-by: Kevin May Change-Id: Ia1ce8b839e81b46428ba0f78463e085e5906958d Signed-off-by: Francis Murtagh Signed-off-by: Finn Williams --- .../reference/test/RefOptimizedNetworkTests.cpp | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/backends/reference/test') diff --git a/src/backends/reference/test/RefOptimizedNetworkTests.cpp b/src/backends/reference/test/RefOptimizedNetworkTests.cpp index 16ff202f70..086c1e471a 100644 --- a/src/backends/reference/test/RefOptimizedNetworkTests.cpp +++ b/src/backends/reference/test/RefOptimizedNetworkTests.cpp @@ -71,12 +71,13 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuRefWorkloads) std::vector backends = { armnn::Compute::CpuRef }; armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); - static_cast(optNet.get())->GetGraph().AllocateDynamicBuffers(); + armnn::Graph& graph = GetGraphForTesting(optNet.get()); + graph.AllocateDynamicBuffers(); BOOST_CHECK(optNet); // Validates workloads. armnn::RefWorkloadFactory fact; - for (auto&& layer : static_cast(optNet.get())->GetGraph()) + for (auto&& layer : graph) { BOOST_CHECK_NO_THROW(layer->CreateWorkload(fact)); } @@ -109,7 +110,10 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateWorkloadsCpuRefPermuteLayer) // optimize the network armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); - for (auto&& layer : static_cast(optNet.get())->GetGraph()) + armnn::Graph& graph = GetGraphForTesting(optNet.get()); + graph.AllocateDynamicBuffers(); + + for (auto&& layer : graph) { BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuRef); } @@ -141,8 +145,9 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateWorkloadsCpuRefMeanLayer) // optimize the network armnn::IOptimizedNetworkPtr optNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec()); - - for (auto&& layer : static_cast(optNet.get())->GetGraph()) + armnn::Graph& graph = GetGraphForTesting(optNet.get()); + graph.AllocateDynamicBuffers(); + for (auto&& layer : graph) { BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuRef); } @@ -183,7 +188,9 @@ BOOST_AUTO_TEST_CASE(DebugTestOnCpuRef) armnn::IOptimizedNetworkPtr optimizedNet = armnn::Optimize(*net, backends, runtime->GetDeviceSpec(), optimizerOptions); - const armnn::Graph& graph = static_cast(optimizedNet.get())->GetGraph(); + armnn::Graph& graph = GetGraphForTesting(optimizedNet.get()); + graph.AllocateDynamicBuffers(); + // Tests that all layers are present in the graph. BOOST_TEST(graph.GetNumLayers() == 5); -- cgit v1.2.1