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
diff --git a/src/profiling/TimelineUtilityMethods.cpp b/src/profiling/TimelineUtilityMethods.cpp
index 7f8c25d..bc8e7b6 100644
--- a/src/profiling/TimelineUtilityMethods.cpp
+++ b/src/profiling/TimelineUtilityMethods.cpp
@@ -9,10 +9,10 @@
#include <armnnUtils/Threads.hpp>
-namespace armnn
+namespace arm
{
-namespace profiling
+namespace pipe
{
std::unique_ptr<TimelineUtilityMethods> TimelineUtilityMethods::GetTimelineUtils(ProfilingService& profilingService)
@@ -114,7 +114,7 @@
}
// Generate dynamic GUID of the entity
- ProfilingDynamicGuid entityGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid entityGuid = ProfilingService::GetNextGuid();
CreateNamedTypedEntity(entityGuid, name, type);
@@ -177,7 +177,7 @@
}
// Generate a static GUID for the given label name
- ProfilingStaticGuid labelGuid = profiling::ProfilingService::GetStaticId(labelName);
+ ProfilingStaticGuid labelGuid = ProfilingService::GetStaticId(labelName);
// Send the new label to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineLabelBinaryPacket(labelGuid, labelName);
@@ -200,7 +200,7 @@
ProfilingStaticGuid labelGuid = DeclareLabel(labelName);
// Generate a GUID for the label relationship
- ProfilingDynamicGuid relationshipGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid relationshipGuid = ProfilingService::GetNextGuid();
// Send the new label link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::LabelLink,
@@ -214,7 +214,7 @@
ProfilingStaticGuid typeNameGuid)
{
// Generate a GUID for the label relationship
- ProfilingDynamicGuid relationshipGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid relationshipGuid = ProfilingService::GetNextGuid();
// Send the new label link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::LabelLink,
@@ -256,7 +256,7 @@
ProfilingDynamicGuid childEntityGuid = CreateNamedTypedEntity(entityName, entityType);
// Generate a GUID for the retention link relationship
- ProfilingDynamicGuid retentionLinkGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid retentionLinkGuid = ProfilingService::GetNextGuid();
// Send the new retention link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::RetentionLink,
@@ -291,7 +291,7 @@
CreateNamedTypedEntity(childEntityGuid, entityName, entityType);
// Generate a GUID for the retention link relationship
- ProfilingDynamicGuid retentionLinkGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid retentionLinkGuid = ProfilingService::GetNextGuid();
// Send the new retention link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::RetentionLink,
@@ -317,7 +317,7 @@
CreateNamedTypedEntity(childEntityGuid, entityName, typeGuid);
// Generate a GUID for the retention link relationship
- ProfilingDynamicGuid retentionLinkGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid retentionLinkGuid = ProfilingService::GetNextGuid();
// Send the new retention link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::RetentionLink,
@@ -333,7 +333,7 @@
ProfilingGuid relationshipCategory)
{
// Generate a GUID for the relationship
- ProfilingDynamicGuid relationshipGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid relationshipGuid = ProfilingService::GetNextGuid();
// Send the new retention link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(relationshipType,
@@ -349,7 +349,7 @@
ProfilingGuid tailGuid)
{
// Generate a GUID for the relationship
- ProfilingDynamicGuid relationshipGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid relationshipGuid = ProfilingService::GetNextGuid();
// Send the new retention link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(relationshipType,
@@ -378,13 +378,13 @@
int threadId = armnnUtils::Threads::GetCurrentThreadId();
// Generate a GUID for the event
- ProfilingDynamicGuid eventGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid eventGuid = ProfilingService::GetNextGuid();
// Send the new timeline event to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineEventBinaryPacket(timestamp, threadId, eventGuid);
// Generate a GUID for the execution link
- ProfilingDynamicGuid executionLinkId = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid executionLinkId = ProfilingService::GetNextGuid();
// Send the new execution link to the external profiling service, this call throws in case of error
m_SendTimelinePacket->SendTimelineRelationshipBinaryPacket(ProfilingRelationshipType::ExecutionLink,
@@ -399,7 +399,7 @@
ProfilingDynamicGuid TimelineUtilityMethods::RecordWorkloadInferenceAndStartOfLifeEvent(ProfilingGuid workloadGuid,
ProfilingGuid inferenceGuid)
{
- ProfilingDynamicGuid workloadInferenceGuid = profiling::ProfilingService::GetNextGuid();
+ ProfilingDynamicGuid workloadInferenceGuid = ProfilingService::GetNextGuid();
CreateTypedEntity(workloadInferenceGuid, LabelsAndEventClasses::WORKLOAD_EXECUTION_GUID);
CreateRelationship(ProfilingRelationshipType::RetentionLink,
inferenceGuid,
@@ -418,6 +418,6 @@
RecordEvent(entityGuid, LabelsAndEventClasses::ARMNN_PROFILING_EOL_EVENT_CLASS);
}
-} // namespace profiling
+} // namespace pipe
-} // namespace armnn
+} // namespace arm