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

2 files changed, 25 insertions, 15 deletions

diff --git a/src/armnnUtils/ProfilingOptionsConverter.cpp b/src/armnnUtils/ProfilingOptionsConverter.cpp
index 6d5b35134a..9a256db47c 100644
--- a/src/armnnUtils/ProfilingOptionsConverter.cpp
+++ b/src/armnnUtils/ProfilingOptionsConverter.cpp
@@ -8,23 +8,28 @@
 #include <algorithm>
 #include <iterator>
 
-namespace armnn
+namespace arm
 {
 
-profiling::ProfilingOptions ConvertExternalProfilingOptions(
-    const IRuntime::CreationOptions::ExternalProfilingOptions& options)
+namespace pipe
 {
-    profiling::ProfilingOptions convertedOptions;
-    convertedOptions.m_EnableProfiling =     options.m_EnableProfiling;
-    convertedOptions.m_TimelineEnabled =     options.m_TimelineEnabled;
+
+ProfilingOptions ConvertExternalProfilingOptions(
+    const armnn::IRuntime::CreationOptions::ExternalProfilingOptions& options)
+{
+    ProfilingOptions convertedOptions;
+    convertedOptions.m_EnableProfiling     = options.m_EnableProfiling;
+    convertedOptions.m_TimelineEnabled     = options.m_TimelineEnabled;
     convertedOptions.m_OutgoingCaptureFile = options.m_OutgoingCaptureFile;
     convertedOptions.m_IncomingCaptureFile = options.m_IncomingCaptureFile;
-    convertedOptions.m_FileOnly =            options.m_FileOnly;
-    convertedOptions.m_CapturePeriod =       options.m_CapturePeriod;
-    convertedOptions.m_FileFormat =          options.m_FileFormat;
+    convertedOptions.m_FileOnly            = options.m_FileOnly;
+    convertedOptions.m_CapturePeriod       = options.m_CapturePeriod;
+    convertedOptions.m_FileFormat          = options.m_FileFormat;
     std::copy(options.m_LocalPacketHandlers.begin(), options.m_LocalPacketHandlers.end(),
-        std::back_inserter(convertedOptions.m_LocalPacketHandlers));
+              std::back_inserter(convertedOptions.m_LocalPacketHandlers));
     return convertedOptions;
 }
 
-} // namespace armnn
+} // namespace arm
+
+} // namespace pipe
diff --git a/src/armnnUtils/ProfilingOptionsConverter.hpp b/src/armnnUtils/ProfilingOptionsConverter.hpp
index 02be849816..3bf1f1920d 100644
--- a/src/armnnUtils/ProfilingOptionsConverter.hpp
+++ b/src/armnnUtils/ProfilingOptionsConverter.hpp
@@ -8,10 +8,15 @@
 #include <armnn/IRuntime.hpp>
 #include <armnn/profiling/ProfilingOptions.hpp>
 
-namespace armnn
+namespace arm
 {
 
-profiling::ProfilingOptions ConvertExternalProfilingOptions(
-    const IRuntime::CreationOptions::ExternalProfilingOptions& options);
+namespace pipe
+{
+
+ProfilingOptions ConvertExternalProfilingOptions(
+    const armnn::IRuntime::CreationOptions::ExternalProfilingOptions& options);
+
+} // namespace pipe
 
-} // namespace armnn
+} // namespace arm