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/ProfilingService.hpp

diff --git a/src/profiling/ProfilingService.hpp b/src/profiling/ProfilingService.hpp
index af480f3..ab71b0c 100644
--- a/src/profiling/ProfilingService.hpp
+++ b/src/profiling/ProfilingService.hpp
@@ -35,10 +35,10 @@
 
 #include <list>
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 // Static constants describing ArmNN's counter UID's
 static const uint16_t NETWORK_LOADS         = 0;
@@ -55,10 +55,10 @@
     using IProfilingConnectionPtr = std::unique_ptr<IProfilingConnection>;
     using CounterIndices = std::vector<std::atomic<uint32_t>*>;
     using CounterValues = std::list<std::atomic<uint32_t>>;
-    using BackendProfilingContext = std::unordered_map<BackendId,
-                                                       std::shared_ptr<armnn::profiling::IBackendProfilingContext>>;
+    using BackendProfilingContext = std::unordered_map<armnn::BackendId,
+                                                       std::shared_ptr<IBackendProfilingContext>>;
 
-    ProfilingService(Optional<IReportStructure&> reportStructure = EmptyOptional())
+    ProfilingService(armnn::Optional<IReportStructure&> reportStructure = armnn::EmptyOptional())
         : m_Options()
         , m_TimelineReporting(false)
         , m_CounterDirectory()
@@ -126,7 +126,7 @@
                                                       m_StateMachine,
                                                       *this)
         , m_TimelinePacketWriterFactory(m_BufferManager)
-        , m_MaxGlobalCounterId(armnn::profiling::INFERENCES_RUN)
+        , m_MaxGlobalCounterId(INFERENCES_RUN)
         , m_ServiceActive(false)
     {
         // Register the "Connection Acknowledged" command handler
@@ -149,9 +149,9 @@
     ~ProfilingService();
 
     // Resets the profiling options, optionally clears the profiling service entirely
-    void ResetExternalProfilingOptions(const armnn::profiling::ProfilingOptions& options,
+    void ResetExternalProfilingOptions(const ProfilingOptions& options,
                                        bool resetProfilingService = false);
-    ProfilingState ConfigureProfilingService(const armnn::profiling::ProfilingOptions& options,
+    ProfilingState ConfigureProfilingService(const ProfilingOptions& options,
                                              bool resetProfilingService = false);
 
 
@@ -162,8 +162,8 @@
     void Disconnect();
 
     // Store a profiling context returned from a backend that support profiling.
-    void AddBackendProfilingContext(const BackendId backendId,
-        std::shared_ptr<armnn::profiling::IBackendProfilingContext> profilingContext);
+    void AddBackendProfilingContext(const armnn::BackendId backendId,
+        std::shared_ptr<IBackendProfilingContext> profilingContext);
 
     // Enable the recording of timeline events and entities
     void NotifyBackendsForTimelineReporting() override;
@@ -185,7 +185,7 @@
     CaptureData GetCaptureData() override;
     void SetCaptureData(uint32_t capturePeriod,
                         const std::vector<uint16_t>& counterIds,
-                        const std::set<BackendId>& activeBackends);
+                        const std::set<armnn::BackendId>& activeBackends);
 
     // Setters for the profiling service state
     void SetCounterValue(uint16_t counterUid, uint32_t value) override;
@@ -311,6 +311,6 @@
     }
 };
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm