commit 008270f8c1359a7d62c2f881326b4d3f0d8b7b56
author Nikhil Raj Arm <nikhil.raj@arm.com> Fri Aug 11 08:55:21 2023 +0000
committer Nikhil Raj Arm <nikhil.raj@arm.com> Fri Aug 11 08:55:21 2023 +0000
tree 5496cc6b428e1ecc0740aaf62dba331c77a9a9eb
parent 4980e21193f0a14fef084a7f4b4197392f3c0845

Revert "MLCE-1093 Reshape and concat invalid results"

This reverts commit 4980e21193f0a14fef084a7f4b4197392f3c0845.

Reason for revert: Android Build for v82a failed due to schema not re-generating

Change-Id: Ic19cf471b487f321c97ff837d36526512fb12fa4

src/backends/aclCommon/ArmComputeUtils.hpp

diff --git a/src/backends/aclCommon/ArmComputeUtils.hpp b/src/backends/aclCommon/ArmComputeUtils.hpp
index 9552b76..fc59b28 100644
--- a/src/backends/aclCommon/ArmComputeUtils.hpp
+++ b/src/backends/aclCommon/ArmComputeUtils.hpp
@@ -9,7 +9,6 @@
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/NumericCast.hpp>
 #include <armnn/backends/WorkloadData.hpp>
-#include <armnnUtils/TensorUtils.hpp>
 
 #include <arm_compute/runtime/FunctionDescriptors.h>
 #include <arm_compute/function_info/FullyConnectedLayerInfo.h>
@@ -248,20 +247,13 @@
     unsigned int numDimensions = desc.GetNumDimensions();
     std::set<unsigned int> splitAxis;
 
-    if (desc.HasAxis())
+    for (unsigned int i = 0; i < numSplit; ++i)
     {
-        splitAxis.insert(armnnUtils::GetUnsignedAxis(desc.GetNumDimensions(), desc.GetAxis()));
-    }
-    else
-    {
-        for (unsigned int i = 0; i < numSplit; ++i)
+        for (unsigned int dimIdx = 0; dimIdx < numDimensions; ++dimIdx)
         {
-            for (unsigned int dimIdx = 0; dimIdx < numDimensions; ++dimIdx)
+            if (desc.GetViewSizes(i)[dimIdx] != input[dimIdx])
             {
-                if (desc.GetViewSizes(i)[dimIdx] != input[dimIdx])
-                {
-                    splitAxis.insert(dimIdx);
-                }
+                splitAxis.insert(dimIdx);
             }
         }
     }