diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2021-03-12 09:12:29 +0000 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2021-03-12 09:12:29 +0000 |
commit | 6a2845317f9f9e5161f3afab2b54dac494f57f89 (patch) | |
tree | fbaaae4f162b80adc5998d2b77641a80d0bed59e /1.2/HalPolicy.cpp | |
parent | 89cbb3a914d76843630f3576108e309cf085ef80 (diff) | |
download | android-nn-driver-6a2845317f9f9e5161f3afab2b54dac494f57f89.tar.gz |
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
Diffstat (limited to '1.2/HalPolicy.cpp')
-rw-r--r-- | 1.2/HalPolicy.cpp | 18 |
1 files changed, 13 insertions, 5 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<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 @@ bool HalPolicy::ConvertQuantized16BitLstm(const Operation& operation, const Mode 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()"); |