From 156fcf3f36f6168e47d65db167bba3af5037e3d9 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Fri, 9 Mar 2018 15:30:43 +0000 Subject: 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 Reviewed-by: Pablo Tello --- tests/validation/fixtures/FlattenLayerFixture.h | 23 +++-- tests/validation/fixtures/Im2ColFixture.h | 132 ++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 9 deletions(-) create mode 100644 tests/validation/fixtures/Im2ColFixture.h (limited to 'tests/validation/fixtures') diff --git a/tests/validation/fixtures/FlattenLayerFixture.h b/tests/validation/fixtures/FlattenLayerFixture.h index 3de0ba45ae..ef94ea83b0 100644 --- a/tests/validation/fixtures/FlattenLayerFixture.h +++ b/tests/validation/fixtures/FlattenLayerFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,6 +27,7 @@ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" #include "arm_compute/core/Utils.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" #include "arm_compute/runtime/Tensor.h" #include "tests/AssetsLibrary.h" #include "tests/Globals.h" @@ -43,6 +44,8 @@ namespace test { namespace validation { +using namespace arm_compute::misc::shape_calculator; + template class FlattenLayerValidationFixture : public framework::Fixture { @@ -51,8 +54,13 @@ public: void setup(TensorShape shape, DataType data_type) { _fractional_bits = is_data_type_fixed_point(data_type) ? 4 : 0; - _target = compute_target(shape, data_type); - _reference = compute_reference(shape, data_type); + + TensorShape shape_flatten; + TensorInfo input_info(shape, 1, data_type, _fractional_bits); + shape_flatten = compute_im2col_flatten_shape(&input_info); + + _target = compute_target(shape, shape_flatten, data_type); + _reference = compute_reference(shape, shape_flatten, data_type); ARM_COMPUTE_ERROR_ON_MISMATCHING_DIMENSIONS(_target.info()->tensor_shape(), _reference.shape()); } @@ -73,11 +81,8 @@ protected: } } - TensorType compute_target(const TensorShape &shape, DataType data_type) + TensorType compute_target(const TensorShape &shape, const TensorShape &shape_flatten, DataType data_type) { - TensorShape shape_flatten(shape); - shape_flatten.collapse(3); - // Create tensors TensorType src = create_tensor(shape, data_type, 1, _fractional_bits); TensorType dst = create_tensor(shape_flatten, data_type, 1, _fractional_bits); @@ -105,7 +110,7 @@ protected: return dst; } - SimpleTensor compute_reference(const TensorShape &shape, DataType data_type) + SimpleTensor compute_reference(const TensorShape &shape, const TensorShape &shape_flatten, DataType data_type) { // Create reference SimpleTensor src{ shape, data_type, 1, _fractional_bits }; @@ -113,7 +118,7 @@ protected: // Fill reference fill(src); - return reference::flatten_layer(src); + return reference::flatten_layer(src, shape_flatten); } TensorType _target{}; diff --git a/tests/validation/fixtures/Im2ColFixture.h b/tests/validation/fixtures/Im2ColFixture.h new file mode 100644 index 0000000000..f403aa9d21 --- /dev/null +++ b/tests/validation/fixtures/Im2ColFixture.h @@ -0,0 +1,132 @@ +/* + * 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_FIXTURE +#define ARM_COMPUTE_TEST_IM2COL_FIXTURE + +#include "arm_compute/core/Helpers.h" +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "arm_compute/core/utils/misc/ShapeCalculator.h" +#include "arm_compute/runtime/Tensor.h" +#include "tests/AssetsLibrary.h" +#include "tests/Globals.h" +#include "tests/IAccessor.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Fixture.h" +#include "tests/validation/reference/Im2Col.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +using namespace arm_compute::misc::shape_calculator; + +template +class Im2ColValidationFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, DataType data_type, const Size2D &kernel_dims, const PadStrideInfo &conv_info, const QuantizationInfo &quant_info, const DataLayout &data_layout) + { + _kernel_dims = kernel_dims; + _conv_info = conv_info; + _quant_info = quant_info; + _data_layout = data_layout; + _has_bias = data_type != DataType::QASYMM8; + + if(_data_layout == DataLayout::NHWC) + { + permute(shape, PermutationVector(2U, 0U, 1U)); + } + + TensorShape output_shape; + TensorInfo input_info(shape, 1, data_type); + input_info.set_data_layout(_data_layout); + output_shape = compute_im2col_conv_shape(&input_info, _kernel_dims, _conv_info, _has_bias, Size2D(1U, 1U)); + + _target = compute_target(shape, output_shape, data_type); + _reference = compute_reference(shape, output_shape, data_type); + } + +protected: + template + void fill(U &&tensor) + { + library->fill_tensor_uniform(tensor, 0); + } + + TensorType compute_target(const TensorShape &shape, const TensorShape &output_shape, DataType data_type) + { + // Create tensors + TensorType src = create_tensor(shape, data_type, 1, 0, _quant_info, _data_layout); + TensorType dst = create_tensor(output_shape, data_type, 1, 0, _quant_info, _data_layout); + + // Create and configure function + FunctionType im2col_func; + im2col_func.configure(&src, &dst, _kernel_dims, _conv_info, _has_bias); + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Allocate tensors + src.allocator()->allocate(); + dst.allocator()->allocate(); + + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Fill tensors + fill(AccessorType(src)); + + // Compute function + im2col_func.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &shape, const TensorShape &output_shape, DataType data_type) + { + // Create reference + SimpleTensor src{ shape, data_type, 1, 0, _quant_info, _data_layout }; + + // Fill reference + fill(src); + + return reference::im2col(src, output_shape, _kernel_dims, _conv_info, _has_bias); + } + + TensorType _target{}; + SimpleTensor _reference{}; + Size2D _kernel_dims{}; + PadStrideInfo _conv_info{}; + DataLayout _data_layout{}; + QuantizationInfo _quant_info{}; + bool _has_bias{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_IM2COL_FIXTURE */ -- cgit v1.2.1