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/graph/backends | |
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/graph/backends')
-rw-r--r-- | src/graph/backends/CL/CLDeviceBackend.cpp | 16 | ||||
-rw-r--r-- | src/graph/backends/GLES/GCDeviceBackend.cpp | 8 | ||||
-rw-r--r-- | src/graph/backends/NEON/NEDeviceBackend.cpp | 9 |
3 files changed, 28 insertions, 5 deletions
diff --git a/src/graph/backends/CL/CLDeviceBackend.cpp b/src/graph/backends/CL/CLDeviceBackend.cpp index 6717f9f8e3..f35daf4ae5 100644 --- a/src/graph/backends/CL/CLDeviceBackend.cpp +++ b/src/graph/backends/CL/CLDeviceBackend.cpp @@ -63,7 +63,7 @@ bool file_exists(const std::string &filename) static detail::BackendRegistrar<CLDeviceBackend> CLDeviceBackend_registrar(Target::CL); CLDeviceBackend::CLDeviceBackend() - : _initialized(false), _tuner(), _allocator(nullptr), _tuner_file() + : _context_count(0), _tuner(), _allocator(nullptr), _tuner_file() { } @@ -90,13 +90,23 @@ void CLDeviceBackend::initialize_backend() _allocator = support::cpp14::make_unique<CLBufferAllocator>(); } +void CLDeviceBackend::release_backend_context(GraphContext &ctx) +{ + ARM_COMPUTE_UNUSED(ctx); + _context_count--; + if(_context_count == 0) // No more context using the backend: free resources + { + _allocator = nullptr; + } +} + void CLDeviceBackend::setup_backend_context(GraphContext &ctx) { // Force backend initialization - if(!_initialized) + _context_count++; + if(_context_count == 1) { initialize_backend(); - _initialized = true; } // Setup tuner diff --git a/src/graph/backends/GLES/GCDeviceBackend.cpp b/src/graph/backends/GLES/GCDeviceBackend.cpp index bfac31ac2e..ec3cf4f21e 100644 --- a/src/graph/backends/GLES/GCDeviceBackend.cpp +++ b/src/graph/backends/GLES/GCDeviceBackend.cpp @@ -63,6 +63,12 @@ void GCDeviceBackend::initialize_backend() GCScheduler::get().default_init(); } +void GCDeviceBackend::release_backend_context(GraphContext &ctx) +{ + //Nothing to do + ARM_COMPUTE_UNUSED(ctx); +} + void GCDeviceBackend::setup_backend_context(GraphContext &ctx) { // Force backend initialization @@ -151,4 +157,4 @@ std::shared_ptr<arm_compute::IMemoryManager> GCDeviceBackend::create_memory_mana } } // namespace backends } // namespace graph -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/backends/NEON/NEDeviceBackend.cpp b/src/graph/backends/NEON/NEDeviceBackend.cpp index 7c2db40260..5fc44d0c68 100644 --- a/src/graph/backends/NEON/NEDeviceBackend.cpp +++ b/src/graph/backends/NEON/NEDeviceBackend.cpp @@ -61,6 +61,13 @@ NEDeviceBackend::NEDeviceBackend() void NEDeviceBackend::initialize_backend() { + //Nothing to do +} + +void NEDeviceBackend::release_backend_context(GraphContext &ctx) +{ + //Nothing to do + ARM_COMPUTE_UNUSED(ctx); } void NEDeviceBackend::setup_backend_context(GraphContext &ctx) @@ -155,4 +162,4 @@ std::shared_ptr<arm_compute::IMemoryManager> NEDeviceBackend::create_memory_mana } } // namespace backends } // namespace graph -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute |