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/CLConcatenateLayer.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/CLConcatenateLayer.cpp')
-rw-r--r-- | src/runtime/CL/functions/CLConcatenateLayer.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/runtime/CL/functions/CLConcatenateLayer.cpp b/src/runtime/CL/functions/CLConcatenateLayer.cpp index 06903d2ff2..1ddda021bc 100644 --- a/src/runtime/CL/functions/CLConcatenateLayer.cpp +++ b/src/runtime/CL/functions/CLConcatenateLayer.cpp @@ -42,14 +42,14 @@ namespace arm_compute { namespace experimental { -CLConcatenateLayer::CLConcatenateLayer() +CLConcatenation::CLConcatenation() : _concat_kernels(), _num_inputs(0), _axis(Window::DimX) { } -void CLConcatenateLayer::configure(const CLCompileContext &compile_context, const std::vector<ITensorInfo *> &inputs_vector, ITensorInfo *output, size_t axis) +void CLConcatenation::configure(const CLCompileContext &compile_context, const std::vector<ITensorInfo *> &inputs_vector, ITensorInfo *output, size_t axis) { ARM_COMPUTE_ERROR_ON(output == nullptr); _axis = axis; @@ -143,7 +143,7 @@ void CLConcatenateLayer::configure(const CLCompileContext &compile_context, cons } } -Status CLConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) +Status CLConcatenation::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) { ARM_COMPUTE_RETURN_ERROR_ON(output == nullptr); const unsigned int num_inputs = inputs_vector.size(); @@ -220,12 +220,7 @@ Status CLConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inpu return Status{}; } -MemoryRequirements CLConcatenateLayer::workspace() const -{ - return MemoryRequirements{}; -} - -void CLConcatenateLayer::run(InputTensorMap inputs, OutputTensorMap outputs, OperatorTensorMap workspace) +void CLConcatenation::run(InputTensorMap inputs, OutputTensorMap outputs, OperatorTensorMap workspace) { ARM_COMPUTE_UNUSED(workspace); @@ -259,11 +254,11 @@ void CLConcatenateLayer::run(InputTensorMap inputs, OutputTensorMap outputs, Ope struct CLConcatenateLayer::Impl { - std::vector<const ICLTensor *> srcs{}; - ICLTensor *dst{ nullptr }; - unsigned int num_inputs{ 0 }; - unsigned int axis{ 0 }; - std::unique_ptr<experimental::CLConcatenateLayer> op{ nullptr }; + std::vector<const ICLTensor *> srcs{}; + ICLTensor *dst{ nullptr }; + unsigned int num_inputs{ 0 }; + unsigned int axis{ 0 }; + std::unique_ptr<experimental::CLConcatenation> op{ nullptr }; }; CLConcatenateLayer::CLConcatenateLayer() @@ -290,7 +285,7 @@ void CLConcatenateLayer::configure(const CLCompileContext &compile_context, std: _impl->dst = output; _impl->axis = axis; _impl->num_inputs = inputs_vector.size(); - _impl->op = arm_compute::support::cpp14::make_unique<experimental::CLConcatenateLayer>(); + _impl->op = arm_compute::support::cpp14::make_unique<experimental::CLConcatenation>(); std::vector<ITensorInfo *> inputs_vector_info; for(unsigned int i = 0; i < inputs_vector.size(); ++i) @@ -303,7 +298,7 @@ void CLConcatenateLayer::configure(const CLCompileContext &compile_context, std: Status CLConcatenateLayer::validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis) { - return experimental::CLConcatenateLayer::validate(inputs_vector, output, axis); + return experimental::CLConcatenation::validate(inputs_vector, output, axis); } void CLConcatenateLayer::run() |