Add support for Rank and scalar tensors

!armnn:3330

Signed-off-by: Finn Williams <Finn.Williams@Arm.com>
Change-Id: Icc429d9fabb570193d12bffef0e00dda7b51032f

1 files changed, 14 insertions, 8 deletions

diff --git a/Utils.hpp b/Utils.hpp
index b61ddb21..d58d2735 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -150,18 +150,24 @@ inline V1_2::OutputShape ComputeShape(const armnn::TensorInfo& info)
 {
     V1_2::OutputShape shape;
 
-    android::hardware::hidl_vec<uint32_t> dimensions;
-
     armnn::TensorShape tensorShape = info.GetShape();
-    const unsigned int numDims = tensorShape.GetNumDimensions();
-    dimensions.resize(numDims);
-
-    for (unsigned int outputIdx = 0u; outputIdx < numDims; ++outputIdx)
+    // Android will expect scalars as a zero dimensional tensor
+    if(tensorShape.GetDimensionality() == armnn::Dimensionality::Scalar)
+    {
+         shape.dimensions = android::hardware::hidl_vec<uint32_t>{};
+    }
+    else
     {
-        dimensions[outputIdx] = tensorShape[outputIdx];
+        android::hardware::hidl_vec<uint32_t> dimensions;
+        const unsigned int numDims = tensorShape.GetNumDimensions();
+        dimensions.resize(numDims);
+        for (unsigned int outputIdx = 0u; outputIdx < numDims; ++outputIdx)
+        {
+            dimensions[outputIdx] = tensorShape[outputIdx];
+        }
+        shape.dimensions = dimensions;
     }
 
-    shape.dimensions = dimensions;
     shape.isSufficient = true;
 
     return shape;