commit a893efa3494121f910058ae5b75e32bf6c1d5720
author saoste01 <saoirse.stewart@arm.com> Sat Oct 13 11:56:12 2018 +0100
committer Matthew Bentham <matthew.bentham@arm.com> Mon Oct 22 17:25:39 2018 +0100
tree 07daecbb80fa4102c91e1101513bad4c51ae8a74
parent c965f3c9d39346fbd188ad5561dda446f56c6f5a

IVGCVSW-2007: Fix SQUEEZE error in vts tests

Change-Id: I5475932be49419e630627ba042ea6a70151b78e7

1.1/HalPolicy.cpp

diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp
index 1b1c06e..d241290 100644
--- a/1.1/HalPolicy.cpp
+++ b/1.1/HalPolicy.cpp
@@ -300,19 +300,19 @@
     if(!axisOperand)
     {
         axis.assign(dimensionSequence,
-                    dimensionSequence+inputInfo.GetNumDimensions());
+                    dimensionSequence+rank);
     }
     else
     {
         GetTensorInt32Values(*axisOperand, axis, model, data);
     }
 
-    std::vector<uint32_t> outputDims;
-    for (auto& i : axis)
-    {
-        auto currentDimension = inputInfo.GetShape()[i];
-        bool skipSqueeze = (std::find(axis.begin(), axis.end(), i) == axis.end());
 
+    std::vector<uint32_t> outputDims;
+    for(unsigned int i = 0; i < rank; i++)
+    {
+        bool skipSqueeze = (std::find(axis.begin(), axis.end(), i) == axis.end());
+        auto currentDimension = inputInfo.GetShape()[i];
         if (skipSqueeze || currentDimension != 1)
         {
             outputDims.push_back(currentDimension);