diff options
author | Giorgio Arena <giorgio.arena@arm.com> | 2018-03-09 15:30:43 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:16 +0000 |
commit | 156fcf3f36f6168e47d65db167bba3af5037e3d9 (patch) | |
tree | 89240783068a72b918791cf18a613eb43b93035d /tests/validation/reference | |
parent | 8de92619e223225aabdca873c02f231d8e941fd1 (diff) | |
download | ComputeLibrary-156fcf3f36f6168e47d65db167bba3af5037e3d9.tar.gz |
COMPMID-802 Add NHWC data format support for NEON im2col.
Change-Id: I86e678179106a2b83d1c6a7cfe562df91b0f9eb2
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/124000
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
Diffstat (limited to 'tests/validation/reference')
-rw-r--r-- | tests/validation/reference/FlattenLayer.cpp | 16 | ||||
-rw-r--r-- | tests/validation/reference/FlattenLayer.h | 4 | ||||
-rw-r--r-- | tests/validation/reference/Im2Col.cpp | 109 | ||||
-rw-r--r-- | tests/validation/reference/Im2Col.h | 43 | ||||
-rw-r--r-- | tests/validation/reference/Permute.cpp | 6 |
5 files changed, 164 insertions, 14 deletions
diff --git a/tests/validation/reference/FlattenLayer.cpp b/tests/validation/reference/FlattenLayer.cpp index 611701d8cf..44f4d93178 100644 --- a/tests/validation/reference/FlattenLayer.cpp +++ b/tests/validation/reference/FlattenLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -34,12 +34,8 @@ namespace validation namespace reference { template <typename T> -SimpleTensor<T> flatten_layer(const SimpleTensor<T> &src) +SimpleTensor<T> flatten_layer(const SimpleTensor<T> &src, const TensorShape &shape_flatten) { - TensorShape shape_flatten(src.shape()); - shape_flatten.set(0, src.shape()[0] * src.shape()[1] * src.shape()[2]); - shape_flatten.remove_dimension(1); - shape_flatten.remove_dimension(1); SimpleTensor<T> dst(shape_flatten, src.data_type(), 1, src.fixed_point_position()); // Note: Since the reference implementation does not use padding bytes, we can copy directly the content of the source tensor @@ -48,10 +44,10 @@ SimpleTensor<T> flatten_layer(const SimpleTensor<T> &src) return dst; } -template SimpleTensor<float> flatten_layer(const SimpleTensor<float> &src); -template SimpleTensor<half> flatten_layer(const SimpleTensor<half> &src); -template SimpleTensor<qint8_t> flatten_layer(const SimpleTensor<qint8_t> &src); -template SimpleTensor<qint16_t> flatten_layer(const SimpleTensor<qint16_t> &src); +template SimpleTensor<float> flatten_layer(const SimpleTensor<float> &src, const TensorShape &shape_flatten); +template SimpleTensor<half> flatten_layer(const SimpleTensor<half> &src, const TensorShape &shape_flatten); +template SimpleTensor<qint8_t> flatten_layer(const SimpleTensor<qint8_t> &src, const TensorShape &shape_flatten); +template SimpleTensor<qint16_t> flatten_layer(const SimpleTensor<qint16_t> &src, const TensorShape &shape_flatten); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/FlattenLayer.h b/tests/validation/reference/FlattenLayer.h index b1286fe2bd..5ccd429e3b 100644 --- a/tests/validation/reference/FlattenLayer.h +++ b/tests/validation/reference/FlattenLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -36,7 +36,7 @@ namespace validation namespace reference { template <typename T> -SimpleTensor<T> flatten_layer(const SimpleTensor<T> &src); +SimpleTensor<T> flatten_layer(const SimpleTensor<T> &src, const TensorShape &shape_flatten); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation/reference/Im2Col.cpp b/tests/validation/reference/Im2Col.cpp new file mode 100644 index 0000000000..825f0a6ee1 --- /dev/null +++ b/tests/validation/reference/Im2Col.cpp @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include "Im2Col.h" + +#include "Permute.h" + +#include "arm_compute/core/Types.h" +#include "tests/validation/Helpers.h" +#include "tests/validation/reference/Utils.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template <typename T> +void im2col_nchw(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias) +{ + // Create reference + const int pad_x = conv_info.pad().first; + const int pad_y = conv_info.pad().second; + const int stride_x = conv_info.stride().first; + const int stride_y = conv_info.stride().second; + const int kernel_width = kernel_dims.width; + const int kernel_height = kernel_dims.height; + const int src_width = src.shape().x(); + const int src_height = src.shape().y(); + const int src_depth = src.shape().z(); + const int batches = src.shape().total_size_upper(3); + const int pad_val = is_data_type_quantized_asymmetric(src.data_type()) ? src.quantization_info().offset : 0; + + int dst_idx = 0; + for(int b = 0; b < batches; ++b) + { + for(int y = -pad_y; y <= (src_height + pad_y - kernel_height); y += stride_y) + { + for(int x = -pad_x; x <= (src_width + pad_x - kernel_width); x += stride_x) + { + for(int z = 0; z < src_depth; ++z) + { + for(int patch_y = y; patch_y < (y + kernel_height); ++patch_y) + { + for(int patch_x = x; patch_x < (x + kernel_width); ++patch_x) + { + dst[dst_idx++] = tensor_elem_at(src, Coordinates(patch_x, patch_y, z, b), BorderMode::CONSTANT, static_cast<T>(pad_val)); + } + } + } + + if(has_bias) + { + dst[dst_idx++] = static_cast<T>(1); + } + } + } + } +} + +template <typename T> +SimpleTensor<T> im2col(const SimpleTensor<T> &src, const TensorShape &dst_shape, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias) +{ + SimpleTensor<T> dst{ dst_shape, src.data_type(), 1, src.fixed_point_position(), src.quantization_info() }; + + if(src.data_layout() == DataLayout::NHWC) + { + SimpleTensor<T> src_nchw = reference::permute<T>(src, PermutationVector(1U, 2U, 0U)); + SimpleTensor<T> dst_nchw = reference::permute<T>(dst, PermutationVector(1U, 2U, 0U)); + + im2col_nchw(src_nchw, dst_nchw, kernel_dims, conv_info, has_bias); + + return reference::permute<T>(dst_nchw, PermutationVector(2U, 0U, 1U)); + } + + im2col_nchw(src, dst, kernel_dims, conv_info, has_bias); + + return dst; +} + +template SimpleTensor<uint8_t> im2col(const SimpleTensor<uint8_t> &src, const TensorShape &output_shape, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias); +template SimpleTensor<half> im2col(const SimpleTensor<half> &src, const TensorShape &output_shape, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias); +template SimpleTensor<float> im2col(const SimpleTensor<float> &src, const TensorShape &output_shape, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/Im2Col.h b/tests/validation/reference/Im2Col.h new file mode 100644 index 0000000000..4fe6ea9acf --- /dev/null +++ b/tests/validation/reference/Im2Col.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2017-2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef __ARM_COMPUTE_TEST_IM2COL_H__ +#define __ARM_COMPUTE_TEST_IM2COL_H__ + +#include "tests/SimpleTensor.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template <typename T> +SimpleTensor<T> im2col(const SimpleTensor<T> &src, const TensorShape &dst_shape, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_IM2COL_H__ */ diff --git a/tests/validation/reference/Permute.cpp b/tests/validation/reference/Permute.cpp index 4a12ca6959..db347e51f5 100644 --- a/tests/validation/reference/Permute.cpp +++ b/tests/validation/reference/Permute.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -42,7 +42,7 @@ SimpleTensor<T> permute(const SimpleTensor<T> &src, PermutationVector perm) permute(dst_shape, perm); // Create reference - SimpleTensor<T> dst{ dst_shape, src.data_type() }; + SimpleTensor<T> dst{ dst_shape, src.data_type(), src.num_channels(), src.fixed_point_position(), src.quantization_info() }; // Compute reference for(int i = 0; i < src.num_elements(); ++i) @@ -60,6 +60,8 @@ SimpleTensor<T> permute(const SimpleTensor<T> &src, PermutationVector perm) template SimpleTensor<uint8_t> permute(const SimpleTensor<uint8_t> &src, PermutationVector perm); template SimpleTensor<uint16_t> permute(const SimpleTensor<uint16_t> &src, PermutationVector perm); template SimpleTensor<uint32_t> permute(const SimpleTensor<uint32_t> &src, PermutationVector perm); +template SimpleTensor<float> permute(const SimpleTensor<float> &src, PermutationVector perm); +template SimpleTensor<half> permute(const SimpleTensor<half> &src, PermutationVector perm); } // namespace reference } // namespace validation } // namespace test |