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 | |
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>
81 files changed, 200 insertions, 124 deletions
diff --git a/Android.mk b/Android.mk index b0436bdeb3..2d38182a22 100644 --- a/Android.mk +++ b/Android.mk @@ -10,6 +10,7 @@ OPENCL_HEADER_PATH := $(LOCAL_PATH)/../clframework/include NN_HEADER_PATH := $(LOCAL_PATH)/../../../../frameworks/ml/nn/runtime/include ARMNN_HEADER_PATH := $(LOCAL_PATH)/include ARMNN_PROFILING_INCLUDE_PATH := $(LOCAL_PATH)/profiling +ARMNN_PROFILING_CLIENT_INCLUDE_PATH := $(LOCAL_PATH)/profiling/client/include ARMNN_PROFILING_COMMON_INCLUDE_PATH := $(LOCAL_PATH)/profiling/common/include ARMNN_TIMELINE_DECODER_INCLUDE_PATH := $(LOCAL_PATH)/src/timelineDecoder ARMNN_THIRD_PARTY_INCLUDE_PATH := $(LOCAL_PATH)/third-party @@ -75,10 +76,11 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk \ $(ARMNN_BACKEND_MAKEFILE_LOCAL_PATHS) LOCAL_EXPORT_C_INCLUDES := \ - $(ARMNN_MAIN_HEADER_PATH) \ - $(ARMNN_SOURCE_HEADER_PATH) \ $(ARMNN_PROFILING_INCLUDE_PATH) \ $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \ + $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \ + $(ARMNN_MAIN_HEADER_PATH) \ + $(ARMNN_SOURCE_HEADER_PATH) \ $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \ $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \ $(ARMNN_SOURCE_UTILS_HEADER_PATH) \ @@ -90,9 +92,10 @@ LOCAL_EXPORT_C_INCLUDES := \ LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_PROFILING_INCLUDE_PATH) \ $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \ + $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \ $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ @@ -368,9 +371,10 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_C_INCLUDES := \ $(OPENCL_HEADER_PATH) \ $(NN_HEADER_PATH) \ - $(ARMNN_HEADER_PATH) \ $(ARMNN_PROFILING_INCLUDE_PATH) \ $(ARMNN_PROFILING_COMMON_INCLUDE_PATH) \ + $(ARMNN_PROFILING_CLIENT_INCLUDE_PATH) \ + $(ARMNN_HEADER_PATH) \ $(ARMNN_TIMELINE_DECODER_INCLUDE_PATH) \ $(ARMNN_THIRD_PARTY_INCLUDE_PATH) \ $(ARMNN_MAIN_HEADER_PATH) \ diff --git a/CMakeLists.txt b/CMakeLists.txt index e2fa9f3b06..0e31c6ba0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,8 +176,8 @@ list(APPEND armnn_sources include/armnn/TypesUtils.hpp include/armnn/Utils.hpp include/armnn/Version.hpp - include/armnn/profiling/ISendTimelinePacket.hpp - include/armnn/profiling/ProfilingOptions.hpp + profiling/client/include/ISendTimelinePacket.hpp + profiling/client/include/ProfilingOptions.hpp include/armnn/utility/Assert.hpp include/armnn/utility/IgnoreUnused.hpp include/armnn/utility/NumericCast.hpp @@ -423,26 +423,26 @@ list(APPEND armnn_sources src/profiling/ConnectionAcknowledgedCommandHandler.cpp src/profiling/ConnectionAcknowledgedCommandHandler.hpp src/profiling/CounterIdMap.cpp - src/profiling/CounterIdMap.hpp + profiling/client/include/CounterIdMap.hpp src/profiling/DeactivateTimelineReportingCommandHandler.cpp src/profiling/DeactivateTimelineReportingCommandHandler.hpp src/profiling/FileOnlyProfilingConnection.cpp src/profiling/FileOnlyProfilingConnection.hpp src/profiling/Holder.cpp - src/profiling/Holder.hpp + profiling/client/include/Holder.hpp src/profiling/IBufferManager.hpp src/profiling/IConsumer.hpp - src/profiling/ICounterValues.hpp - src/profiling/IInitialiseProfilingService.hpp + profiling/client/include/ICounterValues.hpp + profiling/client/include/IInitialiseProfilingService.hpp src/profiling/INotifyBackends.hpp - src/profiling/IReportStructure.hpp - src/profiling/ISendCounterPacket.hpp + profiling/client/include/IReportStructure.hpp + profiling/client/include/ISendCounterPacket.hpp src/profiling/ISendThread.hpp src/profiling/IPacketBuffer.hpp src/profiling/IPeriodicCounterCapture.hpp src/profiling/IProfilingConnection.hpp src/profiling/IProfilingService.cpp - src/profiling/IProfilingService.hpp + profiling/client/include/IProfilingService.hpp src/profiling/IProfilingConnectionFactory.hpp src/profiling/NullProfilingConnection.hpp src/profiling/PacketBuffer.cpp @@ -459,7 +459,7 @@ list(APPEND armnn_sources src/profiling/ProfilingConnectionFactory.hpp src/profiling/ProfilingService.cpp src/profiling/ProfilingService.hpp - src/profiling/ProfilingState.hpp + profiling/client/include/ProfilingState.hpp src/profiling/ProfilingStateMachine.cpp src/profiling/ProfilingStateMachine.hpp src/profiling/ProfilingUtils.cpp @@ -479,7 +479,7 @@ list(APPEND armnn_sources src/profiling/TimelinePacketWriterFactory.cpp src/profiling/TimelinePacketWriterFactory.hpp src/profiling/TimelineUtilityMethods.cpp - src/profiling/TimelineUtilityMethods.hpp + profiling/client/include/TimelineUtilityMethods.hpp src/profiling/backends/BackendProfiling.cpp src/profiling/backends/BackendProfiling.hpp third-party/cxxopts/cxxopts.hpp @@ -521,6 +521,7 @@ target_include_directories(armnn src/armnnUtils src/backends src/profiling + profiling/client/include profiling/common/include ) @@ -962,6 +963,7 @@ if(BUILD_GATORD_MOCK) add_library_ex(gatordMockService STATIC ${gatord_mock_sources}) target_include_directories(gatordMockService PRIVATE profiling/common/include + profiling/client/include profiling/server/src/basePipeServer src/armnnUtils src/profiling @@ -975,6 +977,7 @@ if(BUILD_GATORD_MOCK) add_executable_ex(GatordMock tests/profiling/gatordmock/GatordMockMain.cpp) target_include_directories(GatordMock PRIVATE profiling/common/include + profiling/client/include profiling/server/src/basePipeServer src/armnnUtils src/profiling diff --git a/delegate/include/DelegateOptions.hpp b/delegate/include/DelegateOptions.hpp index d8c4139083..7f7eaa5bb9 100644 --- a/delegate/include/DelegateOptions.hpp +++ b/delegate/include/DelegateOptions.hpp @@ -8,7 +8,8 @@ #include <armnn/ArmNN.hpp> #include <armnn/Logging.hpp> #include <armnn/Optional.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> + +#include <client/include/ProfilingOptions.hpp> #include <set> #include <string> diff --git a/include/armnn/IRuntime.hpp b/include/armnn/IRuntime.hpp index debb2d6896..0a2dc3233e 100644 --- a/include/armnn/IRuntime.hpp +++ b/include/armnn/IRuntime.hpp @@ -12,10 +12,12 @@ #include "Tensor.hpp" #include "Types.hpp" #include "TypesUtils.hpp" -#include "profiling/ILocalPacketHandler.hpp" #include <armnn/backends/ICustomAllocator.hpp> #include <armnn/backends/IMemoryOptimizerStrategy.hpp> + +#include <client/include/ILocalPacketHandler.hpp> + #include <memory> #include <map> @@ -31,7 +33,7 @@ class IRuntime; using IRuntimePtr = std::unique_ptr<IRuntime, void(*)(IRuntime* runtime)>; struct INetworkProperties -{ +{ INetworkProperties(bool asyncEnabled, MemorySource inputSource, MemorySource outputSource, diff --git a/include/armnn/backends/IBackendInternal.hpp b/include/armnn/backends/IBackendInternal.hpp index 06fa5edde8..98f0eaacd7 100644 --- a/include/armnn/backends/IBackendInternal.hpp +++ b/include/armnn/backends/IBackendInternal.hpp @@ -16,8 +16,9 @@ #include <armnn/backends/ITensorHandleFactory.hpp> #include <armnn/backends/OptimizationViews.hpp> #include <armnn/backends/SubgraphView.hpp> -#include <armnn/backends/profiling/IBackendProfiling.hpp> -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> + +#include <client/include/backends/IBackendProfiling.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> #include <vector> #include <memory> diff --git a/include/armnn/backends/Workload.hpp b/include/armnn/backends/Workload.hpp index e180577ffe..d426486f89 100644 --- a/include/armnn/backends/Workload.hpp +++ b/include/armnn/backends/Workload.hpp @@ -12,7 +12,8 @@ #include <armnn/Logging.hpp> #include <Profiling.hpp> -#include <IProfilingService.hpp> + +#include <client/include/IProfilingService.hpp> #include <algorithm> diff --git a/profiling/CMakeLists.txt b/profiling/CMakeLists.txt index f9ffd66433..265c5365c7 100644 --- a/profiling/CMakeLists.txt +++ b/profiling/CMakeLists.txt @@ -22,6 +22,7 @@ add_custom_target(AdditionalCMakeFiles SOURCES ${additional_cmake_files}) include(GNUInstallDirs) include_directories(SYSTEM common/include) +include_directories(SYSTEM client/include) include_directories(SYSTEM ${PROJECT_SOURCE_DIR}) set(BUILD_UNIT_TESTS 0) diff --git a/src/profiling/CounterIdMap.hpp b/profiling/client/include/CounterIdMap.hpp index cce7184c46..cce7184c46 100644 --- a/src/profiling/CounterIdMap.hpp +++ b/profiling/client/include/CounterIdMap.hpp diff --git a/src/profiling/Holder.hpp b/profiling/client/include/Holder.hpp index 10d393ff9b..db5468feda 100644 --- a/src/profiling/Holder.hpp +++ b/profiling/client/include/Holder.hpp @@ -8,7 +8,6 @@ #include <mutex> #include <vector> #include <set> -#include "ProfilingUtils.hpp" namespace arm { diff --git a/src/profiling/ICounterValues.hpp b/profiling/client/include/ICounterValues.hpp index a851c6b3f3..a851c6b3f3 100644 --- a/src/profiling/ICounterValues.hpp +++ b/profiling/client/include/ICounterValues.hpp diff --git a/src/profiling/IInitialiseProfilingService.hpp b/profiling/client/include/IInitialiseProfilingService.hpp index fc3f4b9a5d..fc3f4b9a5d 100644 --- a/src/profiling/IInitialiseProfilingService.hpp +++ b/profiling/client/include/IInitialiseProfilingService.hpp diff --git a/include/armnn/profiling/ILocalPacketHandler.hpp b/profiling/client/include/ILocalPacketHandler.hpp index bf7bdbc5c4..0a69f27491 100644 --- a/include/armnn/profiling/ILocalPacketHandler.hpp +++ b/profiling/client/include/ILocalPacketHandler.hpp @@ -6,8 +6,8 @@ #pragma once -#include <armnn/utility/IgnoreUnused.hpp> -#include "../../../profiling/common/include/TargetEndianess.hpp" +#include <common/include/IgnoreUnused.hpp> +#include <common/include/TargetEndianess.hpp> #include <cstdint> #include <memory> @@ -55,7 +55,9 @@ public: /// Set a profiling connection on the handler. Only need to implement this /// function if the handler will be writing data back to the profiled application. virtual void SetConnection(IInternalProfilingConnection* profilingConnection) - {armnn::IgnoreUnused(profilingConnection);} + { + arm::pipe::IgnoreUnused(profilingConnection); + } }; using ILocalPacketHandlerPtr = std::unique_ptr<ILocalPacketHandler>; @@ -63,4 +65,4 @@ using ILocalPacketHandlerSharedPtr = std::shared_ptr<ILocalPacketHandler>; } // namespace pipe -} // namespace arm
\ No newline at end of file +} // namespace arm diff --git a/src/profiling/IProfilingService.hpp b/profiling/client/include/IProfilingService.hpp index 353059aec3..21d5c9ce77 100644 --- a/src/profiling/IProfilingService.hpp +++ b/profiling/client/include/IProfilingService.hpp @@ -12,10 +12,10 @@ #include "IProfilingServiceStatus.hpp" #include "ISendCounterPacket.hpp" #include "IReportStructure.hpp" +#include "ProfilingOptions.hpp" #include "ProfilingState.hpp" -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/ICounterRegistry.hpp> #include <common/include/Optional.hpp> diff --git a/src/profiling/IProfilingServiceStatus.hpp b/profiling/client/include/IProfilingServiceStatus.hpp index 3366bdd445..f979e740f0 100644 --- a/src/profiling/IProfilingServiceStatus.hpp +++ b/profiling/client/include/IProfilingServiceStatus.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include "ILocalPacketHandler.hpp" #include <common/include/Packet.hpp> diff --git a/src/profiling/IReportStructure.hpp b/profiling/client/include/IReportStructure.hpp index 8891cbd3b0..8891cbd3b0 100644 --- a/src/profiling/IReportStructure.hpp +++ b/profiling/client/include/IReportStructure.hpp diff --git a/src/profiling/ISendCounterPacket.hpp b/profiling/client/include/ISendCounterPacket.hpp index 522dc7c7cb..c76150fc58 100644 --- a/src/profiling/ISendCounterPacket.hpp +++ b/profiling/client/include/ISendCounterPacket.hpp @@ -5,7 +5,8 @@ #pragma once -#include <armnn/backends/profiling/IBackendProfiling.hpp> +#include <client/include/backends/IBackendProfiling.hpp> + #include <common/include/ICounterDirectory.hpp> namespace arm diff --git a/include/armnn/profiling/ISendTimelinePacket.hpp b/profiling/client/include/ISendTimelinePacket.hpp index 4785e04ef8..4785e04ef8 100644 --- a/include/armnn/profiling/ISendTimelinePacket.hpp +++ b/profiling/client/include/ISendTimelinePacket.hpp diff --git a/include/armnn/profiling/ProfilingOptions.hpp b/profiling/client/include/ProfilingOptions.hpp index 6b4472ca63..30d383d92e 100644 --- a/include/armnn/profiling/ProfilingOptions.hpp +++ b/profiling/client/include/ProfilingOptions.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include "ILocalPacketHandler.hpp" #include <string> #include <vector> diff --git a/src/profiling/ProfilingState.hpp b/profiling/client/include/ProfilingState.hpp index 0fc1903118..0fc1903118 100644 --- a/src/profiling/ProfilingState.hpp +++ b/profiling/client/include/ProfilingState.hpp diff --git a/src/profiling/TimelineUtilityMethods.hpp b/profiling/client/include/TimelineUtilityMethods.hpp index cfdc26a72b..5bb4e5ead0 100644 --- a/src/profiling/TimelineUtilityMethods.hpp +++ b/profiling/client/include/TimelineUtilityMethods.hpp @@ -5,8 +5,8 @@ #pragma once -#include "IProfilingService.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" +#include <client/include/IProfilingService.hpp> +#include <client/include/ISendTimelinePacket.hpp> namespace arm { diff --git a/include/armnn/backends/profiling/IBackendProfiling.hpp b/profiling/client/include/backends/IBackendProfiling.hpp index 9affab2ade..347d2ddf03 100644 --- a/include/armnn/backends/profiling/IBackendProfiling.hpp +++ b/profiling/client/include/backends/IBackendProfiling.hpp @@ -4,7 +4,7 @@ // #pragma once -#include <armnn/profiling/ISendTimelinePacket.hpp> +#include <client/include/ISendTimelinePacket.hpp> #include <common/include/IProfilingGuidGenerator.hpp> #include <common/include/Optional.hpp> diff --git a/include/armnn/backends/profiling/IBackendProfilingContext.hpp b/profiling/client/include/backends/IBackendProfilingContext.hpp index a1ed05e43d..a1ed05e43d 100644 --- a/include/armnn/backends/profiling/IBackendProfilingContext.hpp +++ b/profiling/client/include/backends/IBackendProfilingContext.hpp diff --git a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp index 516e648ce4..ebf408ef7f 100644 --- a/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp +++ b/profiling/server/src/basePipeServer/tests/BasePipeServerTests.cpp @@ -14,7 +14,6 @@ TEST_SUITE("BasePipeServerTests") { -using namespace armnn; using namespace arm::pipe; TEST_CASE("BasePipeServerTest") diff --git a/python/pyarmnn/CMakeLists.txt b/python/pyarmnn/CMakeLists.txt index f82eac258c..e2375c468d 100644 --- a/python/pyarmnn/CMakeLists.txt +++ b/python/pyarmnn/CMakeLists.txt @@ -13,7 +13,7 @@ configure_file(${SWIG_GENERATE_IN} ${SWIG_GENERATE} COPYONLY) # local env variables passed down to the python scripts # scripts can thus be used standalone -set(ARMNN_ENV ARMNN_INCLUDE="${PROJECT_SOURCE_DIR}/include:${PROJECT_SOURCE_DIR}/profiling/common/include" +set(ARMNN_ENV ARMNN_INCLUDE="${PROJECT_SOURCE_DIR}/profiling:${PROJECT_SOURCE_DIR}/profiling/common/include:${PROJECT_SOURCE_DIR}/profiling/client/include:${PROJECT_SOURCE_DIR}/include" ARMNN_LIB=${PROJECT_BINARY_DIR} SWIG_EXECUTABLE=${SWIG_EXECUTABLE}) 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++; diff --git a/src/armnnUtils/ProfilingOptionsConverter.hpp b/src/armnnUtils/ProfilingOptionsConverter.hpp index 3bf1f1920d..a2a36b9bd8 100644 --- a/src/armnnUtils/ProfilingOptionsConverter.hpp +++ b/src/armnnUtils/ProfilingOptionsConverter.hpp @@ -6,7 +6,8 @@ #pragma once #include <armnn/IRuntime.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> + +#include <client/include/ProfilingOptions.hpp> namespace arm { diff --git a/src/backends/aclCommon/CMakeLists.txt b/src/backends/aclCommon/CMakeLists.txt index 1e3d827ce0..05fbe6cca9 100644 --- a/src/backends/aclCommon/CMakeLists.txt +++ b/src/backends/aclCommon/CMakeLists.txt @@ -23,3 +23,4 @@ target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/armn target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnAclCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/aclCommon/test/CMakeLists.txt b/src/backends/aclCommon/test/CMakeLists.txt index 7eb232a643..ee27def133 100644 --- a/src/backends/aclCommon/test/CMakeLists.txt +++ b/src/backends/aclCommon/test/CMakeLists.txt @@ -17,3 +17,4 @@ target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnAclCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/backendsCommon/CMakeLists.txt b/src/backends/backendsCommon/CMakeLists.txt index dfd35018d9..e94e657bca 100644 --- a/src/backends/backendsCommon/CMakeLists.txt +++ b/src/backends/backendsCommon/CMakeLists.txt @@ -61,3 +61,4 @@ target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnBackendsCommon PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/backendsCommon/test/BackendProfilingTests.cpp b/src/backends/backendsCommon/test/BackendProfilingTests.cpp index 9b80a8fa72..5227691664 100644 --- a/src/backends/backendsCommon/test/BackendProfilingTests.cpp +++ b/src/backends/backendsCommon/test/BackendProfilingTests.cpp @@ -4,8 +4,6 @@ // #include "ArmNNProfilingServiceInitialiser.hpp" -#include "CounterIdMap.hpp" -#include "Holder.hpp" #include "MockBackendId.hpp" #include "PeriodicCounterCapture.hpp" #include "PeriodicCounterSelectionCommandHandler.hpp" @@ -20,8 +18,6 @@ #include <armnn/Logging.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <armnn/profiling/ISendTimelinePacket.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include <armnn/utility/IgnoreUnused.hpp> @@ -29,6 +25,11 @@ #include <backends/BackendProfiling.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ISendTimelinePacket.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/CounterDirectory.hpp> #include <doctest/doctest.h> diff --git a/src/backends/backendsCommon/test/CMakeLists.txt b/src/backends/backendsCommon/test/CMakeLists.txt index a668c51b43..8ec65b3c17 100644 --- a/src/backends/backendsCommon/test/CMakeLists.txt +++ b/src/backends/backendsCommon/test/CMakeLists.txt @@ -208,6 +208,7 @@ target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_include_directories(armnnBackendsCommonUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/third-party) # Dummy shared object for testing. @@ -237,6 +238,7 @@ target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(ValidTestDynamicBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(ValidTestDynamicBackend armnn) set_target_properties(ValidTestDynamicBackend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -246,6 +248,7 @@ target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend1 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend1 armnn) set_target_properties(InvalidTestDynamicBackend1 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -255,6 +258,7 @@ target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend2 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend2 armnn) set_target_properties(InvalidTestDynamicBackend2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -264,6 +268,7 @@ target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend3 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend3 armnn) set_target_properties(InvalidTestDynamicBackend3 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -273,6 +278,7 @@ target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend4 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend4 armnn) set_target_properties(InvalidTestDynamicBackend4 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -282,6 +288,7 @@ target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend5 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend5 armnn) set_target_properties(InvalidTestDynamicBackend5 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -291,6 +298,7 @@ target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend6 armnn) set_target_properties(InvalidTestDynamicBackend6 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -300,6 +308,7 @@ target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_D target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(InvalidTestDynamicBackend7 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(InvalidTestDynamicBackend6 PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(InvalidTestDynamicBackend7 armnn) set_target_properties(InvalidTestDynamicBackend7 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/testDynamicBackend) @@ -348,6 +357,7 @@ target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid2_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid2_backend armnn) set_target_properties(Arm_TestValid2_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid2_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -360,6 +370,7 @@ target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid3_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid3_backend armnn) set_target_properties(Arm_TestValid3_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid3_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -370,6 +381,7 @@ target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid8_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid8_backend armnn) set_target_properties(Arm_TestInvalid8_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid8_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath5) @@ -380,6 +392,7 @@ target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid4_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid4_backend armnn) set_target_properties(Arm_TestValid4_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid4_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -390,6 +403,7 @@ target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/ target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestValid5_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestValid5_backend armnn) set_target_properties(Arm_TestValid5_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestValid5_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -400,6 +414,7 @@ target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid9_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid9_backend armnn) set_target_properties(Arm_TestInvalid9_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid9_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath6) @@ -410,6 +425,7 @@ target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid10_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid10_backend armnn) set_target_properties(Arm_TestInvalid10_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid10_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath9) @@ -420,6 +436,7 @@ target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_TestInvalid11_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_link_libraries(Arm_TestInvalid11_backend armnn) set_target_properties(Arm_TestInvalid11_backend PROPERTIES PREFIX "") set_target_properties(Arm_TestInvalid11_backend PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/backendsTestPath9) diff --git a/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp b/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp index 2e4fc1ea1f..b1ee89ac3c 100644 --- a/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp +++ b/src/backends/backendsCommon/test/DefaultAsyncExecuteTest.cpp @@ -10,6 +10,8 @@ #include <doctest/doctest.h> +#include <thread> + using namespace armnn; @@ -255,4 +257,4 @@ TEST_CASE("TestDefaultAsyncExeuteWithThreads") } -}
\ No newline at end of file +} diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index 845ba70eaa..aeb90b069c 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -72,3 +72,4 @@ target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armn target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/cl/test/CMakeLists.txt b/src/backends/cl/test/CMakeLists.txt index 434cdb83d1..ec1d0a6c2f 100644 --- a/src/backends/cl/test/CMakeLists.txt +++ b/src/backends/cl/test/CMakeLists.txt @@ -43,4 +43,4 @@ target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) - +target_include_directories(armnnClBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/cl/workloads/CMakeLists.txt b/src/backends/cl/workloads/CMakeLists.txt index 423a4a69d1..6bb8d68d07 100644 --- a/src/backends/cl/workloads/CMakeLists.txt +++ b/src/backends/cl/workloads/CMakeLists.txt @@ -137,3 +137,4 @@ target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR} target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnClBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/dynamic/reference/CMakeLists.txt b/src/backends/dynamic/reference/CMakeLists.txt index 16e22fba02..67e3495841 100644 --- a/src/backends/dynamic/reference/CMakeLists.txt +++ b/src/backends/dynamic/reference/CMakeLists.txt @@ -27,5 +27,6 @@ target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/ target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(Arm_CpuRef_backend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) set_target_properties(Arm_CpuRef_backend PROPERTIES PREFIX "") target_link_libraries(Arm_CpuRef_backend armnn) diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt index 4654de5cab..16164de3fb 100644 --- a/src/backends/neon/CMakeLists.txt +++ b/src/backends/neon/CMakeLists.txt @@ -44,3 +44,4 @@ target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/ar target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/neon/test/CMakeLists.txt b/src/backends/neon/test/CMakeLists.txt index f7438ea6c9..8339abbd7d 100644 --- a/src/backends/neon/test/CMakeLists.txt +++ b/src/backends/neon/test/CMakeLists.txt @@ -58,4 +58,4 @@ target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DI target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) - +target_include_directories(armnnNeonBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt index bae51b9c79..41c5f5a950 100644 --- a/src/backends/neon/workloads/CMakeLists.txt +++ b/src/backends/neon/workloads/CMakeLists.txt @@ -143,3 +143,4 @@ target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DI target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnNeonBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/reference/CMakeLists.txt b/src/backends/reference/CMakeLists.txt index 3a3d7f4dc5..688a2d759d 100644 --- a/src/backends/reference/CMakeLists.txt +++ b/src/backends/reference/CMakeLists.txt @@ -41,3 +41,4 @@ target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/arm target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackend PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/backends/reference/test/CMakeLists.txt b/src/backends/reference/test/CMakeLists.txt index 2476c31de6..358d58ffea 100644 --- a/src/backends/reference/test/CMakeLists.txt +++ b/src/backends/reference/test/CMakeLists.txt @@ -29,4 +29,5 @@ target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) target_include_directories(armnnRefBackendUnitTests PRIVATE ${PROJECT_SOURCE_DIR}/third-party/doctest) diff --git a/src/backends/reference/workloads/CMakeLists.txt b/src/backends/reference/workloads/CMakeLists.txt index 46c2706742..c18342fb73 100644 --- a/src/backends/reference/workloads/CMakeLists.txt +++ b/src/backends/reference/workloads/CMakeLists.txt @@ -212,3 +212,4 @@ target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/backends) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/src/profiling) target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/common/include) +target_include_directories(armnnRefBackendWorkloads PRIVATE ${PROJECT_SOURCE_DIR}/profiling/client/include) diff --git a/src/dynamic/sample/CMakeLists.txt b/src/dynamic/sample/CMakeLists.txt index a100d1b2c8..e0c666b77b 100644 --- a/src/dynamic/sample/CMakeLists.txt +++ b/src/dynamic/sample/CMakeLists.txt @@ -34,5 +34,6 @@ target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DI target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/backends) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../src/profiling) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling/common/include) +target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling/client/include) target_include_directories(Arm_SampleDynamic_backend PRIVATE ${PROJECT_SOURCE_DIR}/../../../profiling) target_link_libraries(Arm_SampleDynamic_backend ${ARMNN_PATH}) diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.cpp b/src/profiling/ActivateTimelineReportingCommandHandler.cpp index 58a88256ea..9589dd808b 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.cpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.cpp @@ -4,7 +4,9 @@ // #include "ActivateTimelineReportingCommandHandler.hpp" -#include "TimelineUtilityMethods.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> + #include <common/include/ProfilingException.hpp> #include <fmt/format.h> diff --git a/src/profiling/ActivateTimelineReportingCommandHandler.hpp b/src/profiling/ActivateTimelineReportingCommandHandler.hpp index 21e1fe6186..c9fed73594 100644 --- a/src/profiling/ActivateTimelineReportingCommandHandler.hpp +++ b/src/profiling/ActivateTimelineReportingCommandHandler.hpp @@ -7,9 +7,10 @@ #include "ProfilingStateMachine.hpp" #include "SendTimelinePacket.hpp" -#include "IReportStructure.hpp" #include "INotifyBackends.hpp" +#include <client/include/IReportStructure.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Optional.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp b/src/profiling/ConnectionAcknowledgedCommandHandler.cpp index 70c260b043..9f20b9cb80 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.cpp +++ b/src/profiling/ConnectionAcknowledgedCommandHandler.cpp @@ -4,7 +4,8 @@ // #include "ConnectionAcknowledgedCommandHandler.hpp" -#include "TimelineUtilityMethods.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/ProfilingException.hpp> diff --git a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp index d69e0be5c1..e409ee62f2 100644 --- a/src/profiling/ConnectionAcknowledgedCommandHandler.hpp +++ b/src/profiling/ConnectionAcknowledgedCommandHandler.hpp @@ -5,12 +5,14 @@ #pragma once -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> -#include "IProfilingServiceStatus.hpp" -#include "ISendCounterPacket.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingStateMachine.hpp" +#include <client/include/IProfilingServiceStatus.hpp> +#include <client/include/ISendCounterPacket.hpp> +#include <client/include/ISendTimelinePacket.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/CounterIdMap.cpp b/src/profiling/CounterIdMap.cpp index 80b63a36eb..cb637c3974 100644 --- a/src/profiling/CounterIdMap.cpp +++ b/src/profiling/CounterIdMap.cpp @@ -2,7 +2,8 @@ // Copyright © 2020 Arm Ltd. All rights reserved. // SPDX-License-Identifier: MIT // -#include "CounterIdMap.hpp" + +#include <client/include/CounterIdMap.hpp> #include <common/include/ProfilingException.hpp> diff --git a/src/profiling/FileOnlyProfilingConnection.hpp b/src/profiling/FileOnlyProfilingConnection.hpp index 9d40420ec8..c7e60f564e 100644 --- a/src/profiling/FileOnlyProfilingConnection.hpp +++ b/src/profiling/FileOnlyProfilingConnection.hpp @@ -5,12 +5,12 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> - #include "IProfilingConnection.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/Assert.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/Holder.cpp b/src/profiling/Holder.cpp index 6517a24900..d144e244d9 100644 --- a/src/profiling/Holder.cpp +++ b/src/profiling/Holder.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: MIT // -#include "Holder.hpp" +#include <client/include/Holder.hpp> namespace arm { diff --git a/src/profiling/IProfilingConnection.hpp b/src/profiling/IProfilingConnection.hpp index 988503294a..9a25854b7f 100644 --- a/src/profiling/IProfilingConnection.hpp +++ b/src/profiling/IProfilingConnection.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/ILocalPacketHandler.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/IProfilingConnectionFactory.hpp b/src/profiling/IProfilingConnectionFactory.hpp index 1599914bac..8676077878 100644 --- a/src/profiling/IProfilingConnectionFactory.hpp +++ b/src/profiling/IProfilingConnectionFactory.hpp @@ -7,7 +7,7 @@ #include "IProfilingConnection.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> #include <memory> diff --git a/src/profiling/IProfilingService.cpp b/src/profiling/IProfilingService.cpp index b7a394c12f..d147871e47 100644 --- a/src/profiling/IProfilingService.cpp +++ b/src/profiling/IProfilingService.cpp @@ -3,9 +3,10 @@ // SPDX-License-Identifier: MIT // -#include "IProfilingService.hpp" #include "ProfilingService.hpp" +#include <client/include/IProfilingService.hpp> + namespace arm { diff --git a/src/profiling/PeriodicCounterCapture.hpp b/src/profiling/PeriodicCounterCapture.hpp index 9a678a85ab..88084172ca 100644 --- a/src/profiling/PeriodicCounterCapture.hpp +++ b/src/profiling/PeriodicCounterCapture.hpp @@ -6,12 +6,13 @@ #pragma once #include "IPeriodicCounterCapture.hpp" -#include "Holder.hpp" #include "SendCounterPacket.hpp" -#include "ICounterValues.hpp" -#include "CounterIdMap.hpp" -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp b/src/profiling/PeriodicCounterSelectionCommandHandler.cpp index d405e296fc..06f2c6588b 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.cpp +++ b/src/profiling/PeriodicCounterSelectionCommandHandler.cpp @@ -6,7 +6,8 @@ #include "PeriodicCounterSelectionCommandHandler.hpp" #include "ProfilingUtils.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/NumericCast.hpp> #include <fmt/format.h> diff --git a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp index e0feddf9a5..6e544c9097 100644 --- a/src/profiling/PeriodicCounterSelectionCommandHandler.hpp +++ b/src/profiling/PeriodicCounterSelectionCommandHandler.hpp @@ -5,14 +5,15 @@ #pragma once -#include "CounterIdMap.hpp" -#include "Holder.hpp" #include "ProfilingStateMachine.hpp" #include "SendCounterPacket.hpp" #include "IPeriodicCounterCapture.hpp" -#include "ICounterValues.hpp" -#include "armnn/backends/profiling/IBackendProfilingContext.hpp" +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> + +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Logging.hpp> diff --git a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp index 5807947463..8f4812e9dd 100644 --- a/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp +++ b/src/profiling/ProfilingConnectionDumpToFileDecorator.hpp @@ -8,7 +8,7 @@ #include "IProfilingConnection.hpp" #include "ProfilingUtils.hpp" -#include <armnn/profiling/ProfilingOptions.hpp> +#include <client/include/ProfilingOptions.hpp> #include <fstream> #include <memory> diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp index 58bfd3afcf..b84b39d0df 100644 --- a/src/profiling/ProfilingService.hpp +++ b/src/profiling/ProfilingService.hpp @@ -9,12 +9,8 @@ #include "BufferManager.hpp" #include "CommandHandler.hpp" #include "ConnectionAcknowledgedCommandHandler.hpp" -#include "CounterIdMap.hpp" #include "DeactivateTimelineReportingCommandHandler.hpp" -#include "ICounterValues.hpp" #include "INotifyBackends.hpp" -#include "IProfilingService.hpp" -#include "IReportStructure.hpp" #include "PeriodicCounterCapture.hpp" #include "PeriodicCounterSelectionCommandHandler.hpp" #include "PerJobCounterSelectionCommandHandler.hpp" @@ -26,9 +22,13 @@ #include "SendTimelinePacket.hpp" #include "TimelinePacketWriterFactory.hpp" -#include <armnn/backends/profiling/IBackendProfilingContext.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/ICounterValues.hpp> +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/IProfilingService.hpp> +#include <client/include/IReportStructure.hpp> -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/backends/IBackendProfilingContext.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/ProfilingStateMachine.hpp b/src/profiling/ProfilingStateMachine.hpp index 1f6e358411..b507f1a50b 100644 --- a/src/profiling/ProfilingStateMachine.hpp +++ b/src/profiling/ProfilingStateMachine.hpp @@ -5,12 +5,12 @@ #pragma once -#include "ProfilingState.hpp" - -#include <atomic> +#include <client/include/ProfilingState.hpp> #include <common/include/IgnoreUnused.hpp> +#include <atomic> + namespace arm { diff --git a/src/profiling/ProfilingUtils.hpp b/src/profiling/ProfilingUtils.hpp index 593dd6b924..cd5167c094 100644 --- a/src/profiling/ProfilingUtils.hpp +++ b/src/profiling/ProfilingUtils.hpp @@ -5,14 +5,13 @@ #pragma once -#include <common/include/ICounterDirectory.hpp> -#include <common/include/ProfilingException.hpp> - -#include <armnn/profiling/ISendTimelinePacket.hpp> - #include "IPacketBuffer.hpp" +#include <client/include/ISendTimelinePacket.hpp> + +#include <common/include/ICounterDirectory.hpp> #include <common/include/Packet.hpp> +#include <common/include/ProfilingException.hpp> #include <algorithm> #include <cstring> diff --git a/src/profiling/RegisterBackendCounters.hpp b/src/profiling/RegisterBackendCounters.hpp index 3d3b11a626..f48f1ca8f0 100644 --- a/src/profiling/RegisterBackendCounters.hpp +++ b/src/profiling/RegisterBackendCounters.hpp @@ -5,10 +5,10 @@ #pragma once -#include "CounterIdMap.hpp" -#include "IProfilingService.hpp" +#include <client/include/CounterIdMap.hpp> +#include <client/include/IProfilingService.hpp> -#include "armnn/backends/profiling/IBackendProfiling.hpp" +#include <client/include/backends/IBackendProfiling.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/RequestCounterDirectoryCommandHandler.hpp b/src/profiling/RequestCounterDirectoryCommandHandler.hpp index ee2874dfda..2582fb2e0a 100644 --- a/src/profiling/RequestCounterDirectoryCommandHandler.hpp +++ b/src/profiling/RequestCounterDirectoryCommandHandler.hpp @@ -5,10 +5,11 @@ #pragma once -#include "ISendCounterPacket.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingStateMachine.hpp" +#include <client/include/ISendCounterPacket.hpp> +#include <client/include/ISendTimelinePacket.hpp> + #include <common/include/CommandHandlerFunctor.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/SendCounterPacket.hpp b/src/profiling/SendCounterPacket.hpp index 047dd3c7c9..ace7ed1485 100644 --- a/src/profiling/SendCounterPacket.hpp +++ b/src/profiling/SendCounterPacket.hpp @@ -6,9 +6,10 @@ #pragma once #include "IBufferManager.hpp" -#include "ISendCounterPacket.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendCounterPacket.hpp> + #include <type_traits> namespace arm diff --git a/src/profiling/SendThread.hpp b/src/profiling/SendThread.hpp index f68a74c1d3..b96a6d54f3 100644 --- a/src/profiling/SendThread.hpp +++ b/src/profiling/SendThread.hpp @@ -7,12 +7,13 @@ #include "IBufferManager.hpp" #include "IConsumer.hpp" -#include "ISendCounterPacket.hpp" #include "ISendThread.hpp" #include "IProfilingConnection.hpp" #include "ProfilingStateMachine.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendCounterPacket.hpp> + #include <common/include/ICounterDirectory.hpp> #include <atomic> diff --git a/src/profiling/SendTimelinePacket.hpp b/src/profiling/SendTimelinePacket.hpp index ca3022fc4f..f20671fe35 100644 --- a/src/profiling/SendTimelinePacket.hpp +++ b/src/profiling/SendTimelinePacket.hpp @@ -6,9 +6,10 @@ #pragma once #include "IBufferManager.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" #include "ProfilingUtils.hpp" +#include <client/include/ISendTimelinePacket.hpp> + #include <common/include/Assert.hpp> #include <memory> diff --git a/src/profiling/TimelinePacketWriterFactory.hpp b/src/profiling/TimelinePacketWriterFactory.hpp index 00550ee381..607770f723 100644 --- a/src/profiling/TimelinePacketWriterFactory.hpp +++ b/src/profiling/TimelinePacketWriterFactory.hpp @@ -6,7 +6,8 @@ #pragma once #include "IBufferManager.hpp" -#include "armnn/profiling/ISendTimelinePacket.hpp" + +#include <client/include/ISendTimelinePacket.hpp> #include <memory> diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp index 9c7780e719..27c13caef2 100644 --- a/src/profiling/TimelineUtilityMethods.cpp +++ b/src/profiling/TimelineUtilityMethods.cpp @@ -2,7 +2,9 @@ // Copyright © 2019 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // -#include "TimelineUtilityMethods.hpp" +#include "ProfilingUtils.hpp" + +#include <client/include/TimelineUtilityMethods.hpp> #include <common/include/LabelsAndEventClasses.hpp> #include <common/include/Threads.hpp> diff --git a/src/profiling/backends/BackendProfiling.hpp b/src/profiling/backends/BackendProfiling.hpp index bedda5d763..8ca88d2012 100644 --- a/src/profiling/backends/BackendProfiling.hpp +++ b/src/profiling/backends/BackendProfiling.hpp @@ -6,7 +6,8 @@ #pragma once #include "ProfilingService.hpp" -#include <armnn/backends/profiling/IBackendProfiling.hpp> + +#include <client/include/backends/IBackendProfiling.hpp> namespace arm { diff --git a/src/profiling/test/PrintPacketHeaderHandler.hpp b/src/profiling/test/PrintPacketHeaderHandler.hpp index a05e733c07..c5f426c761 100644 --- a/src/profiling/test/PrintPacketHeaderHandler.hpp +++ b/src/profiling/test/PrintPacketHeaderHandler.hpp @@ -5,7 +5,7 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> +#include <client/include/ILocalPacketHandler.hpp> #include <common/include/Packet.hpp> diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp index 80ac1fed0e..6576a98521 100644 --- a/src/profiling/test/ProfilingMocks.hpp +++ b/src/profiling/test/ProfilingMocks.hpp @@ -5,9 +5,7 @@ #pragma once -#include <Holder.hpp> #include <IProfilingConnectionFactory.hpp> -#include <IProfilingServiceStatus.hpp> #include <ProfilingService.hpp> #include <ProfilingUtils.hpp> #include <SendCounterPacket.hpp> @@ -16,6 +14,9 @@ #include <armnn/BackendId.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> +#include <client/include/Holder.hpp> +#include <client/include/IProfilingServiceStatus.hpp> + #include <common/include/Assert.hpp> #include <common/include/CommonProfilingUtils.hpp> #include <common/include/IgnoreUnused.hpp> diff --git a/src/profiling/test/ProfilingTests.cpp b/src/profiling/test/ProfilingTests.cpp index 22b2ae233a..6e1a5276ca 100644 --- a/src/profiling/test/ProfilingTests.cpp +++ b/src/profiling/test/ProfilingTests.cpp @@ -9,9 +9,6 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include <CommandHandler.hpp> #include <ConnectionAcknowledgedCommandHandler.hpp> -#include <CounterIdMap.hpp> -#include <Holder.hpp> -#include <ICounterValues.hpp> #include <PeriodicCounterCapture.hpp> #include <PeriodicCounterSelectionCommandHandler.hpp> #include <ProfilingStateMachine.hpp> @@ -27,10 +24,14 @@ #include <armnn/Utils.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include <backends/BackendProfiling.hpp> +#include <client/include/CounterIdMap.hpp> +#include <client/include/Holder.hpp> +#include <client/include/ICounterValues.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/CommandHandlerKey.hpp> #include <common/include/CommandHandlerRegistry.hpp> #include <common/include/CounterDirectory.hpp> diff --git a/src/profiling/test/RequestCountersPacketHandler.hpp b/src/profiling/test/RequestCountersPacketHandler.hpp index 7068a4f253..08aeb26053 100644 --- a/src/profiling/test/RequestCountersPacketHandler.hpp +++ b/src/profiling/test/RequestCountersPacketHandler.hpp @@ -5,10 +5,11 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <armnn/profiling/ProfilingOptions.hpp> #include "ProfilingUtils.hpp" +#include <client/include/ILocalPacketHandler.hpp> +#include <client/include/ProfilingOptions.hpp> + #include <common/include/Packet.hpp> namespace arm diff --git a/src/profiling/test/TestTimelinePacketHandler.hpp b/src/profiling/test/TestTimelinePacketHandler.hpp index 7166707e80..76d42f096f 100644 --- a/src/profiling/test/TestTimelinePacketHandler.hpp +++ b/src/profiling/test/TestTimelinePacketHandler.hpp @@ -5,16 +5,17 @@ #pragma once -#include <armnn/profiling/ILocalPacketHandler.hpp> -#include <server/include/timelineDecoder/ITimelineDecoder.hpp> - #include "ProfilingUtils.hpp" -#include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> -#include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> #include "TimelineModel.hpp" +#include <client/include/ILocalPacketHandler.hpp> + #include <common/include/Packet.hpp> +#include <server/include/timelineDecoder/ITimelineDecoder.hpp> +#include <server/include/timelineDecoder/TimelineCaptureCommandHandler.hpp> +#include <server/include/timelineDecoder/TimelineDirectoryCaptureCommandHandler.hpp> + #include <condition_variable> #include <map> #include <mutex> @@ -89,4 +90,4 @@ private: } // namespace pipe -} // namespace arm
\ No newline at end of file +} // namespace arm diff --git a/src/profiling/test/TimelineUtilityMethodsTests.cpp b/src/profiling/test/TimelineUtilityMethodsTests.cpp index 66cb0e92e8..c4aa0575d6 100644 --- a/src/profiling/test/TimelineUtilityMethodsTests.cpp +++ b/src/profiling/test/TimelineUtilityMethodsTests.cpp @@ -8,11 +8,12 @@ #include <ArmNNProfilingServiceInitialiser.hpp> #include <SendTimelinePacket.hpp> -#include <TimelineUtilityMethods.hpp> #include <ProfilingService.hpp> #include <armnn/profiling/ArmNNProfiling.hpp> +#include <client/include/TimelineUtilityMethods.hpp> + #include <common/include/LabelsAndEventClasses.hpp> #include <memory> diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt index af5addadfe..3aabf5be76 100644 --- a/src/timelineDecoder/CMakeLists.txt +++ b/src/timelineDecoder/CMakeLists.txt @@ -11,6 +11,7 @@ if(BUILD_TIMELINE_DECODER) include_directories(${PROJECT_SOURCE_DIR}/src/profiling ${PROJECT_SOURCE_DIR}/profiling/common/include + ${PROJECT_SOURCE_DIR}/profiling/client/include ${PROJECT_SOURCE_DIR}/profiling/server/include/timelineDecoder ${PROJECT_SOURCE_DIR}/src/armnnUtils) |