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/backends/neon/test/NeonOptimizedNetworkTests.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/backends/neon/test/NeonOptimizedNetworkTests.cpp')
| -rw-r--r-- | src/backends/neon/test/NeonOptimizedNetworkTests.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backends/neon/test/NeonOptimizedNetworkTests.cpp b/src/backends/neon/test/NeonOptimizedNetworkTests.cpp index 85f06174c7..4944c31d71 100644 --- a/src/backends/neon/test/NeonOptimizedNetworkTests.cpp +++ b/src/backends/neon/test/NeonOptimizedNetworkTests.cpp @@ -35,7 +35,8 @@ BOOST_AUTO_TEST_CASE(OptimizeValidateCpuAccDeviceSupportLayerNoFallback) armnn::NeonWorkloadFactory fact = NeonWorkloadFactoryHelper::GetFactory(NeonWorkloadFactoryHelper::GetMemoryManager()); - for (auto&& layer : static_cast<armnn::OptimizedNetwork*>(optNet.get())->GetGraph()) + armnn::Graph& graph = GetGraphForTesting(optNet.get()); + for (auto&& layer : graph) { BOOST_CHECK(layer->GetBackendId() == armnn::Compute::CpuAcc); BOOST_CHECK_NO_THROW( @@ -103,7 +104,7 @@ BOOST_AUTO_TEST_CASE(FastMathEnabledTestOnCpuAcc) BOOST_CHECK(optimizedNet); - auto modelOptionsOut = static_cast<armnn::OptimizedNetwork*>(optimizedNet.get())->GetModelOptions(); + auto modelOptionsOut = GetModelOptionsForTesting(optimizedNet.get()); BOOST_TEST(modelOptionsOut.size() == 1); BOOST_TEST(modelOptionsOut[0].GetOption(0).GetName() == "FastMathEnabled"); @@ -134,8 +135,10 @@ BOOST_AUTO_TEST_CASE(NumberOfThreadsTestOnCpuAcc) *net, backends, runtime->GetDeviceSpec(), optimizerOptions); BOOST_CHECK(optimizedNet); + std::unique_ptr<armnn::Graph> graphPtr; + armnn::OptimizedNetworkImpl impl(std::move(graphPtr), optimizerOptions.m_ModelOptions); - auto modelOptionsOut = static_cast<armnn::OptimizedNetwork*>(optimizedNet.get())->GetModelOptions(); + auto modelOptionsOut = impl.GetModelOptions(); BOOST_TEST(modelOptionsOut.size() == 1); BOOST_TEST(modelOptionsOut[0].GetOption(0).GetName() == "NumberOfThreads"); |