IVGCVSW-8300 Fix for CTS Float16 tests

* Fix for Neon IsLayerSupported to properly check for multiple Quantization Scales

Signed-off-by: Orlaith Monahan <orlaith.monahan@arm.com>
Change-Id: I9f4558cbd62ce1657adb5025ac16c2b5d69d12b1

2 files changed, 22 insertions, 14 deletions

diff --git a/src/armnn/Tensor.cpp b/src/armnn/Tensor.cpp
index f75fc60ef7..650b93835f 100644
--- a/src/armnn/Tensor.cpp
+++ b/src/armnn/Tensor.cpp
@@ -465,15 +465,12 @@ float TensorInfo::GetQuantizationScale() const
         // NOTE: old default for backward compatibility
         return 1.0f;
     }
-    // If this tensor includes multiples scales then you should be calling GetQuantizationScales.
-    // This should be an exception not an assert but unfortunately it breaks many tests.
-    // ToDo: IVGCVSW-8323
-    ARMNN_ASSERT(!HasMultipleQuantizationScales());
-//    if (HasMultipleQuantizationScales())
-//    {
-//        throw RuntimeException("Invalid call to GetQuantizationScale on a tensor with multiple scale values. Use "
-//                               "GetQuantizationScales instead.");
-//    }
+
+    if (HasMultipleQuantizationScales())
+    {
+        throw RuntimeException("Invalid call to GetQuantizationScale on a tensor with multiple scale values. Use "
+                               "GetQuantizationScales instead.");
+    }
     return m_Quantization.m_Scales[0];
 }
 
diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp
index 0298c7c552..b6db52342e 100644
--- a/src/backends/neon/NeonLayerSupport.cpp
+++ b/src/backends/neon/NeonLayerSupport.cpp
@@ -102,11 +102,22 @@ const TensorInfo OverrideDataType(const TensorInfo& info, Optional<DataType> typ
     {
         return info;
     }
-    return TensorInfo(info.GetShape(),
-                      type.value(),
-                      info.GetQuantizationScale(),
-                      info.GetQuantizationOffset(),
-                      info.IsConstant());
+    if (info.HasMultipleQuantizationScales())
+    {
+        return TensorInfo(info.GetShape(),
+                          type.value(),
+                          info.GetQuantizationScales(),
+                          info.GetQuantizationDim().value(),
+                          info.IsConstant());
+    }
+    else
+    {
+        return TensorInfo(info.GetShape(),
+                          type.value(),
+                          info.GetQuantizationScale(),
+                          info.GetQuantizationOffset(),
+                          info.IsConstant());
+    }
 }
 
 template< typename ... Args>