IVGCVSW-5833 Move the ProfilingGuid out of Types.hpp to its own header in profiling common
!android-nn-driver:5691
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ib71af0831e324ac6bd27b1a36f4a6ec1a703b14a
diff --git a/src/armnn/InternalTypes.hpp b/src/armnn/InternalTypes.hpp
index 9850520..a462505 100644
--- a/src/armnn/InternalTypes.hpp
+++ b/src/armnn/InternalTypes.hpp
@@ -5,6 +5,7 @@
#pragma once
#include <armnn/Types.hpp>
+#include <common/include/ProfilingGuid.hpp>
#include <array>
diff --git a/src/armnn/OptimizedNetworkImpl.hpp b/src/armnn/OptimizedNetworkImpl.hpp
index 25bf9ca..fe55ca2 100644
--- a/src/armnn/OptimizedNetworkImpl.hpp
+++ b/src/armnn/OptimizedNetworkImpl.hpp
@@ -3,6 +3,8 @@
// SPDX-License-Identifier: MIT
//
+#include <common/include/ProfilingGuid.hpp>
+
namespace armnn
{
diff --git a/src/armnn/RangeTracker.hpp b/src/armnn/RangeTracker.hpp
index 6662775..89d19ac 100644
--- a/src/armnn/RangeTracker.hpp
+++ b/src/armnn/RangeTracker.hpp
@@ -8,6 +8,8 @@
#include <armnn/INetwork.hpp>
#include <armnn/Types.hpp>
+#include <common/include/ProfilingGuid.hpp>
+
#include <utility>
#include <unordered_map>
diff --git a/src/armnnSerializer/Serializer.hpp b/src/armnnSerializer/Serializer.hpp
index 022cf64..7bbcc24 100644
--- a/src/armnnSerializer/Serializer.hpp
+++ b/src/armnnSerializer/Serializer.hpp
@@ -10,6 +10,8 @@
#include <armnnSerializer/ISerializer.hpp>
+#include <common/include/ProfilingGuid.hpp>
+
#include <unordered_map>
#include "ArmnnSchema_generated.h"
diff --git a/src/armnnUtils/DotSerializer.cpp b/src/armnnUtils/DotSerializer.cpp
index 87376e6..0262b71 100644
--- a/src/armnnUtils/DotSerializer.cpp
+++ b/src/armnnUtils/DotSerializer.cpp
@@ -5,6 +5,7 @@
#include "DotSerializer.hpp"
#include "armnn/utility/StringUtils.hpp"
+#include <common/include/ProfilingGuid.hpp>
#include <sstream>
#include <cstring>
diff --git a/src/backends/reference/workloads/Debug.cpp b/src/backends/reference/workloads/Debug.cpp
index df05ad7..24000d4 100644
--- a/src/backends/reference/workloads/Debug.cpp
+++ b/src/backends/reference/workloads/Debug.cpp
@@ -4,6 +4,7 @@
//
#include "Debug.hpp"
+#include <common/include/ProfilingGuid.hpp>
#include <BFloat16.hpp>
#include <Half.hpp>
diff --git a/src/profiling/FileOnlyProfilingConnection.cpp b/src/profiling/FileOnlyProfilingConnection.cpp
index a21ec2f..3b3d7a8 100644
--- a/src/profiling/FileOnlyProfilingConnection.cpp
+++ b/src/profiling/FileOnlyProfilingConnection.cpp
@@ -4,11 +4,11 @@
//
#include "FileOnlyProfilingConnection.hpp"
-#include "PacketVersionResolver.hpp"
#include <armnn/Exceptions.hpp>
#include <common/include/Constants.hpp>
#include <common/include/ProfilingException.hpp>
+#include <common/include/PacketVersionResolver.hpp>
#include <algorithm>
#include <iostream>
diff --git a/src/profiling/IProfilingServiceStatus.hpp b/src/profiling/IProfilingServiceStatus.hpp
index 45d4aac..1d27246 100644
--- a/src/profiling/IProfilingServiceStatus.hpp
+++ b/src/profiling/IProfilingServiceStatus.hpp
@@ -5,9 +5,10 @@
#pragma once
-#include <Packet.hpp>
#include <armnn/profiling/ILocalPacketHandler.hpp>
+#include <common/include/Packet.hpp>
+
#include <cstdint>
namespace armnn
diff --git a/src/profiling/LabelsAndEventClasses.hpp b/src/profiling/LabelsAndEventClasses.hpp
index b06b9a1..dad27e1 100644
--- a/src/profiling/LabelsAndEventClasses.hpp
+++ b/src/profiling/LabelsAndEventClasses.hpp
@@ -6,8 +6,7 @@
#pragma once
#include "ProfilingGuidGenerator.hpp"
-
-#include <armnn/Types.hpp>
+#include <common/include/ProfilingGuid.hpp>
#include <DllExport.hpp>
namespace armnn
diff --git a/src/profiling/PeriodicCounterCapture.hpp b/src/profiling/PeriodicCounterCapture.hpp
index ac084af..b7b1a20 100644
--- a/src/profiling/PeriodicCounterCapture.hpp
+++ b/src/profiling/PeriodicCounterCapture.hpp
@@ -7,15 +7,17 @@
#include "IPeriodicCounterCapture.hpp"
#include "Holder.hpp"
-#include <Packet.hpp>
#include "SendCounterPacket.hpp"
#include "ICounterValues.hpp"
#include "CounterIdMap.hpp"
+#include <armnn/backends/profiling/IBackendProfilingContext.hpp>
+
+#include <common/include/Packet.hpp>
+
#include <atomic>
#include <mutex>
#include <thread>
-#include <armnn/backends/profiling/IBackendProfilingContext.hpp>
namespace armnn
{
diff --git a/src/profiling/ProfilingGuidGenerator.hpp b/src/profiling/ProfilingGuidGenerator.hpp
index 86f9ce0..3798e0c 100644
--- a/src/profiling/ProfilingGuidGenerator.hpp
+++ b/src/profiling/ProfilingGuidGenerator.hpp
@@ -7,6 +7,8 @@
#include "armnn/profiling/IProfilingGuidGenerator.hpp"
+#include <common/include/ProfilingGuid.hpp>
+
#include <functional>
#include <mutex>
diff --git a/src/profiling/ProfilingService.cpp b/src/profiling/ProfilingService.cpp
index 6fe52f8..fe407e4 100644
--- a/src/profiling/ProfilingService.cpp
+++ b/src/profiling/ProfilingService.cpp
@@ -9,6 +9,8 @@
#include <armnn/Logging.hpp>
#include <armnn/utility/NumericCast.hpp>
+#include <common/include/ProfilingGuid.hpp>
+
#include <common/include/SocketConnectionException.hpp>
#include <fmt/format.h>
diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp
index e72894a..f49801b 100644
--- a/src/profiling/TimelineUtilityMethods.cpp
+++ b/src/profiling/TimelineUtilityMethods.cpp
@@ -3,9 +3,12 @@
// SPDX-License-Identifier: MIT
//
#include "LabelsAndEventClasses.hpp"
-#include <Threads.hpp>
#include "TimelineUtilityMethods.hpp"
+#include <common/include/ProfilingGuid.hpp>
+
+#include <Threads.hpp>
+
namespace armnn
{
diff --git a/src/profiling/test/ProfilingMocks.hpp b/src/profiling/test/ProfilingMocks.hpp
index 19d79e2..a34c849 100644
--- a/src/profiling/test/ProfilingMocks.hpp
+++ b/src/profiling/test/ProfilingMocks.hpp
@@ -21,6 +21,8 @@
#include <armnn/utility/IgnoreUnused.hpp>
#include <armnn/utility/NumericCast.hpp>
+#include <common/include/ProfilingGuid.hpp>
+
#include <atomic>
#include <condition_variable>
#include <mutex>