From 4c6bd514a8d424a29b776754f1b3426fa3a8c339 Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Wed, 8 Apr 2020 10:15:51 +0100 Subject: COMPMID-3280: Make all ML primitives for CL use the new interface - Part 1 - Only CLKernels have been updated Change-Id: Ife55b847c2e39e712a186eb6ca452503d5b66937 Signed-off-by: Manuel Bottini Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3001 Reviewed-by: Michele Di Giorgio Reviewed-by: Michalis Spyrou Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- src/core/CL/kernels/CLActivationLayerKernel.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/core/CL/kernels/CLActivationLayerKernel.cpp') diff --git a/src/core/CL/kernels/CLActivationLayerKernel.cpp b/src/core/CL/kernels/CLActivationLayerKernel.cpp index 2ab0240076..15ae8e3d04 100644 --- a/src/core/CL/kernels/CLActivationLayerKernel.cpp +++ b/src/core/CL/kernels/CLActivationLayerKernel.cpp @@ -115,12 +115,17 @@ std::pair validate_and_configure_window(ITensorInfo *input, ITen } } // namespace -CLActivationLayerKernel::CLActivationLayerKernel(CLCoreRuntimeContext *ctx) - : _input(nullptr), _output(nullptr), _run_in_place(false), _ctx(ctx) +CLActivationLayerKernel::CLActivationLayerKernel() + : _input(nullptr), _output(nullptr), _run_in_place(false) { } void CLActivationLayerKernel::configure(ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info) +{ + configure(CLKernelLibrary::get().get_compile_context(), input, output, act_info); +} + +void CLActivationLayerKernel::configure(CLCompileContext &compile_context, ICLTensor *input, ICLTensor *output, ActivationLayerInfo act_info) { ARM_COMPUTE_ERROR_ON_NULLPTR(input); @@ -226,7 +231,8 @@ void CLActivationLayerKernel::configure(ICLTensor *input, ICLTensor *output, Act } // Create kernel - _kernel = create_opencl_kernel(_ctx, kernel_name, build_opts); + _kernel = create_kernel(compile_context, kernel_name, build_opts.options()); + // Make sure _kernel is initialized before calling the parent's configure _input = input; _output = output; -- cgit v1.2.1