From 7e20e29904c98adae5a91c6492fd78da88b7a9bf Mon Sep 17 00:00:00 2001 From: Sheri Zhang Date: Tue, 2 Feb 2021 11:49:34 +0000 Subject: Make memset/copy functions state-less Port following functions: - CLCopy - CLFill - CLPermute - CLReshapeLayer - CLCropResize Resolves: COMPMID-4002 Signed-off-by: Sheri Zhang Change-Id: I8392aa515aaeb5b44dab6122be6a795d08376d5f Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5003 Comments-Addressed: Arm Jenkins Reviewed-by: Michele Di Giorgio Tested-by: Arm Jenkins --- tests/CL/Helper.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/CL/Helper.h b/tests/CL/Helper.h index d217af6e18..5153e98add 100644 --- a/tests/CL/Helper.h +++ b/tests/CL/Helper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,12 +24,11 @@ #ifndef ARM_COMPUTE_TEST_CL_HELPER_H #define ARM_COMPUTE_TEST_CL_HELPER_H -#include "src/core/CL/kernels/CLFillBorderKernel.h" -#include "src/core/CL/kernels/CLMemsetKernel.h" - #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/ICLSimpleFunction.h" +#include "arm_compute/runtime/CL/functions/CLFill.h" #include "arm_compute/runtime/IFunction.h" +#include "src/core/CL/kernels/CLFillBorderKernel.h" #include "src/core/CL/ICLKernel.h" @@ -118,7 +117,7 @@ public: k->configure(first, second, std::forward(args)...); _kernel = std::move(k); _border_handler.configure(first, BorderSize(bordersize), BorderMode::CONSTANT, PixelValue()); - _memset_kernel.configure(second, PixelValue()); + _fill.configure(second, PixelValue()); } // Inherited method overridden: @@ -126,13 +125,13 @@ public: { ARM_COMPUTE_ERROR_ON_MSG(!_kernel, "The CL kernel or function isn't configured"); - CLScheduler::get().enqueue(_memset_kernel, false); + _fill.run(); CLScheduler::get().enqueue(_border_handler, false); CLScheduler::get().enqueue(*_kernel); } private: - CLMemsetKernel _memset_kernel{}; /**< Kernel to initialize the tensor */ + CLFill _fill{}; /**< Kernel to initialize the tensor */ CLFillBorderKernel _border_handler{}; /**< Kernel to handle borders */ std::unique_ptr _kernel{}; /**< Kernel to run */ }; -- cgit v1.2.1