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, 6 insertions, 2 deletions

diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp
index 301989ebb7..f40f7ffe0e 100644
--- a/src/armnnTfLiteParser/TfLiteParser.cpp
+++ b/src/armnnTfLiteParser/TfLiteParser.cpp
@@ -4213,7 +4213,7 @@ void TfLiteParserImpl::ParseUnpack(size_t subgraphIndex, size_t operatorIndex)
         }
         splitDesc.SetViewOriginCoord(j, unpackAxis, unpackDimSizes[unpackAxis] * j);
     }
-
+    splitDesc.SetAxis(unpackAxis);
     auto layerName = fmt::format("Unpack:{}:{}", subgraphIndex, operatorIndex);
     IConnectableLayer* layer = m_Network->AddSplitterLayer(splitDesc, layerName.c_str());
 
@@ -4352,7 +4352,10 @@ void TfLiteParserImpl::ParseSplit(size_t subgraphIndex, size_t operatorIndex)
         }
         splitDesc.SetViewOriginCoord(j, splitDim, splitterDimSizes[splitDim] * j);
     }
-
+    if (axisTensorInfo.GetNumElements() == 1)
+    {
+        splitDesc.SetAxis(axis);
+    }
     auto layerName = fmt::format("Split:{}:{}", subgraphIndex, operatorIndex);
     IConnectableLayer* layer = m_Network->AddSplitterLayer(splitDesc, layerName.c_str());
 
@@ -4531,6 +4534,7 @@ void TfLiteParserImpl::ParseSplitV(size_t subgraphIndex, size_t operatorIndex)
         splitDesc.SetViewOriginCoord(j, splitDim, accumSplit);
         accumSplit += splitSize;
     }
+    splitDesc.SetAxis(axis);
 
     auto layerName = fmt::format("SplitV:{}:{}", subgraphIndex, operatorIndex);
     IConnectableLayer* layer = m_Network->AddSplitterLayer(splitDesc, layerName.c_str());