diff options
Diffstat (limited to 'arm_compute/runtime/CL/functions/CLConcatenateLayer.h')
-rw-r--r-- | arm_compute/runtime/CL/functions/CLConcatenateLayer.h | 97 |
1 files changed, 32 insertions, 65 deletions
diff --git a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h index 5e7003a112..88c4bed595 100644 --- a/arm_compute/runtime/CL/functions/CLConcatenateLayer.h +++ b/arm_compute/runtime/CL/functions/CLConcatenateLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,10 +24,8 @@ #ifndef ARM_COMPUTE_CLCONCATENATELAYER_H #define ARM_COMPUTE_CLCONCATENATELAYER_H -#include "arm_compute/runtime/CL/ICLOperator.h" -#include "arm_compute/runtime/IFunction.h" - #include "arm_compute/core/Types.h" +#include "arm_compute/runtime/IFunction.h" #include <memory> #include <vector> @@ -43,10 +41,10 @@ class Status; /** Basic function to execute concatenate tensors along a given axis. This function calls the following kernels: * - * -# @ref CLWidthConcatenateLayerKernel (if underlying concatenation axis is 0). - * -# @ref CLHeightConcatenateLayerKernel (if underlying concatenation axis is 1). - * -# @ref CLDepthConcatenateLayerKernel (if underlying concatenation axis is 2). - * -# @ref CLBatchConcatenateLayerKernel (if underlying concatenation axis is 3). + * -# @ref opencl::kernels::ClWidthConcatenateKernel (if underlying concatenation axis is 0). + * -# @ref opencl::kernels::ClHeightConcatenateKernel (if underlying concatenation axis is 1). + * -# @ref opencl::kernels::ClDepthConcatenateKernel (if underlying concatenation axis is 2). + * -# @ref opencl::kernels::ClBatchConcatenateKernel (if underlying concatenation axis is 3). */ class CLConcatenateLayer : public IFunction { @@ -65,10 +63,22 @@ public: CLConcatenateLayer &operator=(CLConcatenateLayer &&); /** Initialise the kernel's inputs vector and output. * + * Valid data layouts: + * - All + * + * Valid data type configurations: + * |src |dst | + * |:--------------|:--------------| + * |QASYMM8 |QASYMM8 | + * |QASYMM8_SIGNED |QASYMM8_SIGNED | + * |F16 |F16 | + * |F32 |F32 | + * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. + * @note Preconditions can be found respectively at @ref opencl::kernels::ClWidthConcatenateKernel, + * @ref opencl::kernels::ClHeightConcatenateKernel and @ref opencl::kernels::ClDepthConcatenateKernel. * - * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: All + * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/QASYMM8_SIGNED/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, 2 and 3. */ @@ -76,26 +86,32 @@ 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 CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. + * @note Preconditions can be found respectively at @ref opencl::kernels::ClWidthConcatenateKernel, + * @ref opencl::kernels::ClHeightConcatenateKernel and @ref opencl::kernels::ClDepthConcatenateKernel. * * @param[in] compile_context The compile context to be used. - * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: All + * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: QASYMM8/QASYMM8_SIGNED/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, 2 and 3. */ - void configure(const CLCompileContext &compile_context, std::vector<const ICLTensor *> &inputs_vector, ICLTensor *output, size_t axis); + void configure(const CLCompileContext &compile_context, + std::vector<const ICLTensor *> &inputs_vector, + ICLTensor *output, + size_t axis); /** Static function to check if given info will lead to a valid configuration of @ref CLConcatenateLayer * * @note Input and output tensor dimensions preconditions defer depending on the concatenation axis. - * @note Preconditions can be found respectively at @ref CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. + * @note Preconditions can be found respectively at @ref opencl::kernels::ClWidthConcatenateKernel, + * @ref opencl::kernels::ClHeightConcatenateKernel and @ref opencl::kernels::ClDepthConcatenateKernel. * - * @param[in] inputs_vector The vectors containing all the tensors info to concatenate. Data types supported: All. + * @param[in] inputs_vector The vectors containing all the tensors info to concatenate. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32. * @param[in] output Output tensor info. Data types supported: Same as @p input. * @param[in] axis Concatenation axis. Supported underlying concatenation axis are 0, 1, 2 and 3. * * @return a status */ - static Status validate(const std::vector<const 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; @@ -104,54 +120,5 @@ private: struct Impl; std::unique_ptr<Impl> _impl; }; - -namespace experimental -{ -/** Basic function to execute concatenate tensors along a given axis. This function calls the following kernels: - * - * -# @ref CLWidthConcatenateLayerKernel (if underlying concatenation axis is 0). - * -# @ref CLHeightConcatenateLayerKernel (if underlying concatenation axis is 1). - * -# @ref CLDepthConcatenateLayerKernel (if underlying concatenation axis is 2). - * -# @ref CLBatchConcatenateLayerKernel (if underlying concatenation axis is 3). - */ -class CLConcatenation : public ICLOperator -{ -public: - /** Default constructor */ - CLConcatenation(); - /** 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 CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. - * - * - * @param[in] compile_context The compile context to be used. - * @param[in,out] inputs_vector The vectors containing all the tensors to concatenate. Data types supported: All - * @param[out] output Output tensor. Data types supported: Same as @p input. - * @param[in] axis Concatenation axis. Supported underlying concatenation axis are 0, 1, 2 and 3. - */ - void configure(const CLCompileContext &compile_context, const std::vector<ITensorInfo *> &inputs_vector, ITensorInfo *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 CLWidthConcatenateLayerKernel, @ref CLHeightConcatenateLayerKernel and @ref CLDepthConcatenateLayerKernel. - * - * @param[in] inputs_vector The vectors containing all the tensors info to concatenate. Data types supported: All - * @param[in] output Output tensor info. Data types supported: Same as @p input. - * @param[in] axis Concatenation axis. Supported underlying concatenation axis are 0, 1, 2 and 3. - * - * @return a status - */ - static Status validate(const std::vector<const ITensorInfo *> &inputs_vector, const ITensorInfo *output, size_t axis); - - // Inherited methods overridden: - void run(ITensorPack &tensors) override; - -private: - std::vector<std::unique_ptr<ICLKernel>> _concat_kernels; - unsigned int _num_inputs; - unsigned int _axis; -}; -} // namespace experimental } // namespace arm_compute #endif /* ARM_COMPUTE_CLCONCATENATELAYER_H */ |