diff options
| author | Pablo Tello <pablo.tello@arm.com> | 2018-04-04 10:01:14 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:52:54 +0000 |
| commit | 4a626a7d52e9c4759bdc16b65401a53779dd975f (patch) | |
| tree | 82e203118f42f9b3c2e538c9b54d779f2a75d3af /tests/validation/NEON/Im2Col.cpp | |
| parent | e083771a1f28c34485f0d0054e2645070df98846 (diff) | |
| download | ComputeLibrary-4a626a7d52e9c4759bdc16b65401a53779dd975f.tar.gz | |
COMPMID-801: NHWC support in CLIm2Col.
And extended tests coverage adding kernel shapes 3x1, 1x5 and 7x7
Change-Id: Ia7c1d4da2368d5f5fbc1a41187f4ac1aca5f150f
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/127727
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'tests/validation/NEON/Im2Col.cpp')
| -rw-r--r-- | tests/validation/NEON/Im2Col.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/tests/validation/NEON/Im2Col.cpp b/tests/validation/NEON/Im2Col.cpp index 50081f07b0..3a45fa7ae4 100644 --- a/tests/validation/NEON/Im2Col.cpp +++ b/tests/validation/NEON/Im2Col.cpp @@ -39,9 +39,10 @@ namespace validation { namespace { -const auto conv_args = combine(combine(combine(framework::dataset::make("KernelDims", { Size2D(3U, 3U), Size2D(5U, 5U) }), framework::dataset::make("PadStride", { PadStrideInfo(1U, 1U, 0U, 0U), PadStrideInfo(1U, 1U, 1U, 1U), PadStrideInfo(2U, 2U, 0U, 2U) })), - framework::dataset::make("QuantizationInfo", QuantizationInfo(0.5f, 10))), - framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })); +const auto conv_filter_sizes = framework::dataset::make("KernelDims", { Size2D(3U, 3U), Size2D(3U, 1U), Size2D(1U, 5U), Size2D(5U, 5U), Size2D(7U, 7U) }); +const auto conv_args = combine(combine(combine(conv_filter_sizes, framework::dataset::make("PadStride", { PadStrideInfo(1U, 1U, 0U, 0U), PadStrideInfo(1U, 1U, 1U, 1U), PadStrideInfo(2U, 2U, 0U, 2U) })), + framework::dataset::make("QuantizationInfo", QuantizationInfo(0.5f, 10))), + framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })); } // namespace TEST_SUITE(NEON) TEST_SUITE(Im2Col) @@ -84,6 +85,12 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEIm2ColFixture<float>, framework::DatasetMode: // Validate output validate(Accessor(_target), _reference); } +FIXTURE_DATA_TEST_CASE(RunLarge, NEIm2ColFixture<float>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::F32)), + conv_args)) +{ + // Validate output + validate(Accessor(_target), _reference); +} TEST_SUITE_END() #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC @@ -95,6 +102,12 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEIm2ColFixture<half>, framework::DatasetMode:: // Validate output validate(Accessor(_target), _reference); } +FIXTURE_DATA_TEST_CASE(RunLarge, NEIm2ColFixture<half>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::F16)), + conv_args)) +{ + // Validate output + validate(Accessor(_target), _reference); +} TEST_SUITE_END() #endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ @@ -108,6 +121,12 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEIm2ColFixture<uint8_t>, framework::DatasetMod // Validate output validate(Accessor(_target), _reference); } +FIXTURE_DATA_TEST_CASE(RunLarge, NEIm2ColFixture<uint8_t>, framework::DatasetMode::NIGHTLY, combine(combine(datasets::LargeShapes(), framework::dataset::make("DataType", DataType::QASYMM8)), + conv_args)) +{ + // Validate output + validate(Accessor(_target), _reference); +} TEST_SUITE_END() TEST_SUITE_END() |