From 5b48ad7d43c3d1c2fdbae64beac3f37bc6697338 Mon Sep 17 00:00:00 2001 From: Michele Di Giorgio Date: Tue, 4 Jun 2019 18:43:35 +0100 Subject: COMPMID-2386: Add support for CLMeanStdNormalizationLayer Change-Id: I0323b2410b222fd08933da22de455e798a60a0b1 Signed-off-by: Michele Di Giorgio Reviewed-on: https://review.mlplatform.org/c/1297 Comments-Addressed: Arm Jenkins Reviewed-by: Gian Marco Iodice Tested-by: Arm Jenkins --- .../validation/CL/MeanStdDevNormalizationLayer.cpp | 120 ++++++++++++++++++++ .../fixtures/MeanStdDevNormalizationLayerFixture.h | 124 +++++++++++++++++++++ .../reference/MeanStdDevNormalizationLayer.cpp | 71 ++++++++++++ .../reference/MeanStdDevNormalizationLayer.h | 45 ++++++++ 4 files changed, 360 insertions(+) create mode 100644 tests/validation/CL/MeanStdDevNormalizationLayer.cpp create mode 100644 tests/validation/fixtures/MeanStdDevNormalizationLayerFixture.h create mode 100644 tests/validation/reference/MeanStdDevNormalizationLayer.cpp create mode 100644 tests/validation/reference/MeanStdDevNormalizationLayer.h (limited to 'tests') diff --git a/tests/validation/CL/MeanStdDevNormalizationLayer.cpp b/tests/validation/CL/MeanStdDevNormalizationLayer.cpp new file mode 100644 index 0000000000..714f100709 --- /dev/null +++ b/tests/validation/CL/MeanStdDevNormalizationLayer.cpp @@ -0,0 +1,120 @@ +/* + * Copyright (c) 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. + */ +#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/CLMeanStdDevNormalizationLayer.h" +#include "tests/CL/CLAccessor.h" +#include "tests/PaddingCalculator.h" +#include "tests/datasets/NormalizationTypesDataset.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/MeanStdDevNormalizationLayerFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +/** Tolerance for float operations */ +RelativeTolerance tolerance_f16(half(0.2f)); +RelativeTolerance tolerance_f32(1e-8f); +} // namespace + +TEST_SUITE(CL) +TEST_SUITE(MeanStdDevNormalizationLayer) + +// *INDENT-OFF* +// clang-format off +DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip( + framework::dataset::make("InputInfo", { TensorInfo(TensorShape(27U, 13U), 1, DataType::F32), // Mismatching data type input/output + TensorInfo(TensorShape(27U, 13U), 1, DataType::F32), // Mismatching shapes + TensorInfo(TensorShape(32U, 13U), 1, DataType::F32), + }), + framework::dataset::make("OutputInfo",{ TensorInfo(TensorShape(27U, 13U), 1, DataType::F16), + TensorInfo(TensorShape(27U, 11U), 1, DataType::F32), + TensorInfo(TensorShape(32U, 13U), 1, DataType::F32), + })), + framework::dataset::make("Expected", { false, false, true })), + input_info, output_info, expected) +{ + ARM_COMPUTE_EXPECT(bool(CLMeanStdDevNormalizationLayer::validate(&input_info.clone()->set_is_resizable(false), &output_info.clone()->set_is_resizable(false))) == expected, framework::LogLevel::ERRORS); +} +// clang-format on +// *INDENT-ON* + +template +using CLMeanStdDevNormalizationLayerFixture = MeanStdDevNormalizationLayerValidationFixture; + +TEST_SUITE(Float) +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, CLMeanStdDevNormalizationLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::Small2DShapes(), + framework::dataset::make("DataType", DataType::F16)), + framework::dataset::make("InPlace", { false, true })), + framework::dataset::make("Epsilon", { 1e-8 }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_f16); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLMeanStdDevNormalizationLayerFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::Large2DShapes(), + framework::dataset::make("DataType", DataType::F16)), + framework::dataset::make("InPlace", { false, true })), + framework::dataset::make("Epsilon", { 1e-8 }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_f16); +} +TEST_SUITE_END() // FP16 + +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, CLMeanStdDevNormalizationLayerFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::Small2DShapes(), + framework::dataset::make("DataType", DataType::F32)), + framework::dataset::make("InPlace", { false, true })), + framework::dataset::make("Epsilon", { 1e-8 }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_f32); +} +FIXTURE_DATA_TEST_CASE(RunLarge, CLMeanStdDevNormalizationLayerFixture, framework::DatasetMode::NIGHTLY, combine(combine(combine(datasets::Large2DShapes(), + framework::dataset::make("DataType", DataType::F32)), + framework::dataset::make("InPlace", { false, true })), + framework::dataset::make("Epsilon", { 1e-8 }))) +{ + // Validate output + validate(CLAccessor(_target), _reference, tolerance_f32); +} +TEST_SUITE_END() // FP32 +TEST_SUITE_END() // Float + +TEST_SUITE_END() // MeanStdNormalizationLayer +TEST_SUITE_END() // CL +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/fixtures/MeanStdDevNormalizationLayerFixture.h b/tests/validation/fixtures/MeanStdDevNormalizationLayerFixture.h new file mode 100644 index 0000000000..1c48b74baf --- /dev/null +++ b/tests/validation/fixtures/MeanStdDevNormalizationLayerFixture.h @@ -0,0 +1,124 @@ +/* + * Copyright (c) 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_MEAN_STDDEV_NORMALIZATION_LAYER_FIXTURE +#define ARM_COMPUTE_TEST_MEAN_STDDEV_NORMALIZATION_LAYER_FIXTURE + +#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/MeanStdDevNormalizationLayer.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +template +class MeanStdDevNormalizationLayerValidationFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape shape, DataType dt, bool in_place, float epsilon = 1e-8f) + { + _data_type = dt; + _target = compute_target(shape, dt, in_place, epsilon); + _reference = compute_reference(shape, dt, epsilon); + } + +protected: + template + void fill(U &&src_tensor) + { + const float min_bound = -1.f; + const float max_bound = 1.f; + std::uniform_real_distribution<> distribution(min_bound, max_bound); + library->fill(src_tensor, distribution, 0); + } + + TensorType compute_target(TensorShape shape, DataType dt, bool in_place, float epsilon) + { + // Create tensors + TensorType src = create_tensor(shape, dt, 1); + TensorType dst; + + TensorType *dst_ptr = in_place ? &src : &dst; + + // Create and configure function + FunctionType norm; + norm.configure(&src, dst_ptr, epsilon); + + 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(); + ARM_COMPUTE_EXPECT(!src.info()->is_resizable(), framework::LogLevel::ERRORS); + + if(!in_place) + { + dst.allocator()->allocate(); + ARM_COMPUTE_EXPECT(!dst.info()->is_resizable(), framework::LogLevel::ERRORS); + } + + // Fill tensors + fill(AccessorType(src)); + + // Compute function + norm.run(); + + if(in_place) + { + return src; + } + else + { + return dst; + } + } + + SimpleTensor compute_reference(const TensorShape &shape, DataType dt, float epsilon) + { + // Create reference + SimpleTensor ref_src{ shape, dt, 1 }; + + // Fill reference + fill(ref_src); + + return reference::mean_std_normalization_layer(ref_src, epsilon); + } + + TensorType _target{}; + SimpleTensor _reference{}; + DataType _data_type{}; +}; +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_MEAN_STDDEV_NORMALIZATION_LAYER_FIXTURE */ diff --git a/tests/validation/reference/MeanStdDevNormalizationLayer.cpp b/tests/validation/reference/MeanStdDevNormalizationLayer.cpp new file mode 100644 index 0000000000..c44c983888 --- /dev/null +++ b/tests/validation/reference/MeanStdDevNormalizationLayer.cpp @@ -0,0 +1,71 @@ +/* + * Copyright (c) 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. + */ +#include "MeanStdDevNormalizationLayer.h" + +#include "arm_compute/core/Types.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor mean_std_normalization_layer(const SimpleTensor &src, float epsilon) +{ + // Create reference + SimpleTensor dst{ src.shape(), src.data_type(), 1 }; + + const int cols = src.shape()[0]; + const int batch_size = src.shape()[1]; + + for(int i = 0; i < batch_size; ++i) + { + T sum = static_cast(0.f); + T sum_sq = static_cast(0.f); + for(int j = 0; j < cols; ++j) + { + const T value = src[j + i * cols]; + sum += value; + sum_sq += value * value; + } + const T mean = sum / static_cast(cols); + const T var = ((sum_sq / static_cast(cols)) - (mean * mean)) + static_cast(epsilon); + const T stddev_inv = static_cast(1.f) / static_cast(std::sqrt(var)); + for(int j = 0; j < cols; ++j) + { + dst[j + i * cols] = (src[j + i * cols] - mean) * stddev_inv; + } + } + return dst; +} + +template SimpleTensor mean_std_normalization_layer(const SimpleTensor &src, float epsilon); +template SimpleTensor mean_std_normalization_layer(const SimpleTensor &src, float epsilon); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/MeanStdDevNormalizationLayer.h b/tests/validation/reference/MeanStdDevNormalizationLayer.h new file mode 100644 index 0000000000..b97f2852df --- /dev/null +++ b/tests/validation/reference/MeanStdDevNormalizationLayer.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 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_MEAN_STDDEV_NORMALIZATION_LAYER_H__ +#define __ARM_COMPUTE_TEST_MEAN_STDDEV_NORMALIZATION_LAYER_H__ + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +template +SimpleTensor mean_std_normalization_layer(const SimpleTensor &src, float epsilon = 1e-8f); + +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute +#endif /* __ARM_COMPUTE_TEST_MEAN_STDDEV_NORMALIZATION_LAYER_H__ */ -- cgit v1.2.1