commit 800b281e506e921006c23cd4309781b6508c0fcb
author Colm Donelan <Colm.Donelan@arm.com> Fri Feb 12 12:43:35 2021 +0000
committer Colm Donelan <colm.donelan@arm.com> Mon Feb 15 10:24:30 2021 +0000
tree 06c6eb1a252fa6d90460c1e821542bc1a86b067f
parent 0a7dc6bba5d0810fe2ed6f84b0376a8b0674c0b3

IVGCVSW-5648 Adding serializer support for m_DimensionsSpecificity

The field m_DimensionsSpecificity in TensorShape was not being serialized
and deserialized following implementation of type 1 dynamic tensors.

* Update schema.
* Add to Serializer and Deserializer.

Signed-off-by: Colm Donelan <Colm.Donelan@arm.com>
Change-Id: I7ddbdaf54c8f4b988c6cb300f90ba848a94bdad0

src/armnnSerializer/Serializer.cpp

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index bcdaa08..0586700 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -1668,6 +1668,14 @@
         shape.push_back(tensorInfo.GetShape()[dim]);
     }
 
+    std::vector<bool> specificity;
+    // This assumes that the TensorShape constructors have ensured that the size of m_DimensionsSpecificity
+    // matches the size of dimensions.
+    for(unsigned int dim = 0; dim < tensorInfo.GetShape().GetNumDimensions(); ++dim)
+    {
+        specificity.push_back(tensorInfo.GetShape().GetDimensionSpecificity(dim));
+    }
+
     if (tensorInfo.HasPerAxisQuantization())
     {
         // Create FlatBuffer TensorInfo
@@ -1680,7 +1688,8 @@
                                          m_flatBufferBuilder.CreateVector(tensorInfo.GetQuantizationScales()),
                                          tensorInfo.GetQuantizationDim().value(),
                                          static_cast<unsigned int>
-                                         (tensorInfo.GetShape().GetDimensionality()));
+                                         (tensorInfo.GetShape().GetDimensionality()),
+                                         m_flatBufferBuilder.CreateVector(specificity));
         return flatBufferTensorInfo;
     }
 
@@ -1693,7 +1702,8 @@
                                                              0,
                                                              0,
                                                              static_cast<unsigned int>
-                                                             (tensorInfo.GetShape().GetDimensionality()));
+                                                             (tensorInfo.GetShape().GetDimensionality()),
+                                                             m_flatBufferBuilder.CreateVector(specificity));
     return flatBufferTensorInfo;
 }