From 1fd2c80692ed8ecefc4d8deb783564ad19eaf70c Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 16 Jun 2020 17:44:46 +0100 Subject: COMPMID-3375: Port NEActivationLayer functions/kernels to run on different tensors. Signed-off-by: Georgios Pinitas Change-Id: I98782bb73e9dc0899ffb1796aca6f99714adea94 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3343 Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/runtime/NEON/functions/NEActivationLayer.cpp | 61 ++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 5 deletions(-) (limited to 'src/runtime/NEON/functions/NEActivationLayer.cpp') diff --git a/src/runtime/NEON/functions/NEActivationLayer.cpp b/src/runtime/NEON/functions/NEActivationLayer.cpp index e4d1125c79..889ff6b1f4 100644 --- a/src/runtime/NEON/functions/NEActivationLayer.cpp +++ b/src/runtime/NEON/functions/NEActivationLayer.cpp @@ -23,25 +23,76 @@ */ #include "arm_compute/runtime/NEON/functions/NEActivationLayer.h" +#include "arm_compute/core/Error.h" #include "arm_compute/core/NEON/kernels/NEActivationLayerKernel.h" +#include "arm_compute/core/experimental/Types.h" #include "arm_compute/runtime/IRuntimeContext.h" +#include "arm_compute/runtime/Tensor.h" #include "support/MemorySupport.h" namespace arm_compute { -NEActivationLayer::NEActivationLayer(IRuntimeContext *ctx) // NOLINT - : INESimpleFunctionNoBorder(ctx) +namespace experimental { -} -void NEActivationLayer::configure(ITensor *input, ITensor *output, ActivationLayerInfo activation_info) +void NEActivationLayer::configure(const ITensorInfo *input, ITensorInfo *output, const ActivationLayerInfo &activation_info) { auto k = arm_compute::support::cpp14::make_unique(); k->configure(input, output, activation_info); _kernel = std::move(k); } +Status NEActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &activation_info) +{ + return NEActivationLayerKernel::validate(input, output, activation_info); +} + +MemoryRequirements NEActivationLayer::workspace() const +{ + return MemoryRequirements{}; +} +} // namespace experimental + +struct NEActivationLayer::Impl +{ + const ITensor *src{ nullptr }; + ITensor *dst{ nullptr }; + IRuntimeContext *ctx{ nullptr }; + std::unique_ptr op{ nullptr }; +}; + +NEActivationLayer::NEActivationLayer(IRuntimeContext *ctx) + : _impl(support::cpp14::make_unique()) +{ + _impl->ctx = ctx; +} + +NEActivationLayer::NEActivationLayer(NEActivationLayer &&) = default; + +NEActivationLayer &NEActivationLayer::operator=(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(); + _impl->op->configure(_impl->src->info(), _impl->dst->info(), activation_info); +} + Status NEActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info) { - return NEActivationLayerKernel::validate(input, output, act_info); + return experimental::NEActivationLayer::validate(input, output, act_info); +} + +void NEActivationLayer::run() +{ + const InputTensor src{ TensorType::ACL_SRC, _impl->src }; + OutputTensor dst{ TensorType::ACL_DST, _impl->dst }; + + _impl->op->run({ src }, { dst }, {}); } } // namespace arm_compute -- cgit v1.2.1