aboutsummaryrefslogtreecommitdiff
path: root/tests/framework/Framework.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/framework/Framework.cpp')
-rw-r--r--tests/framework/Framework.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/tests/framework/Framework.cpp b/tests/framework/Framework.cpp
index 0b2ded8a3c..44887a9125 100644
--- a/tests/framework/Framework.cpp
+++ b/tests/framework/Framework.cpp
@@ -564,20 +564,15 @@ bool Framework::run()
// Every 100 tests, reset the OpenCL context to release the allocated memory
if(opencl_is_available() && (id_run_test % 100) == 0)
{
+ auto ctx_properties = CLScheduler::get().context().getInfo<CL_CONTEXT_PROPERTIES>(nullptr);
+ 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, CLKernelLibrary::get().get_device(), queue_properties);
+
CLKernelLibrary::get().clear_programs_cache();
- auto cl_ctx = support::cpp14::make_unique<CLRuntimeContext>();
- assert(cl_ctx != nullptr);
- CLScheduler *gpu_scheduler = cl_ctx->gpu_scheduler();
- assert(gpu_scheduler != nullptr);
- {
- // Legacy singletons API: This has been deprecated and the singletons will be removed
- // Setup singleton for backward compatibility
- CLScheduler::get().init(gpu_scheduler->context(), gpu_scheduler->queue(), cl_ctx->kernel_library().get_device());
- }
- if(parameters)
- {
- parameters->set_cl_ctx(std::move(cl_ctx));
- }
+ CLScheduler::get().set_context(new_ctx);
+ CLScheduler::get().set_queue(new_queue);
}
#endif // ARM_COMPUTE_CL