From ceb889efc302464efd7fd20001d8a89a06c4e0bd Mon Sep 17 00:00:00 2001 From: Michalis Spyrou Date: Mon, 17 Sep 2018 18:24:41 +0100 Subject: COMPMID-1588 Create UpsampleKernel for YOLOLayer Change-Id: Ic1f9e85306a0a0b1459c9f9aa35bd629deea1710 Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/148797 Tested-by: bsgcomp Reviewed-by: Anthony Barbier Reviewed-by: Georgios Pinitas --- tests/validation/CL/UpsampleLayer.cpp | 148 +++++++++++++++++++++++ tests/validation/fixtures/UpsampleLayerFixture.h | 116 ++++++++++++++++++ tests/validation/reference/UpsampleLayer.cpp | 86 +++++++++++++ tests/validation/reference/UpsampleLayer.h | 45 +++++++ 4 files changed, 395 insertions(+) create mode 100644 tests/validation/CL/UpsampleLayer.cpp create mode 100644 tests/validation/fixtures/UpsampleLayerFixture.h create mode 100644 tests/validation/reference/UpsampleLayer.cpp create mode 100644 tests/validation/reference/UpsampleLayer.h (limited to 'tests/validation') diff --git a/tests/validation/CL/UpsampleLayer.cpp b/tests/validation/CL/UpsampleLayer.cpp new file mode 100644 index 0000000000..31ad8c1717 --- /dev/null +++ b/tests/validation/CL/UpsampleLayer.cpp @@ -0,0 +1,148 @@ +/* + * 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 "arm_compute/core/Types.h" +#include "arm_compute/runtime/CL/CLTensor.h" +#include "arm_compute/runtime/CL/CLTensorAllocator.h" +#include "arm_compute/runtime/CL/functions/CLUpsampleLayer.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Asserts.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/UpsampleLayerFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +constexpr AbsoluteTolerance tolerance(0.001f); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(UpsampleLayer) + +DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, (combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::F32))), + input_shape, data_type) +{ + InterpolationPolicy upsampling_policy = InterpolationPolicy::NEAREST_NEIGHBOR; + Size2D info = Size2D(2, 2); + + // Create tensors + CLTensor src = create_tensor(input_shape, data_type, 1); + CLTensor dst; + + ARM_COMPUTE_EXPECT(src.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_EXPECT(dst.info()->is_resizable(), framework::LogLevel::ERRORS); + + // Create and configure function + CLUpsampleLayer upsample; + upsample.configure(&src, &dst, info, upsampling_policy); + + // Validate valid region + const ValidRegion src_valid_region = shape_to_valid_region(src.info()->tensor_shape()); + const ValidRegion dst_valid_region = shape_to_valid_region(dst.info()->tensor_shape()); + + validate(src.info()->valid_region(), src_valid_region); + validate(dst.info()->valid_region(), dst_valid_region); +} + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(10U, 10U, 2U), 1, DataType::F32), // Mismatching data type + TensorInfo(TensorShape(10U, 10U, 2U), 1, DataType::F32), // Invalid output shape + TensorInfo(TensorShape(10U, 10U, 2U), 1, DataType::F32), // Invalid stride + TensorInfo(TensorShape(10U, 10U, 2U), 1, DataType::F32), // Invalid policy + TensorInfo(TensorShape(10U, 10U, 2U), 1, DataType::F32), + }), + framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(20U, 20U, 2U), 1, DataType::F16), + TensorInfo(TensorShape(20U, 10U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(20U, 20U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(20U, 20U, 2U), 1, DataType::F32), + TensorInfo(TensorShape(20U, 20U, 2U), 1, DataType::F32), + })), + framework::dataset::make("PadInfo", { Size2D(2, 2), + Size2D(2, 2), + Size2D(1, 1), + Size2D(2, 2), + Size2D(2, 2), + })), + framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR, + InterpolationPolicy::NEAREST_NEIGHBOR, + InterpolationPolicy::NEAREST_NEIGHBOR, + InterpolationPolicy::BILINEAR, + InterpolationPolicy::NEAREST_NEIGHBOR, + })), + framework::dataset::make("Expected", { false, false, false, false, true })), + input_info, output_info, pad_info, upsampling_policy, expected) +{ + bool is_valid = bool(CLUpsampleLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), pad_info, upsampling_policy)); + ARM_COMPUTE_EXPECT(is_valid == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +template +using CLUpsampleLayerFixture = UpsampleLayerFixture; + +TEST_SUITE(Float) +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLUpsampleLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), + framework::dataset::make("DataType", DataType::F32)), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), + framework::dataset::make("PadInfo", { Size2D(2, 2) })), + framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance); +} +TEST_SUITE_END() // FP32 + +TEST_SUITE(FP16) + +FIXTURE_DATA_TEST_CASE(RunSmall, CLUpsampleLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), + framework::dataset::make("DataType", + DataType::F16)), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), + framework::dataset::make("PadInfo", { Size2D(2, 2) })), + framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance); +} + +TEST_SUITE_END() // FP16 +TEST_SUITE_END() // Float + +TEST_SUITE_END() // UpsampleLayer +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/UpsampleLayerFixture.h b/tests/validation/fixtures/UpsampleLayerFixture.h new file mode 100644 index 0000000000..8fc3565e18 --- /dev/null +++ b/tests/validation/fixtures/UpsampleLayerFixture.h @@ -0,0 +1,116 @@ +/* + * 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 "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.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/Helpers.h" +#include "tests/validation/reference/UpsampleLayer.h" + +#include + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class UpsampleLayerFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, + Size2D info, const InterpolationPolicy &upsampling_policy) + { + _data_type = data_type; + + _target = compute_target(input_shape, info, upsampling_policy, data_type, data_layout); + _reference = compute_reference(input_shape, info, upsampling_policy, data_type); + } + +protected: + template + void fill(U &&tensor, int i) + { + library->fill_tensor_uniform(tensor, i); + } + + TensorType compute_target(TensorShape input_shape, + const Size2D &info, const InterpolationPolicy &upsampling_policy, DataType data_type, DataLayout data_layout) + { + if(data_layout == DataLayout::NHWC) + { + permute(input_shape, PermutationVector(2U, 0U, 1U)); + } + + // Create tensors + TensorType src = create_tensor(input_shape, data_type, 1, QuantizationInfo(), data_layout); + TensorType dst; + + // Create and configure function + FunctionType upsample; + upsample.configure(&src, &dst, info, upsampling_policy); + + 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), 0); + + // Compute DeconvolutionLayer function + upsample.run(); + + return dst; + } + + SimpleTensor compute_reference(const TensorShape &input_shape, + const Size2D &info, const InterpolationPolicy &upsampling_policy, DataType data_type) + { + // Create reference + SimpleTensor src{ input_shape, data_type }; + + // Fill reference + fill(src, 0); + + return reference::upsample_layer(src, info, upsampling_policy); + } + + TensorType _target{}; + SimpleTensor _reference{}; + DataType _data_type{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/UpsampleLayer.cpp b/tests/validation/reference/UpsampleLayer.cpp new file mode 100644 index 0000000000..3a340d0905 --- /dev/null +++ b/tests/validation/reference/UpsampleLayer.cpp @@ -0,0 +1,86 @@ +/* + * 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 "UpsampleLayer.h" + +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor upsample_layer(const SimpleTensor &src, + const Size2D &info, const InterpolationPolicy upsampling_policy) +{ + ARM_COMPUTE_ERROR_ON(upsampling_policy != InterpolationPolicy::NEAREST_NEIGHBOR); + ARM_COMPUTE_UNUSED(upsampling_policy); + + TensorShape output_shape = src.shape(); + output_shape.set(0, src.shape().x() * info.x()); + output_shape.set(1, src.shape().y() * info.y()); + + // Create reference + const int stride_x = info.x(); + const int stride_y = info.y(); + int width_out = output_shape.x(); + int height_out = output_shape.y(); + SimpleTensor out{ output_shape, src.data_type(), 1, src.quantization_info() }; + + const int width_in = src.shape().x(); + const int height_in = src.shape().y(); + const int num_2d_slices = src.shape().total_size() / (width_in * height_in); + + for(int slice = 0; slice < num_2d_slices; ++slice) + { + const int offset_slice_in = slice * width_in * height_in; + const int offset_slice_out = slice * height_out * width_out; + for(int y = 0; y < height_out; ++y) + { + for(int x = 0; x < width_out; ++x) + { + const int out_offset = y * width_out + x; + const int in_offset = (y / stride_y) * width_in + x / stride_x; + + T *_out = out.data() + offset_slice_out + out_offset; + const T *in = src.data() + offset_slice_in + in_offset; + *_out = *in; + } + } + } + + return out; +} + +template SimpleTensor upsample_layer(const SimpleTensor &src, + const Size2D &info, const InterpolationPolicy upsampling_policy); +template SimpleTensor upsample_layer(const SimpleTensor &src, + const Size2D &info, const InterpolationPolicy upsampling_policy); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/UpsampleLayer.h b/tests/validation/reference/UpsampleLayer.h new file mode 100644 index 0000000000..fc1da39186 --- /dev/null +++ b/tests/validation/reference/UpsampleLayer.h @@ -0,0 +1,45 @@ +/* + * 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. + */ +#ifndef __ARM_COMPUTE_TEST_UPSAMPLE_LAYER_H__ +#define __ARM_COMPUTE_TEST_UPSAMPLE_LAYER_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor upsample_layer(const SimpleTensor &src, + const Size2D &info, const InterpolationPolicy upsampling_policy); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_UPSAMPLE_LAYER_H__ */ -- cgit v1.2.1