diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-04-05 11:29:52 +0100 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-04-08 13:49:12 +0000 |
| commit | 8c571692a8236be8605a753e231d240094428be5 (patch) | |
| tree | abb38e31254373fcf4c2c77d5c03073073d92c13 /arm_compute | |
| parent | da953f2e17b401ff595ac88008cd5e90440ebf74 (diff) | |
| download | ComputeLibrary-8c571692a8236be8605a753e231d240094428be5.tar.gz | |
COMPMID-2062 Rework CL ConcatenateLayer
Change-Id: I5a60cd0e822b8912132a6785057921bbf6ef8f7f
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/951
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'arm_compute')
3 files changed, 9 insertions, 9 deletions
diff --git a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h index 25a0153f51..5cf09c8ee0 100644 --- a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h +++ b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h @@ -77,13 +77,9 @@ public: void run() override; private: - void configure_h_concatenate(std::vector<ICLTensor *> inputs_vector, ICLTensor *output); - static Status validate_h_concatenate(const std::vector<ITensorInfo *> &inputs_vector, const ITensorInfo *output); - - std::unique_ptr<IFunction> _concat_function; - std::unique_ptr<CLHeightConcatenateLayerKernel[]> _hconcat_kernels; - unsigned int _num_inputs; - unsigned int _axis; + std::vector<std::unique_ptr<ICLKernel>> _concat_kernels; + unsigned int _num_inputs; + unsigned int _axis; }; } #endif /* __ARM_COMPUTE_CLCONCATENATELAYER_H__ */ diff --git a/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h index aef5d63654..33f751f6db 100644 --- a/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h +++ b/arm_compute/runtime/CL/functions/CLDepthConcatenateLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -41,6 +41,8 @@ class ICLTensor; /** Basic function to execute concatenate tensors along z axis. This function calls the following kernels: * + * @deprecated This function is deprecated and will be removed in release 19.08 + * * -# @ref CLFillBorderKernel (executed if input's lowest two dimensions are smaller than respective output's dimensions) * -# @ref CLDepthConcatenateLayerKernel * diff --git a/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h index 55b65dadc4..a87ec3094c 100644 --- a/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h +++ b/arm_compute/runtime/CL/functions/CLWidthConcatenateLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -42,6 +42,8 @@ class ICLTensor; /** Basic function to execute concatenate tensors along x axis. This function calls the following kernel: * + * @deprecated This function is deprecated and will be removed in release 19.08 + * * -# @ref CLWidthConcatenateLayerKernel * -# @ref CLWidthConcatenate2TensorsKernel (if there are exactly 2 input tensors) * -# @ref CLWidthConcatenate4TensorsKernel (if there are exactly 4 input tensors) |