diff options
Diffstat (limited to '1.2')
-rw-r--r-- | 1.2/HalPolicy.cpp | 18 | ||||
-rw-r--r-- | 1.2/HalPolicy.hpp | 8 |
2 files changed, 19 insertions, 7 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()"); 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); |