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
diff --git a/1.3/HalPolicy.cpp b/1.3/HalPolicy.cpp
index 9a9f2ac..d58ac6c 100644
--- a/1.3/HalPolicy.cpp
+++ b/1.3/HalPolicy.cpp
@@ -98,7 +98,7 @@
case V1_3::OperationType::MAXIMUM:
return ConvertMaximum(operation, model, data);
case V1_3::OperationType::MEAN:
- return ConvertReduce(operation, model, data, ReduceOperation::Mean);
+ return ConvertMean(operation, model, data);
case V1_3::OperationType::MINIMUM:
return ConvertMinimum(operation, model, data);
case V1_3::OperationType::MUL:
@@ -365,11 +365,10 @@
return ::ConvertMaximum<hal_1_3::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_3::HalPolicy::ConvertReduce()");
- return ::ConvertReduce<hal_1_3::HalPolicy>(operation, model, data, reduceOperation);
+ ALOGV("hal_1_3::HalPolicy::ConvertMean()");
+ return ::ConvertMean<hal_1_3::HalPolicy>(operation, model, data);
}
bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data)
@@ -426,6 +425,15 @@
return ::ConvertRank<hal_1_3::HalPolicy>(operation, model, data);
}
+bool HalPolicy::ConvertReduce(const Operation& operation,
+ const Model& model,
+ ConversionData& data,
+ ReduceOperation reduceOperation)
+{
+ ALOGV("hal_1_3::HalPolicy::ConvertReduce()");
+ return ::ConvertReduce<hal_1_3::HalPolicy>(operation, model, data, reduceOperation);
+}
+
bool HalPolicy::ConvertReLu(const Operation& operation, const Model& model, ConversionData& data)
{
ALOGV("hal_1_3::HalPolicy::ConvertReLu()");
diff --git a/1.3/HalPolicy.hpp b/1.3/HalPolicy.hpp
index 1337bf2..6dfb885 100644
--- a/1.3/HalPolicy.hpp
+++ b/1.3/HalPolicy.hpp
@@ -110,8 +110,7 @@
static bool ConvertMaximum(const Operation& operation, const Model& model, ConversionData& data);
- static bool ConvertReduce(const Operation& operation, const Model& model, ConversionData& data,
- ReduceOperation reduceOperation);
+ static bool ConvertMean(const Operation& operation, const Model& model, ConversionData& data);
static bool ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data);
@@ -131,6 +130,11 @@
static bool ConvertRank(const Operation& operation, const Model& model, ConversionData& data);
+ static bool ConvertReduce(const Operation& operation,
+ const Model& model,
+ ConversionData& data,
+ ReduceOperation reduceOperation);
+
static bool ConvertReLu(const Operation& operation, const Model& model, ConversionData& data);
static bool ConvertReLu1(const Operation& operation, const Model& model, ConversionData& data);