aboutsummaryrefslogtreecommitdiff
path: root/tests/benchmark/NEON
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmark/NEON')
-rw-r--r--tests/benchmark/NEON/BatchNormalizationLayer.cpp78
1 files changed, 42 insertions, 36 deletions
diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
index 786a5b1701..35187ff66a 100644
--- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
@@ -56,51 +56,57 @@ using NEBatchNormalizationLayerFixture = BatchNormalizationLayerFixture<Tensor,
TEST_SUITE(NEON)
REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetBatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::MobileNetBatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", 1)));
+ combine(combine(combine(combine(combine(datasets::MobileNetBatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", 1)));
REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", 1)));
+ combine(combine(combine(combine(combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", 1)));
REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", 1)));
+ combine(combine(combine(combine(combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", 1)));
TEST_SUITE(NIGHTLY)
REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetBatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::MobileNetBatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", { 4, 8 })));
+ combine(combine(combine(combine(combine(datasets::MobileNetBatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", { 4, 8 })));
REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", { 4, 8 })));
+ combine(combine(combine(combine(combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", { 4, 8 })));
REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, NEBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
- framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
- framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
- framework::dataset::make("UseBeta", { false, true }))),
- framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
- data_types),
- framework::dataset::make("Batches", { 4, 8 })));
+ combine(combine(combine(combine(combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
+ combine(framework::dataset::make("UseGamma", { false, true }),
+ framework::dataset::make("UseBeta", { false, true }))),
+ framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+ data_types),
+ framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+ framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
} // namespace benchmark