From 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Fri, 25 Feb 2022 15:33:28 +0000 Subject: IVGCVSW-6704 Change the namespace from armnn::profiling to arm::pipe * Updated ABI version to 29 due to being the first ABI break in 22.05 !android-nn-driver:7226 Signed-off-by: Cathal Corbett Change-Id: I9c50007dcd5b5e792757e7bd1213606df5ffec36 --- src/armnn/test/RuntimeTests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/armnn/test/RuntimeTests.cpp') diff --git a/src/armnn/test/RuntimeTests.cpp b/src/armnn/test/RuntimeTests.cpp index e175c12b57..73e36eaf56 100644 --- a/src/armnn/test/RuntimeTests.cpp +++ b/src/armnn/test/RuntimeTests.cpp @@ -539,7 +539,7 @@ TEST_CASE("IVGCVSW_1929_QuantizedSoftmaxIssue") errMessages); FAIL("An exception should have been thrown"); } - catch (const InvalidArgumentException&) + catch (const armnn::InvalidArgumentException&) { // Different exceptions are thrown on different backends } @@ -627,8 +627,8 @@ TEST_CASE("ProfilingDisable") armnn::NetworkId netId; CHECK(runtime.LoadNetwork(netId, std::move(optNet)) == Status::Success); - profiling::ProfilingServiceRuntimeHelper profilingServiceHelper(GetProfilingService(&runtime)); - profiling::BufferManager& bufferManager = profilingServiceHelper.GetProfilingBufferManager(); + ProfilingServiceRuntimeHelper profilingServiceHelper(GetProfilingService(&runtime)); + BufferManager& bufferManager = profilingServiceHelper.GetProfilingBufferManager(); auto readableBuffer = bufferManager.GetReadableBuffer(); // Profiling is not enabled, the post-optimisation structure should not be created @@ -638,7 +638,7 @@ TEST_CASE("ProfilingDisable") TEST_CASE("ProfilingEnableCpuRef") { using namespace armnn; - using namespace armnn::profiling; + using namespace arm::pipe; // Create runtime in which the test will run armnn::IRuntime::CreationOptions options; @@ -649,7 +649,7 @@ TEST_CASE("ProfilingEnableCpuRef") GetProfilingService(&runtime).ResetExternalProfilingOptions( ConvertExternalProfilingOptions(options.m_ProfilingOptions), false); - profiling::ProfilingServiceRuntimeHelper profilingServiceHelper(GetProfilingService(&runtime)); + ProfilingServiceRuntimeHelper profilingServiceHelper(GetProfilingService(&runtime)); profilingServiceHelper.ForceTransitionToState(ProfilingState::NotConnected); profilingServiceHelper.ForceTransitionToState(ProfilingState::WaitingForAck); profilingServiceHelper.ForceTransitionToState(ProfilingState::Active); @@ -680,7 +680,7 @@ TEST_CASE("ProfilingEnableCpuRef") armnn::NetworkId netId; CHECK(runtime.LoadNetwork(netId, std::move(optNet)) == Status::Success); - profiling::BufferManager& bufferManager = profilingServiceHelper.GetProfilingBufferManager(); + BufferManager& bufferManager = profilingServiceHelper.GetProfilingBufferManager(); auto readableBuffer = bufferManager.GetReadableBuffer(); // Profiling is enabled, the post-optimisation structure should be created -- cgit v1.2.1