From 69af6cf5ec6edce564dd5ef97baba5a1325e8763 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 14 Feb 2018 19:23:44 +0000 Subject: COMPMID-765: Sanitize permutation vector for Permute. If permutation vector is bigger than the tensorshape to permute then infer dimensions of size one for the extra dimensions. Change-Id: I5addb292f770d925f47f756902e16073039e8f71 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/120473 Tested-by: Jenkins Reviewed-by: Stefana Simion Reviewed-by: Anthony Barbier --- tests/validation/NEON/DepthwiseConvolutionLayer.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'tests/validation/NEON/DepthwiseConvolutionLayer.cpp') diff --git a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp index 47e8896fd6..0cdd4c0296 100644 --- a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp +++ b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp @@ -82,8 +82,11 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(framework::da validate(bias.info()->valid_region(), bias_valid_region); // Validate padding - const int step = 16 >> info.stride().first; - const PaddingSize padding = PaddingCalculator(output_shape.x(), step).required_padding(); + bool is_optimized_run = NEDepthwiseConvolutionLayer3x3Kernel::is_optimized_execution_possible(input_shape, info, data_type, DataLayout::NCHW); + const int step_non_opt_dwc = 16 >> info.stride().first; + const int step_bias_add = 16 / src.info()->element_size(); + const int step = is_optimized_run ? step_bias_add : std::max(step_non_opt_dwc, step_bias_add); + const PaddingSize padding = PaddingCalculator(output_shape.x(), step).required_padding(); validate(dst.info()->padding(), padding); } -- cgit v1.2.1