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

3 files changed, 13 insertions, 33 deletions

diff --git a/include/armnn/profiling/ILocalPacketHandler.hpp b/include/armnn/profiling/ILocalPacketHandler.hpp
index af1b0f88b8..bf7bdbc5c4 100644
--- a/include/armnn/profiling/ILocalPacketHandler.hpp
+++ b/include/armnn/profiling/ILocalPacketHandler.hpp
@@ -7,6 +7,7 @@
 
 
 #include <armnn/utility/IgnoreUnused.hpp>
+#include "../../../profiling/common/include/TargetEndianess.hpp"
 
 #include <cstdint>
 #include <memory>
@@ -17,21 +18,8 @@ namespace arm
 {
 namespace pipe
 {
-    class Packet;
-} // namespace pipe
-} // namespace arm
-
-namespace armnn
-{
-
-namespace profiling
-{
 
-enum class TargetEndianness
-{
-    BeWire,
-    LeWire
-};
+class Packet;
 
 // the handlers need to be able to do two
 // things to service the FileOnlyProfilingConnection
@@ -45,7 +33,7 @@ public:
 
     virtual void SetEndianess(const TargetEndianness& endianness) = 0;
 
-    virtual void ReturnPacket(arm::pipe::Packet& packet) = 0;
+    virtual void ReturnPacket(Packet& packet) = 0;
 
     virtual void Close() = 0;
 };
@@ -62,7 +50,7 @@ public:
     virtual std::vector<uint32_t> GetHeadersAccepted() = 0;
 
     /// process the packet
-    virtual void HandlePacket(const arm::pipe::Packet& packet) = 0;
+    virtual void HandlePacket(const Packet& packet) = 0;
 
     /// Set a profiling connection on the handler. Only need to implement this
     /// function if the handler will be writing data back to the profiled application.
@@ -73,6 +61,6 @@ public:
 using ILocalPacketHandlerPtr = std::unique_ptr<ILocalPacketHandler>;
 using ILocalPacketHandlerSharedPtr = std::shared_ptr<ILocalPacketHandler>;
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
\ No newline at end of file
+} // namespace arm
\ No newline at end of file
diff --git a/include/armnn/profiling/ISendTimelinePacket.hpp b/include/armnn/profiling/ISendTimelinePacket.hpp
index c5da5219f7..4785e04ef8 100644
--- a/include/armnn/profiling/ISendTimelinePacket.hpp
+++ b/include/armnn/profiling/ISendTimelinePacket.hpp
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-namespace armnn
+namespace arm
 {
 
-namespace profiling
+namespace pipe
 {
 
 enum class ProfilingRelationshipType
@@ -56,6 +56,6 @@ public:
                                                       uint64_t attributeGuid) = 0;
 };
 
-}    // namespace profiling
+}    // namespace pipe
 
-}    // namespace armnn
+}    // namespace arm
diff --git a/include/armnn/profiling/ProfilingOptions.hpp b/include/armnn/profiling/ProfilingOptions.hpp
index 50cd50e5c3..6b4472ca63 100644
--- a/include/armnn/profiling/ProfilingOptions.hpp
+++ b/include/armnn/profiling/ProfilingOptions.hpp
@@ -16,14 +16,6 @@ namespace pipe
 {
 /// The lowest performance data capture interval we support is 10 miliseconds.
 constexpr unsigned int LOWEST_CAPTURE_PERIOD = 10000u;
-} // namespace pipe
-} // namespace arm
-
-namespace armnn
-{
-
-namespace profiling
-{
 
 struct ProfilingOptions {
     ProfilingOptions()
@@ -45,9 +37,9 @@ struct ProfilingOptions {
     uint32_t m_CapturePeriod;
     /// The format of the file used for outputting profiling data.
     std::string m_FileFormat;
-    std::vector <armnn::profiling::ILocalPacketHandlerSharedPtr> m_LocalPacketHandlers;
+    std::vector <ILocalPacketHandlerSharedPtr> m_LocalPacketHandlers;
 };
 
-} // namespace profiling
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm