From 11091762b6cbfa26d2135677d77b0bc7127ae980 Mon Sep 17 00:00:00 2001 From: Manuel Bottini Date: Mon, 17 Jun 2019 12:04:40 +0100 Subject: COMPMID-2245: Extend NEFuseBatchNormalization to support DepthwiseConvolution weights Change-Id: I2ee4aebfd69865290ed6c78dd17ff1299353317e Signed-off-by: Manuel Bottini Reviewed-on: https://review.mlplatform.org/c/1371 Comments-Addressed: Arm Jenkins Reviewed-by: Giuseppe Rossini Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice --- tests/validation/NEON/FuseBatchNormalization.cpp | 220 +++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 tests/validation/NEON/FuseBatchNormalization.cpp (limited to 'tests') diff --git a/tests/validation/NEON/FuseBatchNormalization.cpp b/tests/validation/NEON/FuseBatchNormalization.cpp new file mode 100644 index 0000000000..1a8f928c6e --- /dev/null +++ b/tests/validation/NEON/FuseBatchNormalization.cpp @@ -0,0 +1,220 @@ +/* + * 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/runtime/NEON/functions/NEFuseBatchNormalization.h" +#include "tests/Globals.h" +#include "tests/NEON/Accessor.h" +#include "tests/datasets/ShapeDatasets.h" +#include "tests/framework/Macros.h" +#include "tests/framework/datasets/Datasets.h" +#include "tests/validation/Validation.h" +#include "tests/validation/fixtures/FuseBatchNormalizationFixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace +{ +AbsoluteTolerance absolute_tolerance_f32(0.001f); +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +AbsoluteTolerance absolute_tolerance_f16(0.2f); +#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ +} // namespace + +template +using NEFuseBatchNormalizationConvFixture = FuseBatchNormalizationFixture; +template +using NEFuseBatchNormalizationDWCFixture = FuseBatchNormalizationFixture; + +// *INDENT-OFF* +// clang-format off + +/** Shapes to test - Precommit */ +const auto shape_conv_values_precommit = concat(datasets::Small4DShapes(), datasets::Small3DShapes()); + +/** Shapes to test - Nightly */ +const auto shape_conv_values_nightly = concat(datasets::Large4DShapes(), datasets::Large3DShapes()); + +/** Data layout to test */ +const auto data_layout_values = framework::dataset::make("DataLayout", { DataLayout::NHWC, DataLayout::NCHW }); + +/** In-place flags to test */ +const auto in_place_values = framework::dataset::make("InPlace", { true, false }); + +/** With bias flags to test */ +const auto with_bias_values = framework::dataset::make("WithBias", { true, false }); + +/** With gamma flags to test */ +const auto with_gamma_values = framework::dataset::make("WithGamma", { true, false }); + +/** With beta flags to test */ +const auto with_beta_values = framework::dataset::make("WithBeta", { true, false }); + +TEST_SUITE(NEON) +TEST_SUITE(FuseBatchNormalization) +TEST_SUITE(Convolution) +TEST_SUITE(Float) +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, NEFuseBatchNormalizationConvFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine(combine(combine( + shape_conv_values_precommit, + framework::dataset::make("DataType", { DataType::F32 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f32); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f32); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEFuseBatchNormalizationConvFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine(combine(combine( + shape_conv_values_nightly, + framework::dataset::make("DataType", { DataType::F32 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f32); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f32); +} +TEST_SUITE_END() // FP32 +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, NEFuseBatchNormalizationConvFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine(combine(combine( + shape_conv_values_precommit, + framework::dataset::make("DataType", { DataType::F16 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f16); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f16); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEFuseBatchNormalizationConvFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine(combine(combine( + shape_conv_values_nightly, + framework::dataset::make("DataType", { DataType::F16 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f16); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f16); +} +TEST_SUITE_END() // FP16 +#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ +TEST_SUITE_END() // Float +TEST_SUITE_END() // Convolution +TEST_SUITE(DepthwiseConvolution) +TEST_SUITE(Float) +TEST_SUITE(FP32) +FIXTURE_DATA_TEST_CASE(RunSmall, NEFuseBatchNormalizationDWCFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine(combine(combine( + datasets::Small3DShapes(), + framework::dataset::make("DataType", { DataType::F32 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f32); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f32); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEFuseBatchNormalizationDWCFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine(combine(combine( + datasets::Large3DShapes(), + framework::dataset::make("DataType", { DataType::F32 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f32); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f32); +} + +TEST_SUITE_END() // FP32 +#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC +TEST_SUITE(FP16) +FIXTURE_DATA_TEST_CASE(RunSmall, NEFuseBatchNormalizationDWCFixture, framework::DatasetMode::PRECOMMIT, + combine(combine(combine(combine(combine(combine( + datasets::Small3DShapes(), + framework::dataset::make("DataType", { DataType::F16 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f16); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f16); +} + +FIXTURE_DATA_TEST_CASE(RunLarge, NEFuseBatchNormalizationDWCFixture, framework::DatasetMode::NIGHTLY, + combine(combine(combine(combine(combine(combine( + datasets::Large3DShapes(), + framework::dataset::make("DataType", { DataType::F16 })), + data_layout_values), + in_place_values), + with_bias_values), + with_gamma_values), + with_beta_values)) +{ + // Validate outputs + validate(Accessor(_target_w), _reference_w, absolute_tolerance_f16); + validate(Accessor(_target_b), _reference_b, absolute_tolerance_f16); +} + +TEST_SUITE_END() // FP16 +#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ +TEST_SUITE_END() // Float +TEST_SUITE_END() // DepthwiseConvolution +TEST_SUITE_END() // FuseBatchNormalization +TEST_SUITE_END() // NEON +} // namespace validation +} // namespace test +} // namespace arm_compute \ No newline at end of file -- cgit v1.2.1