commit d763cfbc972cded289a2402a6238416d371bdf33
author SiCong Li <sicong.li@arm.com> Tue Aug 15 12:38:51 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:35:24 2018 +0000
tree 941cfedc2b3ade46a0ba1144e7439e7c4e0f7ea5
parent 1e5c1575fd7d86344b96988c86b82b66584460c8

COMPMID-479 Restructure system tests datasets

Change-Id: Iad52acaad5bb405f161e7d9e4f4ee39c895dc929
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/84037
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>

tests/benchmark_new/CL/DirectConvolutionLayer.cpp

diff --git a/tests/benchmark_new/CL/DirectConvolutionLayer.cpp b/tests/benchmark_new/CL/DirectConvolutionLayer.cpp
index 82e5ef1..4a4fe87 100644
--- a/tests/benchmark_new/CL/DirectConvolutionLayer.cpp
+++ b/tests/benchmark_new/CL/DirectConvolutionLayer.cpp
@@ -30,10 +30,10 @@
 #include "framework/datasets/Datasets.h"
 #include "tests/CL/CLAccessor.h"
 #include "tests/TypePrinter.h"
-#include "tests/datasets_new/AlexNetConvolutionLayerDataset.h"
-#include "tests/datasets_new/GoogLeNetConvolutionLayerDataset.h"
-#include "tests/datasets_new/SqueezeNetConvolutionLayerDataset.h"
-#include "tests/datasets_new/YOLOV2ConvolutionLayerDataset.h"
+#include "tests/datasets_new/system_tests/alexnet/AlexNetConvolutionLayerDataset.h"
+#include "tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h"
+#include "tests/datasets_new/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h"
+#include "tests/datasets_new/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h"
 #include "tests/fixtures_new/ConvolutionLayerFixture.h"
 
 namespace arm_compute
@@ -54,8 +54,8 @@
                                                                                         data_types),
                                                             framework::dataset::make("Batches", { 1, 4 })));
 
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetDirectConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL,
-                                framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetDirectConvolutionLayerDataset(),
+REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1DirectConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL,
+                                framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV1DirectConvolutionLayerDataset(),
                                                                                         data_types),
                                                             framework::dataset::make("Batches", { 1, 4 })));
 
@@ -70,8 +70,8 @@
                                                                                         data_types),
                                                             framework::dataset::make("Batches", 8)));
 
-REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetDirectConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::NIGHTLY,
-                                framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetDirectConvolutionLayerDataset(),
+REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1DirectConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::NIGHTLY,
+                                framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV1DirectConvolutionLayerDataset(),
                                                                                         data_types),
                                                             framework::dataset::make("Batches", 8)));