From f932d2c8409831cb9cb97a2eb65be93ad4709cd6 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Mon, 6 Jul 2020 11:27:21 +0100 Subject: COMPMID-3386: Support memory injection in CLConcatenate functions/kernels Signed-off-by: Georgios Pinitas Change-Id: I611adf4f506d406540e920b0bd6befb4b5108918 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3601 Tested-by: Arm Jenkins Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins --- .../CL/kernels/CLBatchConcatenateLayerKernel.h | 20 ++++--------------- .../CL/kernels/CLDepthConcatenateLayerKernel.h | 22 ++++----------------- .../CL/kernels/CLHeightConcatenateLayerKernel.h | 21 +++++--------------- .../CL/kernels/CLWidthConcatenate2TensorsKernel.h | 21 ++++---------------- .../CL/kernels/CLWidthConcatenate4TensorsKernel.h | 23 +++------------------- .../CL/kernels/CLWidthConcatenateLayerKernel.h | 19 ++++-------------- 6 files changed, 24 insertions(+), 102 deletions(-) (limited to 'arm_compute/core/CL') diff --git a/arm_compute/core/CL/kernels/CLBatchConcatenateLayerKernel.h b/arm_compute/core/CL/kernels/CLBatchConcatenateLayerKernel.h index 737aa79727..890fecf0c9 100644 --- a/arm_compute/core/CL/kernels/CLBatchConcatenateLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLBatchConcatenateLayerKernel.h @@ -50,17 +50,6 @@ public: CLBatchConcatenateLayerKernel &operator=(CLBatchConcatenateLayerKernel &&) = default; /** Default destructor */ ~CLBatchConcatenateLayerKernel() = default; - /** Initialise the kernel's inputs and output - * - * @param[in] input Input tensor. Data types supported: All. - * @param[in] batch_offset The offset on axis # 3. - * @param[in,out] output Output tensor. Data types supported: Same as @p input. - * - * @note: The output tensor's low two dimensions can't be smaller than the input one's. - * @note: The gaps between the two lowest dimensions of input and output need to be divisible by 2. - * - */ - void configure(const ICLTensor *input, unsigned int batch_offset, ICLTensor *output); /** Initialise the kernel's inputs and output * * @param[in] compile_context The compile context to be used. @@ -72,7 +61,7 @@ public: * @note: The gaps between the two lowest dimensions of input and output need to be divisible by 2. * */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input, unsigned int batch_offset, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input, unsigned int batch_offset, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLBatchConcatenateLayerKernel * * @param[in] input Input tensor info. Data types supported: All. @@ -84,12 +73,11 @@ public: static Status validate(const ITensorInfo *input, unsigned int batch_offset, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; private: - const ICLTensor *_input; - ICLTensor *_output; - unsigned int _batch_offset; + unsigned int _batch_offset; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLBATCHCONCATENATEKERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h index f9a6bb947d..ad365d655b 100644 --- a/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLDepthConcatenateLayerKernel.h @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface for the depth concatenate kernel. * The input tensor will be concatenated into the output tensor. */ @@ -50,17 +48,6 @@ public: CLDepthConcatenateLayerKernel &operator=(CLDepthConcatenateLayerKernel &&) = default; /** Default destructor */ ~CLDepthConcatenateLayerKernel() = default; - /** Initialise the kernel's inputs and output - * - * @param[in] input Input tensor. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32. - * @param[in] depth_offset The offset on the Z axis. - * @param[in,out] output Output tensor. Data types supported: Same as @p input. - * - * @note: The output tensor's low two dimensions can't be smaller than the input one's. - * @note: The gaps between the two lowest dimensions of input and output need to be divisible by 2. - * - */ - void configure(const ICLTensor *input, unsigned int depth_offset, ICLTensor *output); /** Initialise the kernel's inputs and output * * @param[in] compile_context The compile context to be used. @@ -72,7 +59,7 @@ public: * @note: The gaps between the two lowest dimensions of input and output need to be divisible by 2. * */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input, unsigned int depth_offset, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input, unsigned int depth_offset, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLDepthConcatenateLayerKernel * * @param[in] input Input tensor info. Data types supported: QASYMM8/QASYMM8_SIGNED/F16/F32 @@ -84,12 +71,11 @@ public: static Status validate(const ITensorInfo *input, unsigned int depth_offset, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; private: - const ICLTensor *_input; - ICLTensor *_output; - unsigned int _depth_offset; + unsigned int _depth_offset; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLDEPTHCONCATENATEKERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h b/arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h index c1b7d6be77..0563fad414 100644 --- a/arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLHeightConcatenateLayerKernel.h @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface for the height concatenate kernel. * The input tensor will be concatenated into the output tensor. */ @@ -50,14 +48,6 @@ public: CLHeightConcatenateLayerKernel &operator=(CLHeightConcatenateLayerKernel &&) = default; /** Default destructor */ ~CLHeightConcatenateLayerKernel() = default; - /** Initialise the kernel's inputs and output - * - * @param[in] input Input tensor. Data types supported: All. - * @param[in] height_offset The starting offset on the Y axis for the output tensor. - * @param[out] output Output tensor. Data types supported: Same as @p input. - * - */ - void configure(const ICLTensor *input, unsigned int height_offset, ICLTensor *output); /** Initialise the kernel's inputs and output * * @param[in] compile_context The compile context to be used. @@ -66,7 +56,7 @@ public: * @param[out] output Output tensor. Data types supported: Same as @p input. * */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input, unsigned int height_offset, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input, unsigned int height_offset, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLHeightConcatenateLayerKernel * * @param[in] input Input tensor info. Data types supported: All. @@ -78,13 +68,12 @@ public: static Status validate(const ITensorInfo *input, unsigned int height_offset, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; private: - const ICLTensor *_input; - ICLTensor *_output; - unsigned int _height_offset; - unsigned int _num_elems_processed_per_iteration; + unsigned int _height_offset; + unsigned int _num_elems_processed_per_iteration; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLHEIGHTCONCATENATELAYERKERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h b/arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h index e9b3546439..aaedaa90ee 100644 --- a/arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h +++ b/arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.h @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface for the width concatenate kernel of 2 tensors. * The input1 and input2 tensors will be concatenated into the output tensor. */ @@ -39,7 +37,7 @@ class CLWidthConcatenate2TensorsKernel : public ICLKernel { public: /** Default constructor */ - CLWidthConcatenate2TensorsKernel(); + CLWidthConcatenate2TensorsKernel() = default; /** Prevent instances of this class from being copied (As this class contains pointers) */ CLWidthConcatenate2TensorsKernel(const CLWidthConcatenate2TensorsKernel &) = delete; /** Prevent instances of this class from being copied (As this class contains pointers) */ @@ -50,13 +48,6 @@ public: CLWidthConcatenate2TensorsKernel &operator=(CLWidthConcatenate2TensorsKernel &&) = default; /** Default destructor */ ~CLWidthConcatenate2TensorsKernel() = default; - /** Initialise the kernel's input1s and output - * - * @param[in] input1 First input tensor. Data types supported: All. - * @param[in] input2 Second input tensor. Data types supported: same as @p input1 - * @param[out] output Output tensor. Data types supported: Same as @p input1. - */ - void configure(const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output); /** Initialise the kernel's input1s and output * * @param[in] compile_context The compile context to be used. @@ -64,7 +55,7 @@ public: * @param[in] input2 Second input tensor. Data types supported: same as @p input1 * @param[out] output Output tensor. Data types supported: Same as @p input1. */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input1, const ICLTensor *input2, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLWidthConcatenate2TensorsKernel * * @param[in] input1 First tensor info. Data types supported: All. @@ -76,12 +67,8 @@ public: static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; - -private: - const ICLTensor *_input1; - const ICLTensor *_input2; - ICLTensor *_output; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLWIDTHCONCATENATE_2TENSORS_KERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLWidthConcatenate4TensorsKernel.h b/arm_compute/core/CL/kernels/CLWidthConcatenate4TensorsKernel.h index d3845b68f0..b1d6e890a0 100644 --- a/arm_compute/core/CL/kernels/CLWidthConcatenate4TensorsKernel.h +++ b/arm_compute/core/CL/kernels/CLWidthConcatenate4TensorsKernel.h @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface for the width concatenate kernel of 4 tensors. * All input tensors will be concatenated into the output tensor. */ @@ -50,15 +48,6 @@ public: CLWidthConcatenate4TensorsKernel &operator=(CLWidthConcatenate4TensorsKernel &&) = default; /** Default destructor */ ~CLWidthConcatenate4TensorsKernel() = default; - /** Initialise the kernel's input1s and output - * - * @param[in] input1 First input tensor. Data types supported: All. - * @param[in] input2 Second input tensor. Data types supported: same as @p input1 - * @param[in] input3 Third input tensor. Data types supported: same as @p input1 - * @param[in] input4 Fourth input tensor. Data types supported: same as @p input1 - * @param[out] output Output tensor. Data types supported: Same as @p input1. - */ - void configure(const ICLTensor *input1, const ICLTensor *input2, const ICLTensor *input3, const ICLTensor *input4, ICLTensor *output); /** Initialise the kernel's input1s and output * * @param[in] compile_context The compile context to be used. @@ -68,7 +57,7 @@ public: * @param[in] input4 Fourth input tensor. Data types supported: same as @p input1 * @param[out] output Output tensor. Data types supported: Same as @p input1. */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input1, const ICLTensor *input2, const ICLTensor *input3, const ICLTensor *input4, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *input3, ITensorInfo *input4, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLWidthConcatenate4TensorsKernel * * @param[in] input1 First tensor info. Data types supported: All. @@ -82,14 +71,8 @@ public: static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *input3, const ITensorInfo *input4, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; - -private: - const ICLTensor *_input1; - const ICLTensor *_input2; - const ICLTensor *_input3; - const ICLTensor *_input4; - ICLTensor *_output; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLWIDTHCONCATENATE_4TENSORS_KERNEL_H */ diff --git a/arm_compute/core/CL/kernels/CLWidthConcatenateLayerKernel.h b/arm_compute/core/CL/kernels/CLWidthConcatenateLayerKernel.h index a42ab5126e..cb8777d5fd 100644 --- a/arm_compute/core/CL/kernels/CLWidthConcatenateLayerKernel.h +++ b/arm_compute/core/CL/kernels/CLWidthConcatenateLayerKernel.h @@ -30,8 +30,6 @@ namespace arm_compute { -class ICLTensor; - /** Interface for the width concatenate kernel. * The input tensor will be concatenated into the output tensor. */ @@ -50,14 +48,6 @@ public: CLWidthConcatenateLayerKernel &operator=(CLWidthConcatenateLayerKernel &&) = default; /** Default destructor */ ~CLWidthConcatenateLayerKernel() = default; - /** Initialise the kernel's inputs and output - * - * @param[in] input Input tensor. Data types supported: All. - * @param[in] width_offset The offset on the X axis. - * @param[in,out] output Output tensor. Data types supported: Same as @p input. - * - */ - void configure(const ICLTensor *input, unsigned int width_offset, ICLTensor *output); /** Initialise the kernel's inputs and output * * @param[in] compile_context The compile context to be used. @@ -66,7 +56,7 @@ public: * @param[in,out] output Output tensor. Data types supported: Same as @p input. * */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input, unsigned int width_offset, ICLTensor *output); + void configure(const CLCompileContext &compile_context, ITensorInfo *input, unsigned int width_offset, ITensorInfo *output); /** Static function to check if given info will lead to a valid configuration of @ref CLWidthConcatenateLayerKernel * * @param[in] input Input tensor info. Data types supported: All. @@ -78,12 +68,11 @@ public: static Status validate(const ITensorInfo *input, unsigned int width_offset, const ITensorInfo *output); // Inherited methods overridden: - void run(const Window &window, cl::CommandQueue &queue) override; + void run_op(const InputTensorMap &inputs, const OutputTensorMap &outputs, + const Window &window, cl::CommandQueue &queue) override; private: - const ICLTensor *_input; - ICLTensor *_output; - unsigned int _width_offset; + unsigned int _width_offset; }; } // namespace arm_compute #endif /* ARM_COMPUTE_CLWIDTHCONCATENATELAYERKERNEL_H */ -- cgit v1.2.1