diff options
Diffstat (limited to 'src/runtime/NEON/functions/NEActivationLayer.cpp')
-rw-r--r-- | src/runtime/NEON/functions/NEActivationLayer.cpp | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/src/runtime/NEON/functions/NEActivationLayer.cpp b/src/runtime/NEON/functions/NEActivationLayer.cpp index f9ad298e4d..59199452ce 100644 --- a/src/runtime/NEON/functions/NEActivationLayer.cpp +++ b/src/runtime/NEON/functions/NEActivationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -23,66 +23,43 @@ */ #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" -#include "arm_compute/core/Error.h" -#include "arm_compute/core/experimental/Types.h" -#include "arm_compute/runtime/IRuntimeContext.h" -#include "arm_compute/runtime/Tensor.h" -#include "src/core/NEON/kernels/NEActivationLayerKernel.h" -#include "support/MemorySupport.h" +#include "arm_compute/core/Validate.h" -namespace arm_compute -{ -namespace experimental -{ -NEActivationLayer::~NEActivationLayer() = default; +#include "src/cpu/operators/CpuActivation.h" -void NEActivationLayer::configure(const ITensorInfo *input, ITensorInfo *output, const ActivationLayerInfo &activation_info) -{ - auto k = arm_compute::support::cpp14::make_unique<NEActivationLayerKernel>(); - k->configure(input, output, activation_info); - _kernel = std::move(k); -} - -Status NEActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &activation_info) +namespace arm_compute { - return NEActivationLayerKernel::validate(input, output, activation_info); -} -} // namespace experimental - struct NEActivationLayer::Impl { - const ITensor *src{ nullptr }; - ITensor *dst{ nullptr }; - IRuntimeContext *ctx{ nullptr }; - std::unique_ptr<experimental::NEActivationLayer> op{ nullptr }; + const ITensor *src{nullptr}; + ITensor *dst{nullptr}; + IRuntimeContext *ctx{nullptr}; + std::unique_ptr<cpu::CpuActivation> op{nullptr}; }; -NEActivationLayer::NEActivationLayer(IRuntimeContext *ctx) - : _impl(support::cpp14::make_unique<Impl>()) +NEActivationLayer::NEActivationLayer(IRuntimeContext *ctx) : _impl(std::make_unique<Impl>()) { _impl->ctx = ctx; } - -NEActivationLayer::NEActivationLayer(NEActivationLayer &&) = default; - +NEActivationLayer::NEActivationLayer(NEActivationLayer &&) = default; NEActivationLayer &NEActivationLayer::operator=(NEActivationLayer &&) = default; - -NEActivationLayer::~NEActivationLayer() = default; +NEActivationLayer::~NEActivationLayer() = default; void NEActivationLayer::configure(ITensor *input, ITensor *output, ActivationLayerInfo activation_info) { - ARM_COMPUTE_ERROR_ON_NULLPTR(input); - _impl->src = input; _impl->dst = output == nullptr ? input : output; - _impl->op = arm_compute::support::cpp14::make_unique<experimental::NEActivationLayer>(); + ARM_COMPUTE_ERROR_ON_NULLPTR(_impl->src, _impl->dst); + + _impl->op = std::make_unique<cpu::CpuActivation>(); _impl->op->configure(_impl->src->info(), _impl->dst->info(), activation_info); } -Status NEActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info) +Status +NEActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info) { - return experimental::NEActivationLayer::validate(input, output, act_info); + return cpu::CpuActivation::validate(input, output, act_info); } void NEActivationLayer::run() |