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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/framework/Framework.cpp | 2 | ||||
| -rw-r--r-- | tests/validation/CL/UNIT/Tuner.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp index 7e1f2934ff..182e0babcd 100644 --- a/tests/framework/Framework.cpp +++ b/tests/framework/Framework.cpp @@ -538,7 +538,7 @@ bool Framework::run() auto queue_properties = CLScheduler::get().queue().getInfo<CL_QUEUE_PROPERTIES>(nullptr); cl::Context new_ctx = cl::Context(CL_DEVICE_TYPE_DEFAULT, ctx_properties.data()); - cl::CommandQueue new_queue = cl::CommandQueue(new_ctx, cl::Device::getDefault(), queue_properties); + cl::CommandQueue new_queue = cl::CommandQueue(new_ctx, CLKernelLibrary::get().get_device(), queue_properties); CLKernelLibrary::get().clear_programs_cache(); CLScheduler::get().set_context(new_ctx); diff --git a/tests/validation/CL/UNIT/Tuner.cpp b/tests/validation/CL/UNIT/Tuner.cpp index 26d21b54f2..9f760563b5 100644 --- a/tests/validation/CL/UNIT/Tuner.cpp +++ b/tests/validation/CL/UNIT/Tuner.cpp @@ -57,12 +57,11 @@ TEST_CASE(BifrostTunerSimple, framework::DatasetMode::ALL) CLDirectConvolutionLayerKernel conv; conv.set_target(GPUTarget::G72); - // Hard-wire lws to kernel and validate lws - conv.set_lws_hint(fake_lws); - ARM_COMPUTE_EXPECT(conv.lws_hint()[0] == 2000, framework::LogLevel::ERRORS); - // Configure conv.configure(&src, &weights, &bias, &dst, PadStrideInfo(1, 1, 1, 1)); + + // Hard-wire lws to kernel and validate lws + conv.set_lws_hint(fake_lws); ARM_COMPUTE_EXPECT(conv.lws_hint()[0] == 2000, framework::LogLevel::ERRORS); // Tune kernel and validate |