From b6eb35371d222c6b7f61210d97ebd7dd9e197458 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Wed, 8 Aug 2018 13:20:04 +0100 Subject: 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 Reviewed-by: Michele DiGiorgio Reviewed-by: Gian Marco Iodice --- src/graph/GraphContext.cpp | 12 ++++++++++-- src/graph/Utils.cpp | 10 +++++++++- src/graph/backends/CL/CLDeviceBackend.cpp | 16 +++++++++++++--- src/graph/backends/GLES/GCDeviceBackend.cpp | 8 +++++++- src/graph/backends/NEON/NEDeviceBackend.cpp | 9 ++++++++- src/graph/frontend/Stream.cpp | 4 ++-- 6 files changed, 49 insertions(+), 10 deletions(-) (limited to 'src/graph') diff --git a/src/graph/GraphContext.cpp b/src/graph/GraphContext.cpp index 3f311145bc..5f33ed3537 100644 --- a/src/graph/GraphContext.cpp +++ b/src/graph/GraphContext.cpp @@ -22,7 +22,9 @@ * SOFTWARE. */ #include "arm_compute/graph/GraphContext.h" -#include + +#include "arm_compute/graph.h" +#include "arm_compute/graph/Utils.h" namespace arm_compute { @@ -33,6 +35,12 @@ GraphContext::GraphContext() { } +GraphContext::~GraphContext() +{ + _memory_managers.clear(); + release_default_graph_context(*this); +} + const GraphConfig &GraphContext::config() const { return _config; @@ -82,4 +90,4 @@ void GraphContext::finalize() } } } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/Utils.cpp b/src/graph/Utils.cpp index d89126272d..4715694f15 100644 --- a/src/graph/Utils.cpp +++ b/src/graph/Utils.cpp @@ -89,6 +89,14 @@ PassManager create_default_pass_manager(Target target) return pm; } +void release_default_graph_context(GraphContext &ctx) +{ + for(const auto &backend : backends::BackendRegistry::get().backends()) + { + backend.second->release_backend_context(ctx); + } +} + void setup_default_graph_context(GraphContext &ctx) { for(const auto &backend : backends::BackendRegistry::get().backends()) @@ -132,4 +140,4 @@ size_t get_dimension_idx(const TensorDescriptor &descriptor, const DataLayoutDim } } } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute 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_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(); } +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 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 NEDeviceBackend::create_memory_mana } } // namespace backends } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute diff --git a/src/graph/frontend/Stream.cpp b/src/graph/frontend/Stream.cpp index 96a166c79c..878d688995 100644 --- a/src/graph/frontend/Stream.cpp +++ b/src/graph/frontend/Stream.cpp @@ -33,7 +33,7 @@ namespace graph namespace frontend { Stream::Stream(size_t id, std::string name) - : _manager(), _ctx(), _g(id, std::move(name)) + : _ctx(), _manager(), _g(id, std::move(name)) { } @@ -66,4 +66,4 @@ Graph &Stream::graph() } } // namespace frontend } // namespace graph -} // namespace arm_compute \ No newline at end of file +} // namespace arm_compute -- cgit v1.2.1