commit fca5916e4e6a44cf11b47328659d4d7ee95ec231
author Mike Kelly <mike.kelly@arm.com> Tue Aug 08 12:00:28 2023 +0100
committer Mike Kelly <mike.kelly@arm.com> Tue Aug 08 13:16:17 2023 +0100
tree 0810bdfde4137dbee99304f1d6fa2033db084af8
parent 3b3dcbf0321fadcb2b7b5b550a4d03f510d7cb7b

MLCE-1093 Added Axis to ViewsDescriptor

 * Added Axis to ViewsDescriptor to store the value where ever possible.
 * Updated Serializer and Deserializer to handle axis.

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I56e442872b47485a608b25fbc79063b362a25618

include/armnn/Descriptors.hpp

diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index f1ac17f..f60e8f3 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -276,9 +276,21 @@
 
     /// Swap the ViewsDescriptor value first and second.
     friend void swap(ViewsDescriptor& first, ViewsDescriptor& second);
+
+    /// Set the axis value.
+    void SetAxis(int32_t axis);
+
+    /// Get the axis value.
+    int32_t GetAxis() const;
+
+    /// Returns true if an axis has been set.
+    bool HasAxis() const;
+
 private:
     OriginsDescriptor m_Origins;
     uint32_t**        m_ViewSizes;
+    bool              m_IsAxisSet = false;
+    int32_t           m_Axis = 0;
 };
 
 

src/armnn/Descriptors.cpp

diff --git a/src/armnn/Descriptors.cpp b/src/armnn/Descriptors.cpp
index a1419cf..e6374ae 100644
--- a/src/armnn/Descriptors.cpp
+++ b/src/armnn/Descriptors.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright © 2022 Arm Ltd and Contributors. All rights reserved.
+// Copyright © 2017-2023 Arm Ltd and Contributors. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 #include "armnn/Descriptors.hpp"
@@ -363,6 +363,24 @@
     swap(first.m_ViewSizes, second.m_ViewSizes);
 }
 
+void ViewsDescriptor::SetAxis(int32_t axis)
+{
+    m_Axis = axis;
+    m_IsAxisSet = true;
+}
+
+/// Get the axis value.
+int32_t ViewsDescriptor::GetAxis() const
+{
+    return m_Axis;
+}
+
+/// Returns true if an axis has been set.
+bool ViewsDescriptor::HasAxis() const
+{
+    return m_IsAxisSet;
+}
+
 int StridedSliceDescriptor::GetStartForAxis(const TensorShape& inputShape,
                                             unsigned int axis) const
 {

src/armnn/SerializeLayerParameters.cpp

diff --git a/src/armnn/SerializeLayerParameters.cpp b/src/armnn/SerializeLayerParameters.cpp
index 1445c70..d65a7d5 100644
--- a/src/armnn/SerializeLayerParameters.cpp
+++ b/src/armnn/SerializeLayerParameters.cpp
@@ -636,6 +636,10 @@
         }
         value << "]";
         fn(key.str(), value.str());
+        if (desc.HasAxis())
+        {
+            fn("Axis", std::to_string(desc.GetAxis()));
+        }
     }
     StringifyLayerParameters<OriginsDescriptor>::Serialize(fn, desc.GetOrigins());
 }

src/armnnSerializer/ArmnnSchema.fbs

diff --git a/src/armnnSerializer/ArmnnSchema.fbs b/src/armnnSerializer/ArmnnSchema.fbs
index bd0bd03..ec4b486 100644
--- a/src/armnnSerializer/ArmnnSchema.fbs
+++ b/src/armnnSerializer/ArmnnSchema.fbs
@@ -774,6 +774,8 @@
 table ViewsDescriptor {
    origins:OriginsDescriptor;
    viewSizes:[UintVector];
+   hasAxis:bool;
+   axis:int;
 }
 
 table SplitterLayer {