From d763cfbc972cded289a2402a6238416d371bdf33 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Tue, 15 Aug 2017 12:38:51 +0100 Subject: COMPMID-479 Restructure system tests datasets Change-Id: Iad52acaad5bb405f161e7d9e4f4ee39c895dc929 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/84037 Reviewed-by: Moritz Pflanzer Reviewed-by: Georgios Pinitas Tested-by: Kaizen --- tests/benchmark_new/CL/NormalizationLayer.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/benchmark_new/CL/NormalizationLayer.cpp') diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index d5ae353512..f433172cd1 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -30,8 +30,8 @@ #include "framework/datasets/Datasets.h" #include "tests/CL/CLAccessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/AlexNetNormalizationLayerDataset.h" -#include "tests/datasets_new/GoogLeNetNormalizationLayerDataset.h" +#include "tests/datasets_new/system_tests/alexnet/AlexNetNormalizationLayerDataset.h" +#include "tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h" #include "tests/fixtures_new/NormalizationLayerFixture.h" namespace arm_compute @@ -52,8 +52,8 @@ REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerF data_types), framework::dataset::make("Batches", 1))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetNormalizationLayerDataset(), +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1NormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, + framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV1NormalizationLayerDataset(), data_types), framework::dataset::make("Batches", 1))); @@ -63,8 +63,8 @@ REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerF data_types), framework::dataset::make("Batches", { 4, 8 }))); -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::NIGHTLY, - framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetNormalizationLayerDataset(), +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1NormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::NIGHTLY, + framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV1NormalizationLayerDataset(), data_types), framework::dataset::make("Batches", { 4, 8 }))); TEST_SUITE_END() -- cgit v1.2.1