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/RegisterBackendCounters.cpp

diff --git a/src/profiling/RegisterBackendCounters.cpp b/src/profiling/RegisterBackendCounters.cpp
index 035a2ca..dcafe3b 100644
--- a/src/profiling/RegisterBackendCounters.cpp
+++ b/src/profiling/RegisterBackendCounters.cpp
@@ -5,10 +5,10 @@
 
 #include "RegisterBackendCounters.hpp"
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 
 void RegisterBackendCounters::RegisterCategory(const std::string& categoryName)
@@ -18,7 +18,7 @@
 
 uint16_t RegisterBackendCounters::RegisterDevice(const std::string& deviceName,
                                                  uint16_t cores,
-                                                 const Optional<std::string>& parentCategoryName)
+                                                 const armnn::Optional<std::string>& parentCategoryName)
 {
     const Device* devicePtr = m_CounterDirectory.RegisterDevice(deviceName, cores, parentCategoryName);
     return devicePtr->m_Uid;
@@ -26,7 +26,7 @@
 
 uint16_t RegisterBackendCounters::RegisterCounterSet(const std::string& counterSetName,
                                                      uint16_t count,
-                                                     const Optional<std::string>& parentCategoryName)
+                                                     const armnn::Optional<std::string>& parentCategoryName)
 {
     const CounterSet* counterSetPtr = m_CounterDirectory.RegisterCounterSet(counterSetName, count, parentCategoryName);
     return counterSetPtr->m_Uid;
@@ -39,10 +39,10 @@
                                                   double multiplier,
                                                   const std::string& name,
                                                   const std::string& description,
-                                                  const Optional<std::string>& units,
-                                                  const Optional<uint16_t>& numberOfCores,
-                                                  const Optional<uint16_t>& deviceUid,
-                                                  const Optional<uint16_t>& counterSetUid)
+                                                  const armnn::Optional<std::string>& units,
+                                                  const armnn::Optional<uint16_t>& numberOfCores,
+                                                  const armnn::Optional<uint16_t>& deviceUid,
+                                                  const armnn::Optional<uint16_t>& counterSetUid)
 {
     ++m_CurrentMaxGlobalCounterID;
     const Counter* counterPtr = m_CounterDirectory.RegisterCounter(m_BackendId,
@@ -80,6 +80,6 @@
     return m_CurrentMaxGlobalCounterID;
 }
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm