commit b6eb35371d222c6b7f61210d97ebd7dd9e197458
author Anthony Barbier <anthony.barbier@arm.com> Wed Aug 08 13:20:04 2018 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:54:54 2018 +0000
tree af89729ad68d665916c37abb5fd49e512fa40614
parent 1d1f32ce7ef6acea4afd4cf6a929436640b72ccd

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>

tests/framework/Framework.cpp

diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp
index 7e1f293..182e0ba 100644
--- a/tests/framework/Framework.cpp
+++ b/tests/framework/Framework.cpp
@@ -538,7 +538,7 @@
                 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);