From bef7fa27b0d231a8649952f60808132d109b6345 Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Wed, 21 Oct 2020 15:58:54 +0100 Subject: COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to src Change-Id: I10d27db788e5086adae1841e3e2441cd9b76ef84 Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4310 Reviewed-by: Georgios Pinitas Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/runtime/CL/functions/CLMeanStdDev.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/runtime/CL/functions/CLMeanStdDev.cpp') diff --git a/src/runtime/CL/functions/CLMeanStdDev.cpp b/src/runtime/CL/functions/CLMeanStdDev.cpp index 2517fdc4ef..c91bc954b8 100644 --- a/src/runtime/CL/functions/CLMeanStdDev.cpp +++ b/src/runtime/CL/functions/CLMeanStdDev.cpp @@ -25,6 +25,10 @@ #include "arm_compute/runtime/CL/CLScheduler.h" #include "arm_compute/runtime/CL/functions/CLMeanStdDev.h" +#include "src/core/CL/kernels/CLFillBorderKernel.h" +#include "src/core/CL/kernels/CLMeanStdDevKernel.h" +#include "src/core/CL/kernels/CLReductionOperationKernel.h" +#include "support/MemorySupport.h" using namespace arm_compute; @@ -39,13 +43,15 @@ CLMeanStdDev::CLMeanStdDev(std::shared_ptr memory_manager) // NO _reduction_output_stddev(), _mean(nullptr), _stddev(nullptr), - _mean_stddev_kernel(), - _fill_border_kernel(), + _mean_stddev_kernel(support::cpp14::make_unique()), + _fill_border_kernel(support::cpp14::make_unique()), _global_sum(), _global_sum_squared() { } +CLMeanStdDev::~CLMeanStdDev() = default; + Status CLMeanStdDev::validate(ITensorInfo *input, float *mean, float *stddev) { ARM_COMPUTE_RETURN_ERROR_ON_TENSOR_NOT_2D(input); @@ -101,8 +107,8 @@ void CLMeanStdDev::configure(const CLCompileContext &compile_context, ICLImage * _global_sum_squared = cl::Buffer(CLScheduler::get().context(), CL_MEM_ALLOC_HOST_PTR | CL_MEM_READ_WRITE, sizeof(cl_ulong)); } - _mean_stddev_kernel.configure(compile_context, input, mean, &_global_sum, stddev, &_global_sum_squared); - _fill_border_kernel.configure(compile_context, input, _mean_stddev_kernel.border_size(), BorderMode::CONSTANT, PixelValue(static_cast(0))); + _mean_stddev_kernel->configure(compile_context, input, mean, &_global_sum, stddev, &_global_sum_squared); + _fill_border_kernel->configure(compile_context, input, _mean_stddev_kernel->border_size(), BorderMode::CONSTANT, PixelValue(static_cast(0))); } } @@ -149,8 +155,8 @@ void CLMeanStdDev::run_float() void CLMeanStdDev::run_int() { - CLScheduler::get().enqueue(_fill_border_kernel); - CLScheduler::get().enqueue(_mean_stddev_kernel); + CLScheduler::get().enqueue(*_fill_border_kernel); + CLScheduler::get().enqueue(*_mean_stddev_kernel); } void CLMeanStdDev::run() -- cgit v1.2.1