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/CLOpticalFlow.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'src/runtime/CL/functions/CLOpticalFlow.cpp') diff --git a/src/runtime/CL/functions/CLOpticalFlow.cpp b/src/runtime/CL/functions/CLOpticalFlow.cpp index 07ca2f91b4..d00b1b5099 100644 --- a/src/runtime/CL/functions/CLOpticalFlow.cpp +++ b/src/runtime/CL/functions/CLOpticalFlow.cpp @@ -37,8 +37,9 @@ using namespace arm_compute; -CLOpticalFlow::CLOpticalFlow() // NOLINT - : _tracker_init_kernel(), +CLOpticalFlow::CLOpticalFlow(std::shared_ptr memory_manager) // NOLINT + : _memory_group(std::move(memory_manager)), + _tracker_init_kernel(), _tracker_stage0_kernel(), _tracker_stage1_kernel(), _tracker_finalize_kernel(), @@ -116,6 +117,10 @@ void CLOpticalFlow::configure(const CLPyramid *old_pyramid, const CLPyramid *new _scharr_gx[i].allocator()->init(tensor_info); _scharr_gy[i].allocator()->init(tensor_info); + // Manage intermediate buffers + _memory_group.manage(_scharr_gx.get() + i); + _memory_group.manage(_scharr_gy.get() + i); + // Init Scharr kernel _func_scharr[i].configure(old_ith_input, &_scharr_gx[i], &_scharr_gy[i], border_mode, constant_border_value); @@ -144,6 +149,8 @@ void CLOpticalFlow::run() { ARM_COMPUTE_ERROR_ON_MSG(_num_levels == 0, "Unconfigured function"); + _memory_group.acquire(); + for(unsigned int level = _num_levels; level > 0; --level) { // Run Scharr kernel @@ -160,4 +167,6 @@ void CLOpticalFlow::run() } CLScheduler::get().enqueue(_tracker_finalize_kernel, true); + + _memory_group.release(); } -- cgit v1.2.1