From 9a7182e8b53ab77d26b56752cc95b80f4e1774f2 Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Tue, 11 Jul 2017 18:36:40 +0100 Subject: COMPMID-443 Use 3D tensor for pixel multiply (Needed for Normalization Layer) Change-Id: I117688f12334e6afc705c863acdf71b0bb1fc6e8 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/80352 Tested-by: Kaizen Reviewed-by: Georgios Pinitas --- src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp') diff --git a/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp b/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp index b95e8fac73..33c8b81c1d 100644 --- a/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp +++ b/src/core/CL/kernels/CLPixelWiseMultiplicationKernel.cpp @@ -149,7 +149,7 @@ void CLPixelWiseMultiplicationKernel::configure(const ICLTensor *input1, const I _kernel = static_cast(CLKernelLibrary::get().create_kernel(kernel_name, build_opts)); // Set scale argument - unsigned int idx = 3 * num_arguments_per_2D_tensor(); //Skip the inputs and output parameters + unsigned int idx = 3 * num_arguments_per_3D_tensor(); //Skip the inputs and output parameters if(scale_int >= 0) { @@ -183,15 +183,15 @@ void CLPixelWiseMultiplicationKernel::run(const Window &window, cl::CommandQueue ARM_COMPUTE_ERROR_ON_UNCONFIGURED_KERNEL(this); ARM_COMPUTE_ERROR_ON_INVALID_SUBWINDOW(ICLKernel::window(), window); - Window slice = window.first_slice_window_2D(); + Window slice = window.first_slice_window_3D(); do { unsigned int idx = 0; - add_2D_tensor_argument(idx, _input1, slice); - add_2D_tensor_argument(idx, _input2, slice); - add_2D_tensor_argument(idx, _output, slice); + add_3D_tensor_argument(idx, _input1, slice); + add_3D_tensor_argument(idx, _input2, slice); + add_3D_tensor_argument(idx, _output, slice); enqueue(queue, *this, slice); } - while(window.slide_window_slice_2D(slice)); + while(window.slide_window_slice_3D(slice)); } -- cgit v1.2.1