diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-06 14:57:36 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-07 15:07:27 +0000 |
commit | ab23dd0fbc632063235a6ad408241dc79a35d3e4 (patch) | |
tree | 310eda0ec4f48c84ae1f0b520279ee2202bea6e6 /src/runtime/CL/functions/CLActivationLayer.cpp | |
parent | 6eb73458c4869165c88d33c6a745a91cdc73a36a (diff) | |
download | ComputeLibrary-ab23dd0fbc632063235a6ad408241dc79a35d3e4.tar.gz |
COMPMID-3387: Support memory injection in CLActivationLayer
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I31f9620607b372fc3340c71e748a5ea177d9da62
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3520
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLActivationLayer.cpp')
-rw-r--r-- | src/runtime/CL/functions/CLActivationLayer.cpp | 58 |
1 files changed, 53 insertions, 5 deletions
diff --git a/src/runtime/CL/functions/CLActivationLayer.cpp b/src/runtime/CL/functions/CLActivationLayer.cpp index 989603a9df..d6b80200cd 100644 --- a/src/runtime/CL/functions/CLActivationLayer.cpp +++ b/src/runtime/CL/functions/CLActivationLayer.cpp @@ -23,6 +23,7 @@ */ #include "arm_compute/runtime/CL/functions/CLActivationLayer.h" +#include "arm_compute/core/CL/ICLTensor.h" #include "arm_compute/core/CL/kernels/CLActivationLayerKernel.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/CLRuntimeContext.h" @@ -30,11 +31,46 @@ namespace arm_compute { +namespace experimental +{ +void CLActivationLayer::configure(const CLCompileContext &compile_context, ITensorInfo *input, ITensorInfo *output, ActivationLayerInfo act_info) +{ + auto k = arm_compute::support::cpp14::make_unique<CLActivationLayerKernel>(); + k->configure(compile_context, input, output, act_info); + _kernel = std::move(k); +} + +Status CLActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info) +{ + return CLActivationLayerKernel::validate(input, output, act_info); +} + +MemoryRequirements CLActivationLayer::workspace() const +{ + return MemoryRequirements{}; +} +} // namespace experimental + +struct CLActivationLayer::Impl +{ + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + CLRuntimeContext *ctx{ nullptr }; + std::unique_ptr<experimental::CLActivationLayer> op{ nullptr }; +}; + CLActivationLayer::CLActivationLayer(CLRuntimeContext *ctx) - : ICLSimpleFunction(ctx) + : _impl(support::cpp14::make_unique<Impl>()) { + _impl->ctx = ctx; } +CLActivationLayer::CLActivationLayer(CLActivationLayer &&) = default; + +CLActivationLayer &CLActivationLayer::operator=(CLActivationLayer &&) = default; + +CLActivationLayer::~CLActivationLayer() = default; + void CLActivationLayer::configure(ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info) { configure(CLKernelLibrary::get().get_compile_context(), input, output, act_info); @@ -42,13 +78,25 @@ void CLActivationLayer::configure(ICLTensor *input, ICLTensor *output, Activatio void CLActivationLayer::configure(const CLCompileContext &compile_context, ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info) { - auto k = arm_compute::support::cpp14::make_unique<CLActivationLayerKernel>(); - k->configure(compile_context, input, output, act_info); - _kernel = std::move(k); + ARM_COMPUTE_ERROR_ON_NULLPTR(input); + + _impl->src = input; + _impl->dst = output == nullptr ? input : output; + + _impl->op = arm_compute::support::cpp14::make_unique<experimental::CLActivationLayer>(); + _impl->op->configure(compile_context, _impl->src->info(), _impl->dst->info(), act_info); } Status CLActivationLayer::validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info) { - return CLActivationLayerKernel::validate(input, output, act_info); + return experimental::CLActivationLayer::validate(input, output, act_info); +} + +void CLActivationLayer::run() +{ + const InputTensorMap src{ { TensorType::ACL_SRC, _impl->src } }; + const OutputTensorMap dst{ { TensorType::ACL_DST, _impl->dst } }; + + _impl->op->run(src, dst, {}); } } // namespace arm_compute |