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

diff --git a/src/profiling/CounterDirectory.cpp b/src/profiling/CounterDirectory.cpp
index 9ef379a..5a7d8c6 100644
--- a/src/profiling/CounterDirectory.cpp
+++ b/src/profiling/CounterDirectory.cpp
@@ -14,10 +14,10 @@
 
 #include <fmt/format.h>
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 
 const Category* CounterDirectory::RegisterCategory(const std::string& categoryName)
@@ -52,7 +52,7 @@
 
 const Device* CounterDirectory::RegisterDevice(const std::string& deviceName,
                                                uint16_t cores,
-                                               const Optional<std::string>& parentCategoryName)
+                                               const armnn::Optional<std::string>& parentCategoryName)
 {
     // Check that the given device name is valid
     if (deviceName.empty() ||
@@ -113,7 +113,7 @@
 
 const CounterSet* CounterDirectory::RegisterCounterSet(const std::string& counterSetName,
                                                        uint16_t count,
-                                                       const Optional<std::string>& parentCategoryName)
+                                                       const armnn::Optional<std::string>& parentCategoryName)
 {
     // Check that the given counter set name is valid
     if (counterSetName.empty() ||
@@ -178,7 +178,7 @@
     return counterSetPtr;
 }
 
-const Counter* CounterDirectory::RegisterCounter(const BackendId& backendId,
+const Counter* CounterDirectory::RegisterCounter(const armnn::BackendId& backendId,
                                                  const uint16_t uid,
                                                  const std::string& parentCategoryName,
                                                  uint16_t counterClass,
@@ -186,10 +186,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)
 {
     IgnoreUnused(backendId);
 
@@ -502,7 +502,7 @@
     });
 }
 
-uint16_t CounterDirectory::GetNumberOfCores(const Optional<uint16_t>& numberOfCores,
+uint16_t CounterDirectory::GetNumberOfCores(const armnn::Optional<uint16_t>& numberOfCores,
                                             uint16_t deviceUid)
 {
     // To get the number of cores, apply the following rules:
@@ -544,6 +544,6 @@
     return 0;
 }
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm