commit 6a2845317f9f9e5161f3afab2b54dac494f57f89
author Sadik Armagan <sadik.armagan@arm.com> Fri Mar 12 09:12:29 2021 +0000
committer Sadik Armagan <sadik.armagan@arm.com> Fri Mar 12 09:12:29 2021 +0000
tree fbaaae4f162b80adc5998d2b77641a80d0bed59e
parent 89cbb3a914d76843630f3576108e309cf085ef80

IVGCVSW-5767 'Regression on SqueezeNet v1.1'

* MEAN operator second input data type is different than Reduction operators
* Use existing ConvertMean() function for MEAN operator

Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: I211cb77515d88e54ded9646eebe3e901d437827c

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 7d45688..e96c4cb 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -86,7 +86,7 @@
         case V1_2::OperationType::MAXIMUM:
             return ConvertMaximum(operation, model, data);
         case V1_2::OperationType::MEAN:
-            return ConvertReduce(operation, model, data, ReduceOperation::Mean);
+            return ConvertMean(operation, model, data);
         case V1_2::OperationType::MINIMUM:
             return ConvertMinimum(operation, model, data);
         case V1_2::OperationType::MUL:
@@ -312,11 +312,10 @@
     return ::ConvertMaximum<hal_1_2::HalPolicy>(operation, model, data);
 }
 
-bool HalPolicy::ConvertReduce(const Operation& operation, const Model& model, ConversionData& data,
-                              ReduceOperation reduceOperation)
+bool HalPolicy::ConvertMean(const Operation& operation, const Model& model, ConversionData& data)
 {
-    ALOGV("hal_1_2::HalPolicy::ConvertReduce()");
-    return ::ConvertReduce<hal_1_2::HalPolicy>(operation, model, data, reduceOperation);
+    ALOGV("hal_1_2::HalPolicy::ConvertMean()");
+    return ::ConvertMean<hal_1_2::HalPolicy>(operation, model, data);
 }
 
 bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data)
@@ -361,6 +360,15 @@
     return ::ConvertQuantized16BitLstm<hal_1_2::HalPolicy>(operation, model, data);
 }
 
+bool HalPolicy::ConvertReduce(const Operation& operation,
+                              const Model& model,
+                              ConversionData& data,
+                              ReduceOperation reduceOperation)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertReduce()");
+    return ::ConvertReduce<hal_1_2::HalPolicy>(operation, model, data, reduceOperation);
+}
+
 bool HalPolicy::ConvertReLu(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_2::HalPolicy::ConvertReLu()");