From 6a2845317f9f9e5161f3afab2b54dac494f57f89 Mon Sep 17 00:00:00 2001 From: Sadik Armagan Date: Fri, 12 Mar 2021 09:12:29 +0000 Subject: 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 Change-Id: I211cb77515d88e54ded9646eebe3e901d437827c --- 1.2/HalPolicy.cpp | 18 +++++++++++++----- 1.2/HalPolicy.hpp | 8 ++++++-- 1.3/HalPolicy.cpp | 18 +++++++++++++----- 1.3/HalPolicy.hpp | 8 ++++++-- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index 7d45688a..e96c4cb0 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -86,7 +86,7 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, 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 @@ bool HalPolicy::ConvertMaximum(const Operation& operation, const Model& model, C return ::ConvertMaximum(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(operation, model, data, reduceOperation); + ALOGV("hal_1_2::HalPolicy::ConvertMean()"); + return ::ConvertMean(operation, model, data); } bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data) @@ -361,6 +360,15 @@ bool HalPolicy::ConvertQuantized16BitLstm(const Operation& operation, const Mode return ::ConvertQuantized16BitLstm(operation, model, data); } +bool HalPolicy::ConvertReduce(const Operation& operation, + const Model& model, + ConversionData& data, + ReduceOperation reduceOperation) +{ + ALOGV("hal_1_2::HalPolicy::ConvertReduce()"); + return ::ConvertReduce(operation, model, data, reduceOperation); +} + bool HalPolicy::ConvertReLu(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_2::HalPolicy::ConvertReLu()"); diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp index feb2ba20..abd60e72 100644 --- a/1.2/HalPolicy.hpp +++ b/1.2/HalPolicy.hpp @@ -98,8 +98,7 @@ private: static bool ConvertMaximum(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertReduce(const Operation& operation, const Model& model, ConversionData& data, - ReduceOperation reduce_operation); + static bool ConvertMean(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data); @@ -115,6 +114,11 @@ private: static bool ConvertQuantized16BitLstm(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertReduce(const Operation& operation, + const Model& model, + ConversionData& data, + ReduceOperation reduce_operation); + static bool ConvertReLu(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertReLu1(const Operation& operation, const Model& model, ConversionData& data); diff --git a/1.3/HalPolicy.cpp b/1.3/HalPolicy.cpp index 9a9f2ac0..d58ac6c6 100644 --- a/1.3/HalPolicy.cpp +++ b/1.3/HalPolicy.cpp @@ -98,7 +98,7 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, 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 @@ bool HalPolicy::ConvertMaximum(const Operation& operation, const Model& model, C return ::ConvertMaximum(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(operation, model, data, reduceOperation); + ALOGV("hal_1_3::HalPolicy::ConvertMean()"); + return ::ConvertMean(operation, model, data); } bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data) @@ -426,6 +425,15 @@ bool HalPolicy::ConvertRank(const Operation& operation, const Model& model, Conv return ::ConvertRank(operation, model, data); } +bool HalPolicy::ConvertReduce(const Operation& operation, + const Model& model, + ConversionData& data, + ReduceOperation reduceOperation) +{ + ALOGV("hal_1_3::HalPolicy::ConvertReduce()"); + return ::ConvertReduce(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 1337bf20..6dfb8856 100644 --- a/1.3/HalPolicy.hpp +++ b/1.3/HalPolicy.hpp @@ -110,8 +110,7 @@ private: 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 @@ private: 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); -- cgit v1.2.1