From 63001acdefa6c62b5e8b08ceda529bc119483c5a Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Mon, 18 Jan 2021 14:20:27 +0000 Subject: Rename functions/classes for elementwise operations * Create CpuElementwise operator * Rename kernel classes * Make the kernels stateless Partially implements: COMPMID-4003 Change-Id: I4ef9c61a3acc3ac5dbe46463d62dcb88a5face21 Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4881 Tested-by: Arm Jenkins Reviewed-by: Sheri Zhang Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins --- .../NEON/functions/NEElementwiseOperators.cpp | 429 --------------------- 1 file changed, 429 deletions(-) delete mode 100644 src/runtime/NEON/functions/NEElementwiseOperators.cpp (limited to 'src/runtime/NEON/functions/NEElementwiseOperators.cpp') diff --git a/src/runtime/NEON/functions/NEElementwiseOperators.cpp b/src/runtime/NEON/functions/NEElementwiseOperators.cpp deleted file mode 100644 index badcf2e997..0000000000 --- a/src/runtime/NEON/functions/NEElementwiseOperators.cpp +++ /dev/null @@ -1,429 +0,0 @@ -/* - * Copyright (c) 2018-2020 Arm Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#include "arm_compute/core/Validate.h" -#include "arm_compute/runtime/NEON/functions/NEElementwiseOperations.h" -#include - -#include "arm_compute/core/ITensor.h" - -#include - -namespace arm_compute -{ -namespace experimental -{ -void NEElementwiseMax::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(ArithmeticOperation::MAX, input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwiseMax::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEArithmeticOperationKernel::validate(ArithmeticOperation::MAX, input1, input2, output); -} - -void NEElementwiseMin::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(ArithmeticOperation::MIN, input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwiseMin::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEArithmeticOperationKernel::validate(ArithmeticOperation::MIN, input1, input2, output); -} - -void NEElementwiseSquaredDiff::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(ArithmeticOperation::SQUARED_DIFF, input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwiseSquaredDiff::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEArithmeticOperationKernel::validate(ArithmeticOperation::SQUARED_DIFF, input1, input2, output); -} - -void NEElementwiseDivision::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwiseDivision::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEDivisionOperationKernel::validate(input1, input2, output); -} - -void NEElementwisePower::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwisePower::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEPowerOperationKernel::validate(input1, input2, output); -} - -template -void NEElementwiseComparisonStatic::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output) -{ - auto k = std::make_unique(); - k->configure(COP, input1, input2, output); - _kernel = std::move(k); -} - -template -Status NEElementwiseComparisonStatic::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return NEComparisonOperationKernel::validate(COP, input1, input2, output); -} - -void NEElementwiseComparison::configure(const ITensorInfo *input1, const ITensorInfo *input2, ITensorInfo *output, ComparisonOperation op) -{ - auto k = std::make_unique(); - k->configure(op, input1, input2, output); - _kernel = std::move(k); -} - -Status NEElementwiseComparison::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, ComparisonOperation op) -{ - return NEComparisonOperationKernel::validate(op, input1, input2, output); -} - -// Supported Specializations -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -} // namespace experimental - -struct NEElementwiseMax::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwiseMax::NEElementwiseMax() - : _impl(std::make_unique()) -{ -} -NEElementwiseMax::NEElementwiseMax(NEElementwiseMax &&) = default; -NEElementwiseMax &NEElementwiseMax::operator=(NEElementwiseMax &&) = default; -NEElementwiseMax::~NEElementwiseMax() = default; - -void NEElementwiseMax::configure(ITensor *input1, ITensor *input2, ITensor *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_UNUSED(act_info); - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -Status NEElementwiseMax::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - return experimental::NEElementwiseMax::validate(input1, input2, output); -} - -void NEElementwiseMax::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -struct NEElementwiseMin::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwiseMin::NEElementwiseMin() - : _impl(std::make_unique()) -{ -} -NEElementwiseMin::NEElementwiseMin(NEElementwiseMin &&) = default; -NEElementwiseMin &NEElementwiseMin::operator=(NEElementwiseMin &&) = default; -NEElementwiseMin::~NEElementwiseMin() = default; - -void NEElementwiseMin::configure(ITensor *input1, ITensor *input2, ITensor *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_UNUSED(act_info); - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -Status NEElementwiseMin::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - return experimental::NEElementwiseMin::validate(input1, input2, output); -} - -void NEElementwiseMin::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -struct NEElementwiseSquaredDiff::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwiseSquaredDiff::NEElementwiseSquaredDiff() - : _impl(std::make_unique()) -{ -} -NEElementwiseSquaredDiff::NEElementwiseSquaredDiff(NEElementwiseSquaredDiff &&) = default; -NEElementwiseSquaredDiff &NEElementwiseSquaredDiff::operator=(NEElementwiseSquaredDiff &&) = default; -NEElementwiseSquaredDiff::~NEElementwiseSquaredDiff() = default; - -void NEElementwiseSquaredDiff::configure(ITensor *input1, ITensor *input2, ITensor *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_UNUSED(act_info); - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -Status NEElementwiseSquaredDiff::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - return experimental::NEElementwiseSquaredDiff::validate(input1, input2, output); -} - -void NEElementwiseSquaredDiff::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -struct NEElementwiseDivision::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwiseDivision::NEElementwiseDivision() - : _impl(std::make_unique()) -{ -} -NEElementwiseDivision::NEElementwiseDivision(NEElementwiseDivision &&) = default; -NEElementwiseDivision &NEElementwiseDivision::operator=(NEElementwiseDivision &&) = default; -NEElementwiseDivision::~NEElementwiseDivision() = default; - -void NEElementwiseDivision::configure(ITensor *input1, ITensor *input2, ITensor *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_UNUSED(act_info); - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -Status NEElementwiseDivision::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - return experimental::NEElementwiseDivision::validate(input1, input2, output); -} - -void NEElementwiseDivision::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -struct NEElementwisePower::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwisePower::NEElementwisePower() - : _impl(std::make_unique()) -{ -} -NEElementwisePower::NEElementwisePower(NEElementwisePower &&) = default; -NEElementwisePower &NEElementwisePower::operator=(NEElementwisePower &&) = default; -NEElementwisePower::~NEElementwisePower() = default; - -void NEElementwisePower::configure(ITensor *input1, ITensor *input2, ITensor *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_UNUSED(act_info); - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -Status NEElementwisePower::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, const ActivationLayerInfo &act_info) -{ - ARM_COMPUTE_RETURN_ERROR_ON(act_info.enabled()); - return experimental::NEElementwisePower::validate(input1, input2, output); -} - -void NEElementwisePower::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -template -struct NEElementwiseComparisonStatic::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr> op{ nullptr }; -}; - -template -NEElementwiseComparisonStatic::NEElementwiseComparisonStatic() - : _impl(std::make_unique()) -{ -} -template -NEElementwiseComparisonStatic::NEElementwiseComparisonStatic(NEElementwiseComparisonStatic &&) = default; -template -NEElementwiseComparisonStatic &NEElementwiseComparisonStatic::operator=(NEElementwiseComparisonStatic &&) = default; -template -NEElementwiseComparisonStatic::~NEElementwiseComparisonStatic() = default; - -template -void NEElementwiseComparisonStatic::configure(ITensor *input1, ITensor *input2, ITensor *output) -{ - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique>(); - _impl->op->configure(input1->info(), input2->info(), output->info()); -} - -template -Status NEElementwiseComparisonStatic::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output) -{ - return experimental::NEElementwiseComparisonStatic::validate(input1, input2, output); -} - -template -void NEElementwiseComparisonStatic::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -struct NEElementwiseComparison::Impl -{ - const ITensor *src_0{ nullptr }; - const ITensor *src_1{ nullptr }; - ITensor *dst{ nullptr }; - std::unique_ptr op{ nullptr }; -}; - -NEElementwiseComparison::NEElementwiseComparison() - : _impl(std::make_unique()) -{ -} -NEElementwiseComparison::NEElementwiseComparison(NEElementwiseComparison &&) = default; -NEElementwiseComparison &NEElementwiseComparison::operator=(NEElementwiseComparison &&) = default; -NEElementwiseComparison::~NEElementwiseComparison() = default; - -void NEElementwiseComparison::configure(ITensor *input1, ITensor *input2, ITensor *output, ComparisonOperation op) -{ - _impl->src_0 = input1; - _impl->src_1 = input2; - _impl->dst = output; - _impl->op = std::make_unique(); - _impl->op->configure(input1->info(), input2->info(), output->info(), op); -} - -Status NEElementwiseComparison::validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output, ComparisonOperation op) -{ - return experimental::NEElementwiseComparison::validate(input1, input2, output, op); -} - -void NEElementwiseComparison::run() -{ - ITensorPack pack; - pack.add_tensor(TensorType::ACL_SRC_0, _impl->src_0); - pack.add_tensor(TensorType::ACL_SRC_1, _impl->src_1); - pack.add_tensor(TensorType::ACL_DST, _impl->dst); - _impl->op->run(pack); -} - -// Supported Specializations -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -template class NEElementwiseComparisonStatic; -} // namespace arm_compute -- cgit v1.2.1