From ee5872d95455351458ad4373176360200594daa1 Mon Sep 17 00:00:00 2001 From: Teresa Charlin Date: Fri, 3 Dec 2021 16:07:42 +0000 Subject: IVGCVSW-3809 Refactor Elementwise Binary ops to use ElementwiseBinaryLayer !armnn:9319 * Refactored all functions to convert Add, Div, Maximum, Minimum, Mul and Sub to use ElementwiseBinary layers instead. Signed-off-by: Teresa Charlin Signed-off-by: Mike Kelly Change-Id: Ic05885cd8692e7f1b7032862fb4a395af70e0bcd Signed-off-by: Mike Kelly Change-Id: If9717d6ab236d97c76f6cd39b96bde86c81e4382 --- 1.1/HalPolicy.cpp | 21 +++++++++------------ 1.1/HalPolicy.hpp | 9 ++++++--- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to '1.1') diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp index 53a884ca..cd59cd6b 100644 --- a/1.1/HalPolicy.cpp +++ b/1.1/HalPolicy.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2019,2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -80,9 +80,9 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, switch (operation.type) { case V1_1::OperationType::DIV: - return ConvertDiv(operation, model, data); + return ConvertElementwiseBinary(operation, model, data, armnn::BinaryOperation::Div); case V1_1::OperationType::SUB: - return ConvertSub(operation, model, data); + return ConvertElementwiseBinary(operation, model, data, armnn::BinaryOperation::Sub); case V1_1::OperationType::MEAN: return ConvertMean(operation, model, data); case V1_1::OperationType::PAD: @@ -104,16 +104,13 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, } } -bool HalPolicy::ConvertDiv(const Operation& operation, const Model& model, ConversionData& data) +bool HalPolicy::ConvertElementwiseBinary(const Operation& operation, + const Model& model, + ConversionData& data, + armnn::BinaryOperation binaryOperation) { - ALOGV("hal_1_1::HalPolicy::ConvertDiv()"); - return ::ConvertDiv(operation, model, data); -} - -bool HalPolicy::ConvertSub(const Operation& operation, const Model& model, ConversionData& data) -{ - ALOGV("hal_1_1::HalPolicy::ConvertSub()"); - return ::ConvertSub(operation, model, data); + ALOGV("hal_1_1::HalPolicy::ConvertElementwiseBinary()"); + return ::ConvertElementwiseBinary(operation, model, data, binaryOperation); } bool HalPolicy::ConvertMean(const Operation& operation, const Model& model, ConversionData& data) diff --git a/1.1/HalPolicy.hpp b/1.1/HalPolicy.hpp index 18bb705c..e1feb830 100644 --- a/1.1/HalPolicy.hpp +++ b/1.1/HalPolicy.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017-2021,2023 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -31,8 +31,11 @@ public: static bool ConvertOperation(const Operation& operation, const Model& model, ConversionData& data); private: - static bool ConvertDiv(const Operation& operation, const Model& model, ConversionData& data); - static bool ConvertSub(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertElementwiseBinary(const Operation& operation, + const Model& model, + ConversionData& data, + armnn::BinaryOperation binaryOperation); + static bool ConvertMean(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertPad(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data); -- cgit v1.2.1