commit 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab
author Cathal Corbett <cathal.corbett@arm.com> Fri Feb 25 15:33:28 2022 +0000
committer Cathal Corbett <cathal.corbett@arm.com> Tue Mar 01 11:44:14 2022 +0000
tree 23a3a0d5ca5143924277f34c98d36cf7b99430a7
parent 1fc448ad2455ad31b96a3891f847125a3295d75a

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

src/profiling/test/TimelineModel.cpp

diff --git a/src/profiling/test/TimelineModel.cpp b/src/profiling/test/TimelineModel.cpp
index a80ad11..24ced44 100644
--- a/src/profiling/test/TimelineModel.cpp
+++ b/src/profiling/test/TimelineModel.cpp
@@ -9,10 +9,10 @@
 
 #include <algorithm>
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 
 void TimelineModel::AddLabel(const arm::pipe::ITimelineDecoder::Label& label)
@@ -58,20 +58,20 @@
     {
         HandleLabelLink(relationship);
     }
-    else if (relationship.m_RelationshipType == arm::pipe::ITimelineDecoder::RelationshipType::RetentionLink)
+    else if (relationship.m_RelationshipType == ITimelineDecoder::RelationshipType::RetentionLink)
     {
         // Take care of the special case of a connection between layers in ArmNN
         // modelled by a retention link between two layer entities with an attribute GUID
         // of connection
-        if (relationship.m_AttributeGuid == armnn::profiling::LabelsAndEventClasses::CONNECTION_GUID)
+        if (relationship.m_AttributeGuid == LabelsAndEventClasses::CONNECTION_GUID)
         {
             HandleConnection(relationship);
         }
-        else if (relationship.m_AttributeGuid == armnn::profiling::LabelsAndEventClasses::CHILD_GUID)
+        else if (relationship.m_AttributeGuid == LabelsAndEventClasses::CHILD_GUID)
         {
             HandleChild(relationship);
         }
-        else if (relationship.m_AttributeGuid == armnn::profiling::LabelsAndEventClasses::EXECUTION_OF_GUID)
+        else if (relationship.m_AttributeGuid == LabelsAndEventClasses::EXECUTION_OF_GUID)
         {
             HandleExecutionOf(relationship);
         }
@@ -128,8 +128,8 @@
         entity->AddAttribute(*attribute, *value);
         // if the attribute is 'type' and the value is 'inference'
         // we need to cache the entity guid as an inference
-        if (armnn::profiling::LabelsAndEventClasses::TYPE_LABEL.compare(*attribute) == 0 &&
-            armnn::profiling::LabelsAndEventClasses::INFERENCE.compare(*value) == 0)
+        if (LabelsAndEventClasses::TYPE_LABEL.compare(*attribute) == 0 &&
+            LabelsAndEventClasses::INFERENCE.compare(*value) == 0)
         {
             m_InferenceGuids.push_back(relationship.m_HeadGuid);
         }
@@ -360,7 +360,7 @@
     ss << "Entity [" << entity.GetGuid() << "]";
     for (auto& attributeEntry : entity.GetAttributes())
     {
-        if (profiling::LabelsAndEventClasses::PROCESS_ID_LABEL == attributeEntry.second.first)
+        if (LabelsAndEventClasses::PROCESS_ID_LABEL == attributeEntry.second.first)
         {
             ss << " " << attributeEntry.second.first << " = [processId]";
         }
@@ -400,6 +400,6 @@
     return ss.str();
 }
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
\ No newline at end of file
+} // namespace arm
\ No newline at end of file