diff options
| author | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-04-03 19:48:54 +0100 |
|---|---|---|
| committer | Michalis Spyrou <michalis.spyrou@arm.com> | 2019-04-05 10:24:49 +0000 |
| commit | 9f15c5e838085294ce391d3bdcf5ec7752650ea8 (patch) | |
| tree | c3abb2d06998ffb0a1bf3cb7da52359d6c2d562d /arm_compute | |
| parent | 7191aaa184992ca1fa8bdbbe5a9d8f9cd093ad5b (diff) | |
| download | ComputeLibrary-9f15c5e838085294ce391d3bdcf5ec7752650ea8.tar.gz | |
COMPMID-2062 Rework NEON ConcatenateLayer
Change-Id: I2703c99f651e4f06c4e44e39a85a8a8d201c5362
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/944
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, 8 insertions, 8 deletions
diff --git a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h index b70d6ebc7c..7dfbcf9199 100644 --- a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h +++ b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h @@ -77,13 +77,9 @@ public: void run() override; private: - void configure_h_concatenate(std::vector<ITensor *> inputs_vector, ITensor *output); - static Status validate_h_concatenate(const std::vector<ITensorInfo *> &inputs_vector, const ITensorInfo *output); - - std::unique_ptr<IFunction> _concat_function; - std::unique_ptr<NEHeightConcatenateLayerKernel[]> _hconcat_kernels; - unsigned int _num_inputs; - unsigned int _axis; + std::vector<std::unique_ptr<INEKernel>> _concat_kernels; + unsigned int _num_inputs; + unsigned int _axis; }; } // namespace arm_compute #endif /* __ARM_COMPUTE_NECONCATENATELAYER_H__ */ diff --git a/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h index e2162ef042..da38151e73 100644 --- a/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.h +++ b/arm_compute/runtime/NEON/functions/NEDepthConcatenateLayer.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 ITensor; * -# @ref NEFillBorderKernel (executed if input's lowest two dimensions are smaller than respective output's dimensions) * -# @ref NEDepthConcatenateLayerKernel * + * @deprecated This function is deprecated and will be removed in release 19.08 + * */ class NEDepthConcatenateLayer : public IFunction { diff --git a/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h index 70a81b2788..0aaba7987f 100644 --- a/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h +++ b/arm_compute/runtime/NEON/functions/NEWidthConcatenateLayer.h @@ -44,6 +44,8 @@ class ITensor; /** Basic function to execute concatenate tensors along x axis. This function calls the following kernel: * * -# @ref NEWidthConcatenateLayerKernel + * + * @deprecated This function is deprecated and will be removed in release 19.08 */ class NEWidthConcatenateLayer : public IFunction { |