diff options
Diffstat (limited to 'src/armnn/test')
-rw-r--r-- | src/armnn/test/NetworkTests.cpp | 6 | ||||
-rw-r--r-- | src/armnn/test/RuntimeTests.cpp | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/armnn/test/NetworkTests.cpp b/src/armnn/test/NetworkTests.cpp index 66dbb4ee16..c64c0a0d40 100644 --- a/src/armnn/test/NetworkTests.cpp +++ b/src/armnn/test/NetworkTests.cpp @@ -32,9 +32,9 @@ TEST_SUITE("Network") TEST_CASE("LayerGuids") { armnn::NetworkImpl net; - armnn::LayerGuid inputId = net.AddInputLayer(0)->GetGuid(); - armnn::LayerGuid addId = net.AddAdditionLayer()->GetGuid(); - armnn::LayerGuid outputId = net.AddOutputLayer(0)->GetGuid(); + LayerGuid inputId = net.AddInputLayer(0)->GetGuid(); + LayerGuid addId = net.AddAdditionLayer()->GetGuid(); + LayerGuid outputId = net.AddOutputLayer(0)->GetGuid(); CHECK(inputId != addId); CHECK(addId != outputId); 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 |