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/CLLKTrackerKernel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/CL/kernels/CLLKTrackerKernel.cpp') diff --git a/src/core/CL/kernels/CLLKTrackerKernel.cpp b/src/core/CL/kernels/CLLKTrackerKernel.cpp index 078d18e61c..40ed630c89 100644 --- a/src/core/CL/kernels/CLLKTrackerKernel.cpp +++ b/src/core/CL/kernels/CLLKTrackerKernel.cpp @@ -75,7 +75,7 @@ void CLLKTrackerInitKernel::configure(const ICLKeyPointArray *old_points, const Window window; window.set(Window::DimX, Window::Dimension(0, old_points->num_values(), 1)); window.set(Window::DimY, Window::Dimension(0, 1, 1)); - ICLKernel::configure(window); + ICLKernel::configure_internal(window); } void CLLKTrackerInitKernel::run(const Window &window, cl::CommandQueue &queue) @@ -104,7 +104,7 @@ void CLLKTrackerFinalizeKernel::configure(ICLLKInternalKeypointArray *new_points Window window; window.set(Window::DimX, Window::Dimension(0, new_points_internal->num_values(), 1)); window.set(Window::DimY, Window::Dimension(0, 1, 1)); - ICLKernel::configure(window); + ICLKernel::configure_internal(window); } void CLLKTrackerFinalizeKernel::run(const Window &window, cl::CommandQueue &queue) @@ -156,7 +156,7 @@ void CLLKTrackerStage0Kernel::configure(const ICLTensor *old_input, const ICLTen AccessWindowStatic(old_scharr_gy->info(), valid_region.start(0), valid_region.start(1), valid_region.end(0), valid_region.end(1))); - ICLKernel::configure(window); + ICLKernel::configure_internal(window); // Initialize required variables const int level0 = (level == 0) ? 1 : 0; @@ -232,7 +232,7 @@ void CLLKTrackerStage1Kernel::configure(const ICLTensor *new_input, ICLLKInterna AccessWindowStatic(new_input->info(), valid_region.start(0), valid_region.start(1), valid_region.end(0), valid_region.end(1))); - ICLKernel::configure(window); + ICLKernel::configure_internal(window); // Initialize required variables const int level0 = (level == 0) ? 1 : 0; -- cgit v1.2.1