From c0079e9380c0d3963fd3ff9a775b4914169c975f Mon Sep 17 00:00:00 2001 From: Sanghoon Lee Date: Mon, 29 Jan 2018 17:28:49 +0000 Subject: COMPMID-564: CustomConvolution Test Name updated Change-Id: I880ac3a1c3f5ea09ccefe27d9ee40bd60afcea2b Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/118056 Reviewed-by: Anthony Barbier Tested-by: Jenkins --- tests/validation/CL/Convolution.cpp | 68 ++++++++++++++++------------------ tests/validation/NEON/Convolution.cpp | 69 +++++++++++++++++------------------ 2 files changed, 65 insertions(+), 72 deletions(-) diff --git a/tests/validation/CL/Convolution.cpp b/tests/validation/CL/Convolution.cpp index 56f391965d..a51723e32c 100644 --- a/tests/validation/CL/Convolution.cpp +++ b/tests/validation/CL/Convolution.cpp @@ -47,8 +47,7 @@ namespace TEST_SUITE(CL) 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()), framework::dataset::make("filter_size", { 3 })), @@ -91,7 +90,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template using CLConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSqaure3x3_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -111,7 +110,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSqaure3x3_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -129,9 +128,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom_Convolution 3x3 */ +TEST_SUITE_END() /* Square 3x3 */ -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 })), @@ -174,7 +173,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template using CLConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSqaure5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -194,7 +193,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSqaure5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -213,9 +212,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } 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 })), @@ -258,7 +257,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template using CLConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -278,7 +277,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -297,9 +296,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } 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 })), @@ -342,7 +341,7 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(combine(combi template using CLConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -362,7 +361,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -381,10 +380,9 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } 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()), @@ -433,7 +431,7 @@ shape, output_data_type, border_mode, filter_width, filter_height) template using CLConvolutionFixture = ConvolutionRectangleValidationFixture; -TEST_SUITE(CustomConvolutionRectangle_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -455,7 +453,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionRectangle_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -476,14 +474,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Rectangle */ +TEST_SUITE_END() /* Rectangle */ -TEST_SUITE(CustomConvolutionSeparable) -TEST_SUITE(CustomConvolutionSeparable5x5) +TEST_SUITE(Separable5x5) template using CLConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -503,7 +500,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -522,13 +519,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 5x5 */ +TEST_SUITE_END() /* Separable5x5 */ -TEST_SUITE(CustomConvolutionSeparable7x7) +TEST_SUITE(Separable7x7) template using CLConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -548,7 +545,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -567,13 +564,13 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 7x7 */ +TEST_SUITE_END() /* Separable7x7 */ -TEST_SUITE(CustomConvolutionSeparable9x9) +TEST_SUITE(Separable9x9) template using CLConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::U8)), datasets::BorderModes()), @@ -593,7 +590,7 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, CLConvolutionFixture, framework::DatasetMode::PRECOMMIT, combine(combine(combine(datasets::SmallShapes(), framework::dataset::make("DataType", DataType::S16)), datasets::BorderModes()), @@ -612,9 +609,8 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CLConvolutionFixture, framework::Datas validate(CLAccessor(_target), _reference, shape_to_valid_region(_reference.shape(), (_border_mode == BorderMode::UNDEFINED), BorderSize(_height / 2, _width / 2))); } TEST_SUITE_END() -TEST_SUITE_END() /* Custom Convolution Separable 9x9 */ +TEST_SUITE_END() /* Separable9x9 */ -TEST_SUITE_END() /* Custom Convolution Separable */ TEST_SUITE_END() /* Custom Convolution */ TEST_SUITE_END() } // namespace validation 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 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 using NEConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare3x3_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare3x3_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSquareValidationFixture; -TEST_SUITE(CustomConvolutionSquare9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSquare9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionRectangleValidationFixture; -TEST_SUITE(CustomConvolutionRectangle_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionRectangle_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable5x5_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable5x5_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable7x7_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparablex7x7_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 using NEConvolutionFixture = ConvolutionSeparableValidationFixture; -TEST_SUITE(CustomConvolutionSeparable9x9_U8) +TEST_SUITE(U8) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, framework::Datas } TEST_SUITE_END() -TEST_SUITE(CustomConvolutionSeparable9x9_S16) +TEST_SUITE(S16) FIXTURE_DATA_TEST_CASE(RunSmall, NEConvolutionFixture, 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, 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 -- cgit v1.2.1