diff options
| author | Anthony Barbier <anthony.barbier@arm.com> | 2018-08-08 13:20:04 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:54:54 +0000 |
| commit | b6eb35371d222c6b7f61210d97ebd7dd9e197458 (patch) | |
| tree | af89729ad68d665916c37abb5fd49e512fa40614 /src/core/CL/kernels/CLChannelCombineKernel.cpp | |
| parent | 1d1f32ce7ef6acea4afd4cf6a929436640b72ccd (diff) | |
| download | ComputeLibrary-b6eb35371d222c6b7f61210d97ebd7dd9e197458.tar.gz | |
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 <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'src/core/CL/kernels/CLChannelCombineKernel.cpp')
| -rw-r--r-- | src/core/CL/kernels/CLChannelCombineKernel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/CL/kernels/CLChannelCombineKernel.cpp b/src/core/CL/kernels/CLChannelCombineKernel.cpp index 6e55e666ee..c7b1da41dc 100644 --- a/src/core/CL/kernels/CLChannelCombineKernel.cpp +++ b/src/core/CL/kernels/CLChannelCombineKernel.cpp @@ -128,7 +128,7 @@ void CLChannelCombineKernel::configure(const ICLTensor *plane0, const ICLTensor } output_access.set_valid_region(win, ValidRegion(valid_region.anchor, output->info()->tensor_shape())); - ICLKernel::configure(win); + ICLKernel::configure_internal(win); } void CLChannelCombineKernel::configure(const ICLImage *plane0, const ICLImage *plane1, const ICLImage *plane2, ICLMultiImage *output) @@ -232,7 +232,7 @@ void CLChannelCombineKernel::configure(const ICLImage *plane0, const ICLImage *p output_plane1_access.set_valid_region(win, ValidRegion(output_plane1_region.anchor, output->plane(1)->info()->tensor_shape())); output_plane2_access.set_valid_region(win, ValidRegion(plane2->info()->valid_region().anchor, output->plane(2)->info()->tensor_shape())); - ICLKernel::configure(win); + ICLKernel::configure_internal(win); } void CLChannelCombineKernel::run(const Window &window, cl::CommandQueue &queue) |