From 5aa9fd7ac6bf8dad576fa4a0a32aa3dae98d11ab Mon Sep 17 00:00:00 2001
From: Cathal Corbett <cathal.corbett@arm.com>
Date: Fri, 25 Feb 2022 15:33:28 +0000
Subject: 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.hpp | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/profiling/CounterDirectory.hpp')

diff --git a/src/profiling/CounterDirectory.hpp b/src/profiling/CounterDirectory.hpp
index a6e788ee1f..ee9b52e8cd 100644
--- a/src/profiling/CounterDirectory.hpp
+++ b/src/profiling/CounterDirectory.hpp
@@ -14,10 +14,10 @@
 
 #include <armnn/utility/NumericCast.hpp>
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 
 class CounterDirectory final : public ICounterDirectory, public ICounterRegistry
@@ -30,11 +30,13 @@ public:
     const Category*   RegisterCategory  (const std::string& categoryName) override;
     const Device*     RegisterDevice    (const std::string& deviceName,
                                          uint16_t cores = 0,
-                                         const Optional<std::string>& parentCategoryName = EmptyOptional()) override;
+                                         const armnn::Optional<std::string>& parentCategoryName
+                                            = armnn::EmptyOptional()) override;
     const CounterSet* RegisterCounterSet(const std::string& counterSetName,
                                          uint16_t count = 0,
-                                         const Optional<std::string>& parentCategoryName = EmptyOptional()) override;
-    const Counter* RegisterCounter(const BackendId& backendId,
+                                         const armnn::Optional<std::string>& parentCategoryName
+                                            = armnn::EmptyOptional()) override;
+    const Counter* RegisterCounter(const armnn::BackendId& backendId,
                                    const uint16_t uid,
                                    const std::string& parentCategoryName,
                                    uint16_t counterClass,
@@ -42,10 +44,10 @@ public:
                                    double multiplier,
                                    const std::string& name,
                                    const std::string& description,
-                                   const Optional<std::string>& units = EmptyOptional(),
-                                   const Optional<uint16_t>& numberOfCores = EmptyOptional(),
-                                   const Optional<uint16_t>& deviceUid = EmptyOptional(),
-                                   const Optional<uint16_t>& counterSetUid = EmptyOptional()) override;
+                                   const armnn::Optional<std::string>& units = armnn::EmptyOptional(),
+                                   const armnn::Optional<uint16_t>& numberOfCores = armnn::EmptyOptional(),
+                                   const armnn::Optional<uint16_t>& deviceUid = armnn::EmptyOptional(),
+                                   const armnn::Optional<uint16_t>& counterSetUid = armnn::EmptyOptional()) override;
 
     // Getters for counts
     uint16_t GetCategoryCount()   const override { return armnn::numeric_cast<uint16_t>(m_Categories.size());  }
@@ -92,10 +94,10 @@ private:
     CounterSetsIt FindCounterSet(const std::string& counterSetName) const;
     CountersIt    FindCounter(uint16_t counterUid) const;
     CountersIt    FindCounter(const std::string& counterName) const;
-    uint16_t      GetNumberOfCores(const Optional<uint16_t>& numberOfCores,
+    uint16_t      GetNumberOfCores(const armnn::Optional<uint16_t>& numberOfCores,
                                    uint16_t deviceUid);
 };
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm
-- 
cgit v1.2.1