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/CLWidthConcatenate2TensorsKernel.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) (limited to 'arm_compute/core/CL/kernels/CLWidthConcatenate2TensorsKernel.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 */ -- cgit v1.2.1