commit 710f664e41803bcb04403a1da27990d76faab6cf
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Wed Nov 27 14:48:32 2019 +0000
committer Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Wed Nov 27 15:53:04 2019 +0000
tree 9ede03e7fcb322c4df1c6ccf0c46f1913844c9ac
parent 899f64f711fdac95d88795f4e88f7770c0cb94be

IVGCVSW-4148 Extend reporting of quant multiplier > 1 as unsupported on ACL to per-axis case

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I66a8360b6d86e95325dee58927dcbe62ccf6ad58

src/backends/cl/ClLayerSupport.cpp

diff --git a/src/backends/cl/ClLayerSupport.cpp b/src/backends/cl/ClLayerSupport.cpp
index 9a5c383..49312d6 100644
--- a/src/backends/cl/ClLayerSupport.cpp
+++ b/src/backends/cl/ClLayerSupport.cpp
@@ -16,6 +16,7 @@
 
 #if defined(ARMCOMPUTECL_ENABLED)
 #include <aclCommon/ArmComputeUtils.hpp>
+#include <aclCommon/ArmComputeTensorUtils.hpp>
 #include "workloads/ClAbsWorkload.hpp"
 #include "workloads/ClAdditionWorkload.hpp"
 #include "workloads/ClActivationWorkload.hpp"
@@ -144,6 +145,13 @@
                                       std::forward<Params>(params)...);
 }
 
+#if defined(ARMCOMPUTECL_ENABLED)
+#define IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights) \
+armcomputetensorutils::IsQuantMultiplierSupported(input, output, weights)
+#else
+#define IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights) true
+#endif
+
 } // anonymous namespace
 
 bool ClLayerSupport::IsAbsSupported(const TensorInfo& input,
@@ -324,8 +332,7 @@
                                               const Optional<TensorInfo>& biases,
                                               Optional<std::string&> reasonIfUnsupported) const
 {
-    // Multiplier > 1.0f currently not supported in ACL
-    if ((input.GetQuantizationScale() * weights.GetQuantizationScale()) / output.GetQuantizationScale() > 1.0f)
+    if (!IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights))
     {
         return false;
     }
@@ -368,13 +375,7 @@
                                                      const Optional<TensorInfo>& biases,
                                                      Optional<std::string&> reasonIfUnsupported) const
 {
-    if (weights.HasPerAxisQuantization())
-    {
-        return false;
-    }
-
-    // Multiplier > 1.0f currently not supported in ACL
-    if ((input.GetQuantizationScale() * weights.GetQuantizationScale()) / output.GetQuantizationScale() > 1.0f)
+    if (!IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights))
     {
         return false;
     }
@@ -395,8 +396,7 @@
                                                             const Optional<TensorInfo>& biases,
                                                             Optional<std::string&> reasonIfUnsupported) const
 {
-    // Multiplier > 1.0f currently not supported in ACL
-    if ((input.GetQuantizationScale() * weights.GetQuantizationScale()) / output.GetQuantizationScale() > 1.0f)
+    if (!IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights))
     {
         return false;
     }
@@ -814,8 +814,7 @@
                                                        const Optional<TensorInfo>& biases,
                                                        Optional<std::string&> reasonIfUnsupported) const
 {
-    // Multiplier > 1.0f currently not supported in ACL
-    if ((input.GetQuantizationScale() * weights.GetQuantizationScale()) / output.GetQuantizationScale() > 1.0f)
+    if (!IS_QUANT_MULTIPLIER_SUPPORTED(input, output, weights))
     {
         return false;
     }