MLCE-1093 Reshape and concat invalid results

!android-nn-driver:10089

 * Disabled SubTensors on CL and Neon Backends.
 * Added Axis to ViewsDescriptor to store the value where ever possible.
 * Updated Splitter tests to provide all the information needed in the
   Descriptor.
 * Updated Serializer and Deserializer to handle axis.

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

1 files changed, 3 insertions, 1 deletions

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 6cadb598a2..1b7e46e51a 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -1306,7 +1306,9 @@ void SerializerStrategy::SerializeSplitterLayer(const armnn::IConnectableLayer*
     // Create FlatBuffer ViewsDescriptor
     auto flatBufferViewsDescriptor = CreateViewsDescriptor(m_flatBufferBuilder,
                                                            flatBufferOriginDescriptor,
-                                                           m_flatBufferBuilder.CreateVector(flatBufferViewSizes));
+                                                           m_flatBufferBuilder.CreateVector(flatBufferViewSizes),
+                                                           viewsDescriptor.HasAxis(),
+                                                           viewsDescriptor.GetAxis());
 
     // Create FlatBuffer BaseLayer
     auto flatBufferBaseLayer = CreateLayerBase(layer, serializer::LayerType::LayerType_Splitter);