From 4ad6598e4ab54d450162b97e9db9b5e314b7cb3d Mon Sep 17 00:00:00 2001 From: Isabella Gottardi Date: Thu, 25 Oct 2018 17:42:19 +0100 Subject: COMPMID-1451: Fix CL/NEPermuteKernel PermuteVection check COMPMID-1690: Add tests for NEPermute with PermutationVector dimension > 3 Change-Id: I4bfc6ff88cd46863c2e39975b5663c624db1a63d Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/155316 Reviewed-by: Georgios Pinitas Tested-by: bsgcomp --- src/core/CL/kernels/CLPermuteKernel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/CL/kernels/CLPermuteKernel.cpp') diff --git a/src/core/CL/kernels/CLPermuteKernel.cpp b/src/core/CL/kernels/CLPermuteKernel.cpp index c6f0f4bc55..a9a2c5c97a 100644 --- a/src/core/CL/kernels/CLPermuteKernel.cpp +++ b/src/core/CL/kernels/CLPermuteKernel.cpp @@ -93,17 +93,17 @@ void CLPermuteKernel::configure(const ICLTensor *input, ICLTensor *output, const build_opts.emplace("-DDEPTH_IN=" + support::cpp11::to_string(input->info()->dimension(2))); // Run [2, 0, 1] permute - if(_perm[0] == 2 && _perm[1] == 0 && _perm[2] == 1) + if(_perm == PermutationVector{ 2U, 0U, 1U }) { _kernel = static_cast(CLKernelLibrary::get().create_kernel("permute_201", build_opts)); } // Run [1, 2, 0] permute - else if(_perm[0] == 1 && _perm[1] == 2 && _perm[2] == 0) + else if(_perm == PermutationVector{ 1U, 2U, 0U }) { _kernel = static_cast(CLKernelLibrary::get().create_kernel("permute_120", build_opts)); } // Run [3, 2, 0, 1] permute - else if(_perm[0] == 3 && _perm[1] == 2 && _perm[2] == 0 && _perm[3] == 1) + else if(_perm == PermutationVector{ 3U, 2U, 0U, 1U }) { _kernel = static_cast(CLKernelLibrary::get().create_kernel("permute_3201", build_opts)); } -- cgit v1.2.1