From c53266e45f3c8c07dff88c61e5bfa01c6d3ba3f0 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 9 Dec 2020 03:11:53 +0000 Subject: Remove (CL/NE)UpsampleLayer in favor to (NE/CL)Scale Upsample functions and kernels can be replaced with the Scale as they provide same functionality Partially resolves: COMPMID-3996 Signed-off-by: Georgios Pinitas Change-Id: Ic2f9ba352c183aa87d69d551d5c172d0f22119e8 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4679 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- tests/validation/CL/UpsampleLayer.cpp | 151 ----------------------- tests/validation/NEON/Upsample.cpp | 147 ---------------------- tests/validation/fixtures/UpsampleLayerFixture.h | 148 ---------------------- tests/validation/reference/UpsampleLayer.cpp | 89 ------------- tests/validation/reference/UpsampleLayer.h | 45 ------- 5 files changed, 580 deletions(-) delete mode 100644 tests/validation/CL/UpsampleLayer.cpp delete mode 100644 tests/validation/NEON/Upsample.cpp delete mode 100644 tests/validation/fixtures/UpsampleLayerFixture.h delete mode 100644 tests/validation/reference/UpsampleLayer.cpp delete 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 deleted file mode 100644 index eff51a487c..0000000000 --- a/tests/validation/CL/UpsampleLayer.cpp +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2018-2020 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) - -// *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* - -TEST_SUITE(Float) -template -using CLUpsampleLayerFixture = UpsampleLayerFixture; -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(Quantized) -template -using CLUpsampleLayerQuantizedFixture = UpsampleLayerQuantizedFixture; -TEST_SUITE(QASYMM8) -FIXTURE_DATA_TEST_CASE(RunSmall, CLUpsampleLayerQuantizedFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(datasets::SmallShapes(), - framework::dataset::make("DataType", DataType::QASYMM8)), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("PadInfo", { Size2D(2, 2) })), - framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f / 255.f, 10) }))) -{ - // Validate output - validate(CLAccessor(_target), _reference, tolerance); -} -TEST_SUITE_END() // QASYMM8 -TEST_SUITE(QASYMM8_SIGNED) -FIXTURE_DATA_TEST_CASE(RunSmall, CLUpsampleLayerQuantizedFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(datasets::SmallShapes(), - framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("PadInfo", { Size2D(2, 2) })), - framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR })), - framework::dataset::make("QuantizationInfo", { QuantizationInfo(1.f / 255.f, 10) }))) -{ - // Validate output - validate(CLAccessor(_target), _reference, tolerance); -} -TEST_SUITE_END() // QASYMM8_SIGNED -TEST_SUITE_END() // Quantized - -TEST_SUITE_END() // UpsampleLayer -TEST_SUITE_END() // CL -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/NEON/Upsample.cpp b/tests/validation/NEON/Upsample.cpp deleted file mode 100644 index 799e513fb1..0000000000 --- a/tests/validation/NEON/Upsample.cpp +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (c) 2018-2020 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/NEON/functions/NEUpsampleLayer.h" -#include "tests/NEON/Accessor.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 -{ -TEST_SUITE(NEON) -TEST_SUITE(UpsampleLayer) - -// *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(32U, 32U), 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(64U, 64U), 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, policy, expected) -{ - bool is_valid = bool(NEUpsampleLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false), pad_info, policy)); - ARM_COMPUTE_EXPECT(is_valid == expected, framework::LogLevel::ERRORS); -} -// clang-format on -// *INDENT-ON* - -template -using NEUpsampleLayerFixture = UpsampleLayerFixture; - -template -using NEUpsampleLayerQuantizedFixture = UpsampleLayerQuantizedFixture; - -TEST_SUITE(Float) -TEST_SUITE(FP32) -FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerFixture, 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(Accessor(_target), _reference); -} -TEST_SUITE_END() // FP32 - -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC -TEST_SUITE(FP16) -FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerFixture, 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(Accessor(_target), _reference); -} -TEST_SUITE_END() // FP16 -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ -TEST_SUITE_END() // Float - -TEST_SUITE(Quantized) -TEST_SUITE(QASYMM8) -FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerQuantizedFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(datasets::SmallShapes(), - framework::dataset::make("DataType", DataType::QASYMM8)), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("PadInfo", { Size2D(2, 2) })), - framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR })), - framework::dataset::make("QuantizationInfo", QuantizationInfo(2.f / 255.f, 10)))) -{ - // Validate output - validate(Accessor(_target), _reference); -} -TEST_SUITE_END() // QASYMM8 -TEST_SUITE(QASYMM8_SIGNED) -FIXTURE_DATA_TEST_CASE(RunSmall, NEUpsampleLayerQuantizedFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(combine(datasets::SmallShapes(), - framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("PadInfo", { Size2D(2, 2) })), - framework::dataset::make("UpsamplingPolicy", { InterpolationPolicy::NEAREST_NEIGHBOR })), - framework::dataset::make("QuantizationInfo", QuantizationInfo(2.f / 255.f, 10)))) -{ - // Validate output - validate(Accessor(_target), _reference); -} -TEST_SUITE_END() // QASYMM8_SIGNED -TEST_SUITE_END() // Quantized - -TEST_SUITE_END() // UpsampleLayer -TEST_SUITE_END() // NEON - -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/fixtures/UpsampleLayerFixture.h b/tests/validation/fixtures/UpsampleLayerFixture.h deleted file mode 100644 index f7ec91f44a..0000000000 --- a/tests/validation/fixtures/UpsampleLayerFixture.h +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2018-2020 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 UpsampleLayerFixtureBase : public framework::Fixture -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy, QuantizationInfo quantization_info) - { - _data_type = data_type; - - _target = compute_target(input_shape, info, policy, data_type, data_layout, quantization_info); - _reference = compute_reference(input_shape, info, policy, data_type, quantization_info); - } - -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 &policy, - DataType data_type, DataLayout data_layout, QuantizationInfo quantization_info) - { - TensorShape output_shape(input_shape); - output_shape.set(0, info.x() * input_shape[0]); - output_shape.set(1, info.y() * input_shape[1]); - - if(data_layout == DataLayout::NHWC) - { - permute(input_shape, PermutationVector(2U, 0U, 1U)); - permute(output_shape, PermutationVector(2U, 0U, 1U)); - } - - // Create tensors - TensorType src = create_tensor(input_shape, data_type, 1, quantization_info, data_layout); - TensorType dst = create_tensor(output_shape, data_type, 1, quantization_info, data_layout); - - // Create and configure function - FunctionType upsample; - upsample.configure(&src, &dst, info, 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 &policy, - DataType data_type, QuantizationInfo quantization_info) - { - // Create reference - SimpleTensor src{ input_shape, data_type, 1, quantization_info }; - - // Fill reference - fill(src, 0); - - return reference::upsample_layer(src, info, policy); - } - - TensorType _target{}; - SimpleTensor _reference{}; - DataType _data_type{}; -}; - -template -class UpsampleLayerFixture : public UpsampleLayerFixtureBase -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy) - { - UpsampleLayerFixtureBase::setup(input_shape, data_type, data_layout, - info, policy, QuantizationInfo()); - } -}; - -template -class UpsampleLayerQuantizedFixture : public UpsampleLayerFixtureBase -{ -public: - template - void setup(TensorShape input_shape, DataType data_type, DataLayout data_layout, - Size2D info, const InterpolationPolicy &policy, QuantizationInfo quantization_info) - { - UpsampleLayerFixtureBase::setup(input_shape, data_type, data_layout, - info, policy, quantization_info); - } -}; - -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/reference/UpsampleLayer.cpp b/tests/validation/reference/UpsampleLayer.cpp deleted file mode 100644 index e5eb3760a7..0000000000 --- a/tests/validation/reference/UpsampleLayer.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 2018-2020 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 "support/Requires.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 policy) -{ - ARM_COMPUTE_ERROR_ON(policy != InterpolationPolicy::NEAREST_NEIGHBOR); - ARM_COMPUTE_UNUSED(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 policy); -template SimpleTensor upsample_layer(const SimpleTensor &src, - const Size2D &info, const InterpolationPolicy policy); -template SimpleTensor upsample_layer(const SimpleTensor &src, - const Size2D &info, const InterpolationPolicy policy); -template SimpleTensor upsample_layer(const SimpleTensor &src, - const Size2D &info, const InterpolationPolicy policy); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/reference/UpsampleLayer.h b/tests/validation/reference/UpsampleLayer.h deleted file mode 100644 index b1d8398cdb..0000000000 --- a/tests/validation/reference/UpsampleLayer.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2018-2019 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 policy); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_UPSAMPLE_LAYER_H */ -- cgit v1.2.1