diff options
| author | Cathal Corbett <cathal.corbett@arm.com> | 2022-02-25 15:33:28 +0000 |
|---|---|---|
| committer | Cathal Corbett <cathal.corbett@arm.com> | 2022-03-01 11:44:14 +0000 |
| commit | 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab (patch) | |
| tree | 23a3a0d5ca5143924277f34c98d36cf7b99430a7 /delegate/src | |
| parent | 1fc448ad2455ad31b96a3891f847125a3295d75a (diff) | |
| download | armnn-5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab.tar.gz | |
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 <cathal.corbett@arm.com>
Change-Id: I9c50007dcd5b5e792757e7bd1213606df5ffec36
Diffstat (limited to 'delegate/src')
| -rw-r--r-- | delegate/src/DelegateOptions.cpp | 2 | ||||
| -rw-r--r-- | delegate/src/MultiLayerFacade.hpp | 2 | ||||
| -rw-r--r-- | delegate/src/test/DelegateOptionsTest.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/delegate/src/DelegateOptions.cpp b/delegate/src/DelegateOptions.cpp index 5cfddadf99..9413a4689a 100644 --- a/delegate/src/DelegateOptions.cpp +++ b/delegate/src/DelegateOptions.cpp @@ -59,7 +59,7 @@ DelegateOptions::DelegateOptions(char const* const* options_keys, armnn::OptimizerOptions optimizerOptions; bool internalProfilingState = false; armnn::ProfilingDetailsMethod internalProfilingDetail = armnn::ProfilingDetailsMethod::DetailsWithEvents; - armnn::profiling::ProfilingOptions extProfilingParams; + arm::pipe::ProfilingOptions extProfilingParams; for (size_t i = 0; i < num_options; ++i) { // Process backends diff --git a/delegate/src/MultiLayerFacade.hpp b/delegate/src/MultiLayerFacade.hpp index 02be26cefd..c0df47bac9 100644 --- a/delegate/src/MultiLayerFacade.hpp +++ b/delegate/src/MultiLayerFacade.hpp @@ -91,7 +91,7 @@ public: return m_FirstLayer->InferOutputShapes(inputShapes); } - virtual armnn::LayerGuid GetGuid() const override + virtual LayerGuid GetGuid() const override { return m_FirstLayer->GetGuid(); } diff --git a/delegate/src/test/DelegateOptionsTest.cpp b/delegate/src/test/DelegateOptionsTest.cpp index 54f9c8f0e3..126bf30a25 100644 --- a/delegate/src/test/DelegateOptionsTest.cpp +++ b/delegate/src/test/DelegateOptionsTest.cpp @@ -87,7 +87,7 @@ TEST_CASE ("ArmnnDelegateOptimizerOptionsDebugFunction") // Enable debug with debug callback function armnn::OptimizerOptions optimizerOptions(false, true, false, false); bool callback = false; - auto mockCallback = [&](armnn::LayerGuid guid, unsigned int slotIndex, armnn::ITensorHandle* tensor) + auto mockCallback = [&](LayerGuid guid, unsigned int slotIndex, armnn::ITensorHandle* tensor) { armnn::IgnoreUnused(guid); armnn::IgnoreUnused(slotIndex); |