diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2019-04-23 12:06:19 +0100 |
|---|---|---|
| committer | Pablo Marquez <pablo.tello@arm.com> | 2019-04-25 10:34:40 +0000 |
| commit | 0a33a2117018291ff9bb5df5a44e1285aa3f1e41 (patch) | |
| tree | fc3434c5a8f9b5fa1a204f15de61adac5e1a82c6 /src | |
| parent | ad5d7b09e8c4b883faf1ad575e51c401a96a6699 (diff) | |
| download | ComputeLibrary-0a33a2117018291ff9bb5df5a44e1285aa3f1e41.tar.gz | |
COMPMID-2114: CLBatchToSpace missing validation test
Added test cases to exercise block_x != block_y path.
Fixed CL back validation test to allow different block values for xy
Change-Id: I8c354aceec16d9b16c2f7fcd2cae3f09b747ec0a
Signed-off-by: Pablo Tello <pablo.tello@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1017
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Usama Arif <usama.arif@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp | 4 | ||||
| -rw-r--r-- | src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp b/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp index 58a8d104c0..aa06d3af8c 100644 --- a/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp +++ b/src/core/CL/kernels/CLBatchToSpaceLayerKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -66,7 +66,7 @@ Status validate_arguments_static(const ITensorInfo *input, const int block_shape const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); const int idx_channel = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL); ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_width] != (block_shape_x * input->tensor_shape()[idx_width])); - ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_height] != (block_shape_x * input->tensor_shape()[idx_height])); + ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_height] != (block_shape_y * input->tensor_shape()[idx_height])); ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_channel] != input->tensor_shape()[idx_channel]); ARM_COMPUTE_RETURN_ERROR_ON(output->num_dimensions() > 4); ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); diff --git a/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp b/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp index 8c24d9fad8..6211abcad0 100644 --- a/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp +++ b/src/core/NEON/kernels/NEBatchToSpaceLayerKernel.cpp @@ -63,7 +63,6 @@ Status validate_arguments_static(const ITensorInfo *input, const int block_shape const DataLayout data_layout = input->data_layout(); const int idx_batch = get_data_layout_dimension_index(data_layout, DataLayoutDimension::BATCHES); ARM_COMPUTE_RETURN_ERROR_ON(input->tensor_shape()[idx_batch] % (block_shape_x * block_shape_y) != 0); - // Validate output if initialized if(output->total_size() != 0) { @@ -71,7 +70,7 @@ Status validate_arguments_static(const ITensorInfo *input, const int block_shape const int idx_height = get_data_layout_dimension_index(data_layout, DataLayoutDimension::HEIGHT); const int idx_channel = get_data_layout_dimension_index(data_layout, DataLayoutDimension::CHANNEL); ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_width] != (block_shape_x * input->tensor_shape()[idx_width])); - ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_height] != (block_shape_x * input->tensor_shape()[idx_height])); + ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_height] != (block_shape_y * input->tensor_shape()[idx_height])); ARM_COMPUTE_RETURN_ERROR_ON(output->tensor_shape()[idx_channel] != input->tensor_shape()[idx_channel]); ARM_COMPUTE_RETURN_ERROR_ON(output->num_dimensions() > 4); ARM_COMPUTE_RETURN_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); |