From 8a94e7cec7b09a417a278425e2b56e7af5bf45d9 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 15 Sep 2017 19:06:47 +0100 Subject: COMPMID-534: Add MemoryManager support in OpenCL functions Adds support for: -CLConvolution -CLGEMM -CLGEMMLowp -CLHOGDescriptor -CLHOGGradient -CLHOGMultiDetection -CLL2Normalize -CLLocallyConnectedLayer -CLOpticalFlow -CLReductionOperation Change-Id: Ib13354d274ccf32ae933f3fbbad3ac3896cfd3bd Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87938 Tested-by: Kaizen Reviewed-by: Pablo Tello --- src/runtime/CL/functions/CLHOGDescriptor.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'src/runtime/CL/functions/CLHOGDescriptor.cpp') diff --git a/src/runtime/CL/functions/CLHOGDescriptor.cpp b/src/runtime/CL/functions/CLHOGDescriptor.cpp index b1b5a03ac1..1470d5cdc1 100644 --- a/src/runtime/CL/functions/CLHOGDescriptor.cpp +++ b/src/runtime/CL/functions/CLHOGDescriptor.cpp @@ -31,8 +31,8 @@ using namespace arm_compute; -CLHOGDescriptor::CLHOGDescriptor() - : _gradient(), _orient_bin(), _block_norm(), _mag(), _phase(), _hog_space() +CLHOGDescriptor::CLHOGDescriptor(std::shared_ptr memory_manager) + : _memory_group(std::move(memory_manager)), _gradient(), _orient_bin(), _block_norm(), _mag(), _phase(), _hog_space() { } @@ -71,9 +71,16 @@ void CLHOGDescriptor::configure(ICLTensor *input, ICLTensor *output, const IHOG TensorInfo info_space(shape_hog_space, num_bins, DataType::F32); _hog_space.allocator()->init(info_space); + // Manage intermediate buffers + _memory_group.manage(&_mag); + _memory_group.manage(&_phase); + // Initialise gradient kernel _gradient.configure(input, &_mag, &_phase, hog_info->phase_type(), border_mode, constant_border_value); + // Manage intermediate buffers + _memory_group.manage(&_hog_space); + // Initialise orientation binning kernel _orient_bin.configure(&_mag, &_phase, &_hog_space, hog->info()); @@ -88,6 +95,8 @@ void CLHOGDescriptor::configure(ICLTensor *input, ICLTensor *output, const IHOG void CLHOGDescriptor::run() { + _memory_group.acquire(); + // Run gradient _gradient.run(); @@ -96,4 +105,6 @@ void CLHOGDescriptor::run() // Run block normalization CLScheduler::get().enqueue(_block_norm); + + _memory_group.release(); } \ No newline at end of file -- cgit v1.2.1