From b6eb35371d222c6b7f61210d97ebd7dd9e197458 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Wed, 8 Aug 2018 13:20:04 +0100 Subject: COMPMID-1478: Stop relying on static default OpenCL objects in cl2.hpp This causes problems when ACL is used as a shared library on Android. Fixes some problems related to creation / destruction order between the Graph's CL backend and core / runtime Change-Id: I716d63fd42f4586df1ffbb6fa97e4db06d3a781b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/143228 Tested-by: Jenkins Reviewed-by: Michele DiGiorgio Reviewed-by: Gian Marco Iodice --- src/core/CL/kernels/CLSobel7x7Kernel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/CL/kernels/CLSobel7x7Kernel.cpp') diff --git a/src/core/CL/kernels/CLSobel7x7Kernel.cpp b/src/core/CL/kernels/CLSobel7x7Kernel.cpp index a477953cfb..0c94e88acf 100644 --- a/src/core/CL/kernels/CLSobel7x7Kernel.cpp +++ b/src/core/CL/kernels/CLSobel7x7Kernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2017 ARM Limited. + * Copyright (c) 2016-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -105,7 +105,7 @@ void CLSobel7x7HorKernel::configure(const ICLTensor *input, ICLTensor *output_x, output_x_access.set_valid_region(win, input->info()->valid_region(), border_undefined, border_size()); output_y_access.set_valid_region(win, input->info()->valid_region(), border_undefined, border_size()); - ICLKernel::configure(win); + ICLKernel::configure_internal(win); } void CLSobel7x7HorKernel::run(const Window &window, cl::CommandQueue &queue) @@ -204,7 +204,7 @@ void CLSobel7x7VertKernel::configure(const ICLTensor *input_x, const ICLTensor * output_x_access.set_valid_region(win, input->info()->valid_region(), border_undefined, border_size()); output_y_access.set_valid_region(win, input->info()->valid_region(), border_undefined, border_size()); - ICLKernel::configure(win); + ICLKernel::configure_internal(win); } void CLSobel7x7VertKernel::run(const Window &window, cl::CommandQueue &queue) -- cgit v1.2.1