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

5 files changed, 8 insertions, 8 deletions

diff --git a/delegate/include/DelegateOptions.hpp b/delegate/include/DelegateOptions.hpp
index 5aa7939e4b..d8c4139083 100644
--- a/delegate/include/DelegateOptions.hpp
+++ b/delegate/include/DelegateOptions.hpp
@@ -230,10 +230,10 @@ public:
     const armnn::ProfilingDetailsMethod& GetInternalProfilingDetail() const { return m_InternalProfilingDetail; }
 
     void SetExternalProfilingParams(
-        const armnn::profiling::ProfilingOptions& externalProfilingParams)
+        const arm::pipe::ProfilingOptions& externalProfilingParams)
         { m_ProfilingOptions = externalProfilingParams; }
 
-    const armnn::profiling::ProfilingOptions& GetExternalProfilingParams() const
+    const arm::pipe::ProfilingOptions& GetExternalProfilingParams() const
         { return m_ProfilingOptions; }
 
     void SetSerializeToDot(const std::string& serializeToDotFile) { m_SerializeToDot = serializeToDotFile; }
@@ -265,7 +265,7 @@ private:
     armnn::OptimizerOptions m_OptimizerOptions;
 
     /// External profiling options.
-    armnn::profiling::ProfilingOptions m_ProfilingOptions;
+    arm::pipe::ProfilingOptions m_ProfilingOptions;
 
     /// Internal profiling options.
     /// Indicates whether internal profiling is enabled or not.
diff --git a/delegate/include/Version.hpp b/delegate/include/Version.hpp
index 88cf8ed4b4..34555b2c6f 100644
--- a/delegate/include/Version.hpp
+++ b/delegate/include/Version.hpp
@@ -13,8 +13,8 @@ namespace armnnDelegate
 #define STRINGIFY_MACRO(s) #s
 
 // ArmNN Delegate version components
-#define DELEGATE_MAJOR_VERSION 25
-#define DELEGATE_MINOR_VERSION 1
+#define DELEGATE_MAJOR_VERSION 26
+#define DELEGATE_MINOR_VERSION 0
 #define DELEGATE_PATCH_VERSION 0
 
 /// DELEGATE_VERSION: "X.Y.Z"
diff --git a/delegate/src/DelegateOptions.cpp b/delegate/src/DelegateOptions.cpp
index 5cfddadf99..9413a4689a 100644
--- a/delegate/src/DelegateOptions.cpp
+++ b/delegate/src/DelegateOptions.cpp
@@ -59,7 +59,7 @@ DelegateOptions::DelegateOptions(char const* const* options_keys,
     armnn::OptimizerOptions optimizerOptions;
     bool internalProfilingState = false;
     armnn::ProfilingDetailsMethod internalProfilingDetail = armnn::ProfilingDetailsMethod::DetailsWithEvents;
-    armnn::profiling::ProfilingOptions extProfilingParams;
+    arm::pipe::ProfilingOptions extProfilingParams;
     for (size_t i = 0; i < num_options; ++i)
     {
         // Process backends
diff --git a/delegate/src/MultiLayerFacade.hpp b/delegate/src/MultiLayerFacade.hpp
index 02be26cefd..c0df47bac9 100644
--- a/delegate/src/MultiLayerFacade.hpp
+++ b/delegate/src/MultiLayerFacade.hpp
@@ -91,7 +91,7 @@ public:
         return m_FirstLayer->InferOutputShapes(inputShapes);
     }
 
-    virtual armnn::LayerGuid GetGuid() const override
+    virtual LayerGuid GetGuid() const override
     {
         return m_FirstLayer->GetGuid();
     }
diff --git a/delegate/src/test/DelegateOptionsTest.cpp b/delegate/src/test/DelegateOptionsTest.cpp
index 54f9c8f0e3..126bf30a25 100644
--- a/delegate/src/test/DelegateOptionsTest.cpp
+++ b/delegate/src/test/DelegateOptionsTest.cpp
@@ -87,7 +87,7 @@ TEST_CASE ("ArmnnDelegateOptimizerOptionsDebugFunction")
     // Enable debug with debug callback function
     armnn::OptimizerOptions optimizerOptions(false, true, false, false);
     bool callback = false;
-    auto mockCallback = [&](armnn::LayerGuid guid, unsigned int slotIndex, armnn::ITensorHandle* tensor)
+    auto mockCallback = [&](LayerGuid guid, unsigned int slotIndex, armnn::ITensorHandle* tensor)
     {
         armnn::IgnoreUnused(guid);
         armnn::IgnoreUnused(slotIndex);