diff options
author | Jim Flynn <jim.flynn@arm.com> | 2022-03-20 21:52:17 +0000 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2022-03-23 20:32:03 +0000 |
commit | 277618302d0f131eac0b6ac2015dd3eb09aa6ff9 (patch) | |
tree | e468fa1362640484b508812596fb5c1b62186882 /src/armnn | |
parent | a3bc0b4976395226c0fa0898b26098c4534edbdb (diff) | |
download | armnn-277618302d0f131eac0b6ac2015dd3eb09aa6ff9.tar.gz |
IVGCVSW-6706 Move headers to profiling/client/include
!android-nn-driver:7337
Change-Id: Ide401623829cc99fb9b51e9bbce3482ce706a8dd
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Diffstat (limited to 'src/armnn')
-rw-r--r-- | src/armnn/ArmNNProfilingServiceInitialiser.hpp | 4 | ||||
-rw-r--r-- | src/armnn/BackendRegistry.cpp | 3 | ||||
-rw-r--r-- | src/armnn/Layer.cpp | 7 | ||||
-rw-r--r-- | src/armnn/LoadedNetwork.hpp | 9 | ||||
-rw-r--r-- | src/armnn/Network.cpp | 2 | ||||
-rw-r--r-- | src/armnn/Runtime.hpp | 6 | ||||
-rw-r--r-- | src/armnn/test/DebugCallbackTest.cpp | 2 |
7 files changed, 19 insertions, 14 deletions
diff --git a/src/armnn/ArmNNProfilingServiceInitialiser.hpp b/src/armnn/ArmNNProfilingServiceInitialiser.hpp index e8a0ae0649..8c88fed35f 100644 --- a/src/armnn/ArmNNProfilingServiceInitialiser.hpp +++ b/src/armnn/ArmNNProfilingServiceInitialiser.hpp @@ -5,8 +5,8 @@ #pragma once -#include <IInitialiseProfilingService.hpp> -#include <IProfilingService.hpp> +#include <client/include/IInitialiseProfilingService.hpp> +#include <client/include/IProfilingService.hpp> namespace armnn { diff --git a/src/armnn/BackendRegistry.cpp b/src/armnn/BackendRegistry.cpp index 01f632fb22..9d6a89f254 100644 --- a/src/armnn/BackendRegistry.cpp +++ b/src/armnn/BackendRegistry.cpp @@ -6,7 +6,8 @@ #include <armnn/BackendRegistry.hpp> #include <armnn/Exceptions.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <IProfilingService.hpp> + +#include <client/include/IProfilingService.hpp> namespace armnn { diff --git a/src/armnn/Layer.cpp b/src/armnn/Layer.cpp index 5818eefa39..805612d1cb 100644 --- a/src/armnn/Layer.cpp +++ b/src/armnn/Layer.cpp @@ -5,11 +5,14 @@ #include "Layer.hpp" #include "Graph.hpp" -#include <IProfilingService.hpp> -#include <armnn/utility/NumericCast.hpp> + #include <armnn/backends/TensorHandle.hpp> #include <armnn/backends/WorkloadData.hpp> +#include <armnn/utility/NumericCast.hpp> + +#include <client/include/IProfilingService.hpp> + #include <fmt/format.h> #include <numeric> diff --git a/src/armnn/LoadedNetwork.hpp b/src/armnn/LoadedNetwork.hpp index 85f90c116f..829405516a 100644 --- a/src/armnn/LoadedNetwork.hpp +++ b/src/armnn/LoadedNetwork.hpp @@ -9,18 +9,19 @@ #include "Profiling.hpp" #include <armnn/Tensor.hpp> + #include <armnn/backends/IBackendInternal.hpp> #include <armnn/backends/IMemoryOptimizerStrategy.hpp> -#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <armnn/backends/Workload.hpp> #include <armnn/backends/WorkloadFactory.hpp> + #include <backendsCommon/DefaultAllocator.hpp> #include <backendsCommon/MemoryManager.hpp> +#include <backendsCommon/TensorHandleFactoryRegistry.hpp> #include <backendsCommon/memoryOptimizerStrategyLibrary/strategies/SingleAxisPriorityList.hpp> - -#include <IProfilingService.hpp> -#include <TimelineUtilityMethods.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/LabelsAndEventClasses.hpp> diff --git a/src/armnn/Network.cpp b/src/armnn/Network.cpp index 58e8b503ee..339da0d1b8 100644 --- a/src/armnn/Network.cpp +++ b/src/armnn/Network.cpp @@ -26,7 +26,7 @@ #include <armnn/utility/IgnoreUnused.hpp> #include <armnn/utility/PolymorphicDowncast.hpp> -#include <IProfilingService.hpp> +#include <client/include/IProfilingService.hpp> #include <common/include/ProfilingGuid.hpp> diff --git a/src/armnn/Runtime.hpp b/src/armnn/Runtime.hpp index 9a20902291..51a8afff71 100644 --- a/src/armnn/Runtime.hpp +++ b/src/armnn/Runtime.hpp @@ -14,9 +14,9 @@ #include <armnn/backends/DynamicBackend.hpp> -#include <IInitialiseProfilingService.hpp> -#include <IProfilingService.hpp> -#include <IReportStructure.hpp> +#include <client/include/IInitialiseProfilingService.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/IReportStructure.hpp> #include <mutex> #include <unordered_map> diff --git a/src/armnn/test/DebugCallbackTest.cpp b/src/armnn/test/DebugCallbackTest.cpp index 69b9736f92..600447c53a 100644 --- a/src/armnn/test/DebugCallbackTest.cpp +++ b/src/armnn/test/DebugCallbackTest.cpp @@ -60,7 +60,7 @@ TEST_CASE("RuntimeRegisterDebugCallback") std::vector<unsigned int> slotIndexes; auto mockCallback = [&](LayerGuid guid, unsigned int slotIndex, ITensorHandle* tensor) { - IgnoreUnused(guid); + armnn::IgnoreUnused(guid); slotIndexes.push_back(slotIndex); tensorShapes.push_back(tensor->GetShape()); callCount++; |