From f92cb23f06572fe73ec5ab9da0ec5713724c2dde Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Thu, 29 Mar 2018 11:51:54 +0100 Subject: COMPMID-959: Collapse window in activation layer for GLES. Change-Id: Ic1dd95966248b31befa78f737845dc856e46dd19 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/126280 Tested-by: Jenkins Reviewed-by: Anthony Barbier --- src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp') diff --git a/src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp b/src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp index d7c645d09d..828782338c 100644 --- a/src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp +++ b/src/core/GLES_COMPUTE/kernels/GCActivationLayerKernel.cpp @@ -111,8 +111,9 @@ void GCActivationLayerKernel::run(const Window &window) _output->set_needs_shifting(true); - Window slice = window.first_slice_window_3D(); - Window slice_in = window.first_slice_window_3D(); + Window collapsed = window.collapse_if_possible(IGCKernel::window(), Window::DimZ); + Window slice = collapsed.first_slice_window_3D(); + Window slice_in = collapsed.first_slice_window_3D(); slice.shift(Window::DimX, -(_output->info()->padding()).left); @@ -125,10 +126,10 @@ void GCActivationLayerKernel::run(const Window &window) { unsigned int idx = 0; unsigned int binding = 1; - add_3D_tensor_argument(idx, _input, binding++, slice_in); - add_3D_tensor_argument(idx, _output, binding++, slice); + add_3D_tensor_argument(idx, _input, binding++, slice); + add_3D_tensor_argument(idx, _output, binding++, slice_in); _kernel.update_shader_params(); enqueue(*this, slice); } - while(window.slide_window_slice_3D(slice) && window.slide_window_slice_3D(slice_in)); + while(collapsed.slide_window_slice_3D(slice) && collapsed.slide_window_slice_3D(slice_in)); } -- cgit v1.2.1