From 3021edfb5e72ef4cd91dbc754ce6ac55388ebc4e Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 18 Sep 2017 17:55:22 +0100 Subject: COMPMID-417: Fix NEGaussianPyramidOrb. Change-Id: I9e89136a926f33cc591784d4e7785618bba7b0b2 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/88116 Reviewed-by: Pablo Tello Tested-by: Kaizen --- src/runtime/NEON/functions/NEGaussianPyramid.cpp | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'src/runtime/NEON/functions/NEGaussianPyramid.cpp') diff --git a/src/runtime/NEON/functions/NEGaussianPyramid.cpp b/src/runtime/NEON/functions/NEGaussianPyramid.cpp index 90bd5842eb..84ea0ca058 100644 --- a/src/runtime/NEON/functions/NEGaussianPyramid.cpp +++ b/src/runtime/NEON/functions/NEGaussianPyramid.cpp @@ -116,8 +116,7 @@ void NEGaussianPyramidHalf::run() } NEGaussianPyramidOrb::NEGaussianPyramidOrb() // NOLINT - : _offsets(), - _gaus5x5(), + : _gaus5x5(), _scale_nearest() { } @@ -140,29 +139,18 @@ void NEGaussianPyramidOrb::configure(const ITensor *input, IPyramid *pyramid, Bo if(num_levels > 1) { _gaus5x5 = arm_compute::support::cpp14::make_unique(num_levels - 1); - _scale_nearest = arm_compute::support::cpp14::make_unique(num_levels - 1); - _offsets = arm_compute::support::cpp14::make_unique(num_levels - 1); + _scale_nearest = arm_compute::support::cpp14::make_unique(num_levels - 1); PyramidInfo pyramid_info(num_levels - 1, SCALE_PYRAMID_ORB, pyramid->info()->tensor_shape(), Format::U8); _tmp.init(pyramid_info); for(unsigned int i = 0; i < num_levels - 1; ++i) { - const size_t width = _pyramid->get_pyramid_level(i + 1)->info()->dimension(0); - const size_t height = _pyramid->get_pyramid_level(i + 1)->info()->dimension(1); - - /* Allocate Image for the offsets used by NEAREST interpolation */ - TensorInfo tensor_info(TensorShape(width, height), Format::S32); - _offsets[i].allocator()->init(tensor_info); - /* Configure gaussian 5x5 */ _gaus5x5[i].configure(_pyramid->get_pyramid_level(i), _tmp.get_pyramid_level(i), border_mode, constant_border_value); - /* Configure scale image kernel */ - _scale_nearest[i].configure(_tmp.get_pyramid_level(i), nullptr, nullptr, _offsets.get() + i, _pyramid->get_pyramid_level(i + 1), InterpolationPolicy::NEAREST_NEIGHBOR, - border_mode == BorderMode::UNDEFINED); - - _offsets[i].allocator()->allocate(); + /* Configure scale */ + _scale_nearest[i].configure(_tmp.get_pyramid_level(i), _pyramid->get_pyramid_level(i + 1), InterpolationPolicy::NEAREST_NEIGHBOR, BorderMode::UNDEFINED); } _tmp.allocate(); @@ -182,6 +170,6 @@ void NEGaussianPyramidOrb::run() for(unsigned int i = 0; i < num_levels - 1; ++i) { _gaus5x5[i].run(); - NEScheduler::get().schedule(_scale_nearest.get() + i, Window::DimY); + _scale_nearest[i].run(); } } -- cgit v1.2.1