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/CLHOGDescriptorKernel.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/core/CL/kernels/CLHOGDescriptorKernel.cpp') diff --git a/src/core/CL/kernels/CLHOGDescriptorKernel.cpp b/src/core/CL/kernels/CLHOGDescriptorKernel.cpp index c251dec066..f79388e93d 100644 --- a/src/core/CL/kernels/CLHOGDescriptorKernel.cpp +++ b/src/core/CL/kernels/CLHOGDescriptorKernel.cpp @@ -47,6 +47,11 @@ CLHOGOrientationBinningKernel::CLHOGOrientationBinningKernel() } void CLHOGOrientationBinningKernel::configure(const ICLTensor *input_magnitude, const ICLTensor *input_phase, ICLTensor *output, const HOGInfo *hog_info) +{ + configure(CLKernelLibrary::get().get_compile_context(), input_magnitude, input_phase, output, hog_info); +} + +void CLHOGOrientationBinningKernel::configure(CLCompileContext &compile_context, const ICLTensor *input_magnitude, const ICLTensor *input_phase, ICLTensor *output, const HOGInfo *hog_info) { ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input_magnitude, 1, DataType::S16); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input_phase, 1, DataType::U8); @@ -75,7 +80,7 @@ void CLHOGOrientationBinningKernel::configure(const ICLTensor *input_magnitude, // Create kernel const std::string kernel_name = std::string("hog_orientation_binning"); - _kernel = static_cast(CLKernelLibrary::get().create_kernel(kernel_name, build_opts)); + _kernel = create_kernel(compile_context, kernel_name, build_opts); constexpr unsigned int num_elems_processed_per_iteration = 1; constexpr unsigned int num_elems_read_per_iteration = 1; @@ -138,6 +143,11 @@ CLHOGBlockNormalizationKernel::CLHOGBlockNormalizationKernel() } void CLHOGBlockNormalizationKernel::configure(const ICLTensor *input, ICLTensor *output, const HOGInfo *hog_info) +{ + configure(CLKernelLibrary::get().get_compile_context(), input, output, hog_info); +} + +void CLHOGBlockNormalizationKernel::configure(CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output, const HOGInfo *hog_info) { ARM_COMPUTE_ERROR_ON(hog_info == nullptr); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, hog_info->num_bins(), DataType::F32); @@ -172,7 +182,7 @@ void CLHOGBlockNormalizationKernel::configure(const ICLTensor *input, ICLTensor build_opts.insert(args_str.str()); const std::string kernel_name = std::string("hog_block_normalization"); - _kernel = static_cast(CLKernelLibrary::get().create_kernel(kernel_name, build_opts)); + _kernel = create_kernel(compile_context, kernel_name, build_opts); constexpr unsigned int num_elems_processed_per_iteration = 1; constexpr unsigned int num_elems_read_per_iteration = 1; -- cgit v1.2.1