diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-05-17 18:14:40 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-05-21 11:28:01 +0000 |
commit | 09f24975437e2e141ba51a07055a9372b0d173a2 (patch) | |
tree | fe565e4b9abd379cb1f467e5d9e36d68fcfbacef /arm_compute/runtime/NEON/functions/NEConcatenateLayer.h | |
parent | f24411ffc842970609a1fb6ba2f9527cfb681dbd (diff) | |
download | ComputeLibrary-09f24975437e2e141ba51a07055a9372b0d173a2.tar.gz |
COMPMID-2109: Remove CL/NE Width/Depth ConcatenateLayer functions.
Change-Id: Icbda771abffbb45d4ed0958933c60ff9ace01314
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1178
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON/functions/NEConcatenateLayer.h')
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEConcatenateLayer.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h index f8cda326d2..8c97efc4f0 100644 --- a/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h +++ b/arm_compute/runtime/NEON/functions/NEConcatenateLayer.h @@ -26,8 +26,9 @@ #include "arm_compute/runtime/IFunction.h" -#include "arm_compute/core/NEON/kernels/NEHeightConcatenateLayerKernel.h" +#include "arm_compute/core/NEON/INEKernel.h" #include "arm_compute/core/Types.h" +#include "arm_compute/core/utils/misc/Requires.h" #include <memory> #include <vector> @@ -41,9 +42,9 @@ class Status; /** Basic function to execute concatenate tensors along a given axis. This function calls the following kernels: * - * -# @ref NEWidthConcatenateLayer (if underlying concatenation axis is 0). + * -# @ref NEWidthConcatenateLayerKernel (if underlying concatenation axis is 0). * -# @ref NEHeightConcatenateLayerKernel (if underlying concatenation axis is 1). - * -# @ref NEDepthConcatenateLayer (if underlying concatenation axis is 2). + * -# @ref NEDepthConcatenateLayerKernel (if underlying concatenation axis is 2). */ class NEConcatenateLayer : public IFunction { @@ -53,17 +54,18 @@ public: /** Initialise the kernel's inputs vector and output. * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref NEWidthConcatenateLayer, @ref NEHeightConcatenateLayerKernel and @ref NEDepthConcatenateLayer. + * @note Preconditions can be found respectively at @ref NEWidthConcatenateLayerKernel, @ref NEHeightConcatenateLayerKernel and @ref NEDepthConcatenateLayerKernel. * * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/F16/F32. * @param[out] output Output tensor. Data types supported: Same as @p input. * @param[in] axis Concatenation axis. Supported underlying concatenation axis are 0, 1 and 2. */ - void configure(const std::vector<ITensor *> &inputs_vector, ITensor *output, size_t axis); + void configure(std::vector<ITensor *> inputs_vector, ITensor *output, size_t axis); + void configure(std::vector<const ITensor *> inputs_vector, ITensor *output, size_t axis); /** Static function to check if given info will lead to a valid configuration of @ref NEConcatenateLayer * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref NEWidthConcatenateLayer, @ref NEHeightConcatenateLayerKernel and @ref NEDepthConcatenateLayer. + * @note Preconditions can be found respectively at @ref NEWidthConcatenateLayerKernel, @ref NEHeightConcatenateLayerKernel and @ref NEDepthConcatenateLayerKernel. * * @param[in] inputs_vector The vectors containing all the tensors info to concatenate. Data types supported: QASYMM8/F16/F32. * @param[in] output Output tensor info. Data types supported: Same as @p input. @@ -72,11 +74,19 @@ public: * @return a status */ static Status validate(const std::vector<ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis); + static Status validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis); // Inherited methods overridden: void run() override; private: + template <typename TensorType, REQUIRES_TA(std::is_same<typename std::remove_cv<TensorType>::type, ITensor>::value)> + void configure_internal(std::vector<TensorType *> &&inputs_vector, ITensor *output, size_t axis); + + template <typename TensorInfoType, REQUIRES_TA(std::is_same<typename std::remove_cv<TensorInfoType>::type, ITensorInfo>::value)> + static Status validate_internal(const std::vector<TensorInfoType *> &inputs_vector, const ITensorInfo *output, size_t axis); + +private: std::vector<std::unique_ptr<INEKernel>> _concat_kernels; unsigned int _num_inputs; unsigned int _axis; |