diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-22 12:11:20 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2020-07-24 13:36:11 +0000 |
commit | 09cad7253cc75f67bf428ceef196cfbec7f8c357 (patch) | |
tree | c60bd15e82c1e01fa688bfb8ddb426fc7be419c9 /src/runtime/CL/functions/CLActivationLayer.cpp | |
parent | 318c9f40770b2d1c06f8c0fe3f7929812503733e (diff) | |
download | ComputeLibrary-09cad7253cc75f67bf428ceef196cfbec7f8c357.tar.gz |
COMPMID-3393: Minor tweaks on memory injection interface
* Avoid the need to overload workspace() everytime
* Remove the Layer suffix from the operators
* Clean interface by removing default arguments when unsupported
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I7710ecd485cae13e9c2d45216debbd8103bc5a0f
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3610
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/CL/functions/CLActivationLayer.cpp')
-rw-r--r-- | src/runtime/CL/functions/CLActivationLayer.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/runtime/CL/functions/CLActivationLayer.cpp b/src/runtime/CL/functions/CLActivationLayer.cpp index 640841e1d5..784473d426 100644 --- a/src/runtime/CL/functions/CLActivationLayer.cpp +++ b/src/runtime/CL/functions/CLActivationLayer.cpp @@ -33,30 +33,25 @@ namespace arm_compute { namespace experimental { -void CLActivationLayer::configure(const CLCompileContext &compile_context, ITensorInfo *input, ITensorInfo *output, ActivationLayerInfo act_info) +void CLActivation::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) +Status CLActivation::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 }; + const ICLTensor *src{ nullptr }; + ICLTensor *dst{ nullptr }; + CLRuntimeContext *ctx{ nullptr }; + std::unique_ptr<experimental::CLActivation> op{ nullptr }; }; CLActivationLayer::CLActivationLayer(CLRuntimeContext *ctx) @@ -83,13 +78,13 @@ void CLActivationLayer::configure(const CLCompileContext &compile_context, ICLTe _impl->src = input; _impl->dst = output == nullptr ? input : output; - _impl->op = arm_compute::support::cpp14::make_unique<experimental::CLActivationLayer>(); + _impl->op = arm_compute::support::cpp14::make_unique<experimental::CLActivation>(); _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 experimental::CLActivationLayer::validate(input, output, act_info); + return experimental::CLActivation::validate(input, output, act_info); } void CLActivationLayer::run() |