From 15eb5832f45d35c5041ba35a43787e8003e22edb Mon Sep 17 00:00:00 2001
From: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Date: Mon, 20 May 2019 15:31:05 +0100
Subject: IVGCVSW-2771 Fix SubTensor error in vgg16 ExecuteNetwork NEON

 * Add check if Sub-tensors cannot be used, call ACL function
 * Add computation of SplitAxis from SplitterDescriptor
 * Add NeonSplitterWorkload functions
 * Modify IsSplitterSupported to call ACL validate function
if sub-tensor cannot be used
 * Also check if quantization parameters match when using sub-tensors
 * Add more unit tests for Splitter in TfParser and TfLiteParser

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I31e4c7d055117c83c65b598c4125442173242226
---
 src/armnn/layers/SplitterLayer.cpp | 47 ++++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 5 deletions(-)

(limited to 'src/armnn/layers')

diff --git a/src/armnn/layers/SplitterLayer.cpp b/src/armnn/layers/SplitterLayer.cpp
index b3a1094118..4a6b2220a7 100644
--- a/src/armnn/layers/SplitterLayer.cpp
+++ b/src/armnn/layers/SplitterLayer.cpp
@@ -36,20 +36,57 @@ void SplitterLayer::CreateTensorHandles(Graph& graph, const IWorkloadFactory& fa
 {
     //If sub tensors are supported than all the "splitter" need to do is to
     //set the outputs to be appropriate sub tensors of the input.
-    if (factory.SupportsSubTensors())
+    bool useSubTensors = factory.SupportsSubTensors();
+
+    if (useSubTensors)
     {
         const OutputHandler& outputHandler = GetInputSlots()[0].GetConnectedOutputSlot()->GetOutputHandler();
 
+        const TensorInfo& parentInfo = outputHandler.GetTensorInfo();
+
         ITensorHandle* inputData = outputHandler.GetData();
+
+        std::vector<std::unique_ptr<ITensorHandle>> subTensors;
+
         //Creates the outputs as subtensors of the input.
         for (unsigned int i = 0; i < m_Param.GetNumViews(); ++i)
         {
-            m_OutputHandlers[i].SetData(factory.CreateSubTensorHandle(*inputData,
-                                                                      m_OutputHandlers[i].GetTensorInfo().GetShape(),
-                                                                      m_Param.GetViewOrigin(i)));
+            const TensorInfo& info = m_OutputHandlers[i].GetTensorInfo();
+
+            auto CreateSubTensor = [&]()
+            {
+                // Make sure quantization parameters are in the same space
+                if (parentInfo.IsTypeSpaceMatch(info))
+                {
+                    return factory.CreateSubTensorHandle(*inputData,
+                                                         info.GetShape(),
+                                                         this->m_Param.GetViewOrigin(i));
+                }
+                return std::unique_ptr<ITensorHandle>();
+            };
+
+            auto subTensor = CreateSubTensor();
+            if (!subTensor)
+            {
+                useSubTensors = false;
+                break; //Failed to create a valid sub-tensor, so stop trying with the rest of the views.
+            }
+            subTensors.push_back(std::move(subTensor));
+        }
+
+        if (useSubTensors)
+        {
+            unsigned int i = 0;
+            for (auto& subTensor : subTensors)
+            {
+                m_OutputHandlers[i].SetData(std::move(subTensor));
+                ++i;
+            }
+
         }
     }
-    else
+
+    if (!useSubTensors)
     {
         for (unsigned int i = 0; i < m_Param.GetNumViews(); ++i)
         {
-- 
cgit v1.2.1