diff options
author | Sanghoon Lee <sanghoon.lee@arm.com> | 2018-01-29 17:28:49 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:45:00 +0000 |
commit | c0079e9380c0d3963fd3ff9a775b4914169c975f (patch) | |
tree | d82bef27fba719ca9844d35efb1940ae17bffbbc /tests/validation/NEON/Convolution.cpp | |
parent | c78d4bca25886d279edfe3914c179261a1bfe505 (diff) | |
download | ComputeLibrary-c0079e9380c0d3963fd3ff9a775b4914169c975f.tar.gz |
COMPMID-564: CustomConvolution Test Name updated
Change-Id: I880ac3a1c3f5ea09ccefe27d9ee40bd60afcea2b
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118056
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/NEON/Convolution.cpp')
-rw-r--r-- | tests/validation/NEON/Convolution.cpp | 69 |
1 files changed, 33 insertions, 36 deletions
diff --git a/tests/validation/NEON/Convolution.cpp b/tests/validation/NEON/Convolution.cpp index 02c8abc419..32df51abba 100644 --- a/tests/validation/NEON/Convolution.cpp +++ b/tests/validation/NEON/Convolution.cpp @@ -54,8 +54,7 @@ constexpr AbsoluteTolerance<int16_t> tolerance_s16(1); TEST_SUITE(NEON) TEST_SUITE(CustomConvolution) -TEST_SUITE(CustomConvolutionSquare) -TEST_SUITE(CustomConvolutionSquare3x3) +TEST_SUITE(Square3x3) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::U8, DataType::S16 })), datasets::BorderModes()), @@ -99,7 +98,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template <typename T> using NEConvolutionFixture = ConvolutionSquareValidationFixture<Tensor, Accessor, NEConvolution3x3, T>; -TEST_SUITE(CustomConvolutionSquare3x3_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -119,7 +118,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare3x3_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -138,9 +137,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution3x3 */ +TEST_SUITE_END() /* Square3x3 */ -TEST_SUITE(CustomConvolutionSquare5x5) +TEST_SUITE(Square5x5) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::U8, DataType::S16 })), datasets::BorderModes()), framework::dataset::make("filter_size", { 5 })), @@ -183,7 +182,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template <typename T> using NEConvolutionFixture = ConvolutionSquareValidationFixture<Tensor, Accessor, NEConvolution5x5, T>; -TEST_SUITE(CustomConvolutionSquare5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -203,7 +202,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -222,9 +221,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution 5x5 */ +TEST_SUITE_END() /* Square5x5 */ -TEST_SUITE(CustomConvolutionSquare7x7) +TEST_SUITE(Square7x7) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::U8, DataType::S16 })), datasets::BorderModes()), framework::dataset::make("filter_size", { 7 })), @@ -267,7 +266,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template <typename T> using NEConvolutionFixture = ConvolutionSquareValidationFixture<Tensor, Accessor, NEConvolution7x7, T>; -TEST_SUITE(CustomConvolutionSquare7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -287,7 +286,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -306,9 +305,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution 7x7 */ +TEST_SUITE_END() /* Square7x7 */ -TEST_SUITE(CustomConvolutionSquare9x9) +TEST_SUITE(Square9x9) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::U8, DataType::S16 })), datasets::BorderModes()), framework::dataset::make("filter_size", { 9 })), @@ -351,7 +350,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template <typename T> using NEConvolutionFixture = ConvolutionSquareValidationFixture<Tensor, Accessor, NEConvolution9x9, T>; -TEST_SUITE(CustomConvolutionSquare9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -371,7 +370,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -390,10 +389,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution 9x9 */ -TEST_SUITE_END() /* Custom Convolution Square */ +TEST_SUITE_END() /* Square9x9 */ -TEST_SUITE(CustomConvolutionRectangle) +TEST_SUITE(Rectangle) DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combine(combine(concat(datasets::SmallShapes(), datasets::LargeShapes()), framework::dataset::make("DataType", { DataType::U8, DataType::S16 })), datasets::BorderModes()), @@ -442,7 +440,7 @@ shape, output_data_type, border_mode, filter_width, filter_height) template <typename T> using NEConvolutionFixture = ConvolutionRectangleValidationFixture<Tensor, Accessor, NEConvolutionRectangle, T>; -TEST_SUITE(CustomConvolutionRectangle_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -464,7 +462,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionRectangle_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -485,14 +483,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Rectangle */ +TEST_SUITE_END() /* Rectangle */ -TEST_SUITE(CustomConvolutionSeparable) -TEST_SUITE(CustomConvolutionSeparable5x5) +TEST_SUITE(Separable5x5) template <typename T> using NEConvolutionFixture = ConvolutionSeparableValidationFixture<Tensor, Accessor, NEConvolution5x5, T>; -TEST_SUITE(CustomConvolutionSeparable5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -512,7 +509,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -531,13 +528,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 5x5 */ +TEST_SUITE_END() /* Separable5x5 */ -TEST_SUITE(CustomConvolutionSeparable7x7) +TEST_SUITE(Separable7x7) template <typename T> using NEConvolutionFixture = ConvolutionSeparableValidationFixture<Tensor, Accessor, NEConvolution7x7, T>; -TEST_SUITE(CustomConvolutionSeparable7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -557,7 +554,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparablex7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -576,13 +573,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 7x7 */ +TEST_SUITE_END() /* Separable7x7 */ -TEST_SUITE(CustomConvolutionSeparable9x9) +TEST_SUITE(Separable9x9) template <typename T> using NEConvolutionFixture = ConvolutionSeparableValidationFixture<Tensor, Accessor, NEConvolution9x9, T>; -TEST_SUITE(CustomConvolutionSeparable9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<uint8_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -602,7 +599,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<uint8_t>, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -621,8 +618,8 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NEConvolutionFixture<int16_t>, framework::Datas validate(Accessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2)), tolerance_s16); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 9x9 */ -TEST_SUITE_END() /* Custom Convolution Separable */ +TEST_SUITE_END() /* Separable9x9 */ + TEST_SUITE_END() /* Custom Convolution */ TEST_SUITE_END() } // namespace validation |