From 995f55252dfaaa5b64075b96272ae11e23d6ca9b Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Mon, 29 Jan 2018 13:43:35 +0000 Subject: COMPMID-864 Window::collapse_if_possible() is misused in several CL kernels Removed unnecessary collapse_if_possible() calls. Change-Id: I6f3434bc4a26470c4de5bac4e3d90b4b019c2c9c Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/117993 Reviewed-by: Michalis Spyrou Tested-by: Jenkins Reviewed-by: Georgios Pinitas --- src/core/CL/kernels/CLQuantizationLayerKernel.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'src/core/CL/kernels/CLQuantizationLayerKernel.cpp') diff --git a/src/core/CL/kernels/CLQuantizationLayerKernel.cpp b/src/core/CL/kernels/CLQuantizationLayerKernel.cpp index 47564436a9..8b082a8704 100644 --- a/src/core/CL/kernels/CLQuantizationLayerKernel.cpp +++ b/src/core/CL/kernels/CLQuantizationLayerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -82,20 +82,16 @@ void CLQuantizationLayerKernel::run(const Window &window, cl::CommandQueue &queu Window window_collapsed = window.collapse_if_possible(ICLKernel::window(), 3); Window slice = window_collapsed.first_slice_window_3D(); - Window window_min_max; - window_min_max.use_tensor_dimensions(_min_max->info()->tensor_shape()); - window_min_max.set(Window::DimX, Window::Dimension(0, 1, 1)); - window_min_max.collapse_if_possible(ICLKernel::window(), 1); - - Window slice_min_max = window_min_max.first_slice_window_1D(); - do { + Window slice_min_max = slice.shift_dimensions(2); + slice_min_max.set(Window::DimX, Window::Dimension(0, 1, 1)); + unsigned int idx = 0; add_3D_tensor_argument(idx, _input, slice); add_3D_tensor_argument(idx, _output, slice); add_1D_tensor_argument(idx, _min_max, slice_min_max); enqueue(queue, *this, slice); } - while(window.slide_window_slice_3D(slice) && window_min_max.slide_window_slice_1D(slice_min_max)); + while(window_collapsed.slide_window_slice_3D(slice)); } -- cgit v1.2.1