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>

22 files changed, 38 insertions, 38 deletions

diff --git a/tests/datasets_new/AlexNetActivationLayerDataset.h b/tests/datasets_new/system_tests/alexnet/AlexNetActivationLayerDataset.h
index 27e9956647..27e9956647 100644
--- a/tests/datasets_new/AlexNetActivationLayerDataset.h
+++ b/tests/datasets_new/system_tests/alexnet/AlexNetActivationLayerDataset.h
diff --git a/tests/datasets_new/AlexNetConvolutionLayerDataset.h b/tests/datasets_new/system_tests/alexnet/AlexNetConvolutionLayerDataset.h
index 18421cffe6..18421cffe6 100644
--- a/tests/datasets_new/AlexNetConvolutionLayerDataset.h
+++ b/tests/datasets_new/system_tests/alexnet/AlexNetConvolutionLayerDataset.h
diff --git a/tests/datasets_new/AlexNetFullyConnectedLayerDataset.h b/tests/datasets_new/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h
index 4aa4f4d861..4aa4f4d861 100644
--- a/tests/datasets_new/AlexNetFullyConnectedLayerDataset.h
+++ b/tests/datasets_new/system_tests/alexnet/AlexNetFullyConnectedLayerDataset.h
diff --git a/tests/datasets_new/AlexNetNormalizationLayerDataset.h b/tests/datasets_new/system_tests/alexnet/AlexNetNormalizationLayerDataset.h
index 5714c5cf27..5714c5cf27 100644
--- a/tests/datasets_new/AlexNetNormalizationLayerDataset.h
+++ b/tests/datasets_new/system_tests/alexnet/AlexNetNormalizationLayerDataset.h
diff --git a/tests/datasets_new/AlexNetPoolingLayerDataset.h b/tests/datasets_new/system_tests/alexnet/AlexNetPoolingLayerDataset.h
index 714bca0777..714bca0777 100644
--- a/tests/datasets_new/AlexNetPoolingLayerDataset.h
+++ b/tests/datasets_new/system_tests/alexnet/AlexNetPoolingLayerDataset.h
diff --git a/tests/datasets_new/GoogLeNetActivationLayerDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h
index 935edbc4aa..9f3c38fe66 100644
--- a/tests/datasets_new/GoogLeNetActivationLayerDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ActivationLayerDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_ACTIVATION_LAYER_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_ACTIVATION_LAYER_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_ACTIVATION_LAYER_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_ACTIVATION_LAYER_DATASET
 
 #include "framework/datasets/Datasets.h"
 
@@ -37,11 +37,11 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetActivationLayerDataset final : public
+class GoogLeNetInceptionV1ActivationLayerDataset final : public
     framework::dataset::CartesianProductDataset<framework::dataset::InitializerListDataset<TensorShape>, framework::dataset::SingletonDataset<ActivationLayerInfo>>
 {
 public:
-    GoogLeNetActivationLayerDataset()
+    GoogLeNetInceptionV1ActivationLayerDataset()
         : CartesianProductDataset
     {
         framework::dataset::make("Shape", { // conv1/relu_7x7
@@ -114,10 +114,10 @@ public:
     }
     {
     }
-    GoogLeNetActivationLayerDataset(GoogLeNetActivationLayerDataset &&) = default;
-    ~GoogLeNetActivationLayerDataset()                                  = default;
+    GoogLeNetInceptionV1ActivationLayerDataset(GoogLeNetInceptionV1ActivationLayerDataset &&) = default;
+    ~GoogLeNetInceptionV1ActivationLayerDataset()                                             = default;
 };
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_ACTIVATION_LAYER_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_ACTIVATION_LAYER_DATASET */
diff --git a/tests/datasets_new/GoogLeNetConvolutionLayerDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h
index fd0c8a6bfe..dfa59ab084 100644
--- a/tests/datasets_new/GoogLeNetConvolutionLayerDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_CONVOLUTION_LAYER_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_CONVOLUTION_LAYER_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_CONVOLUTION_LAYER_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_CONVOLUTION_LAYER_DATASET
 
 #include "tests/datasets_new/ConvolutionLayerDataset.h"
 
@@ -37,11 +37,11 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetConvolutionLayerDataset final : public ConvolutionLayerDataset
+class GoogLeNetInceptionV1ConvolutionLayerDataset final : public ConvolutionLayerDataset
 {
 public:
-    // GoogLeNet inception v1 dataset
-    GoogLeNetConvolutionLayerDataset()
+    // GoogLeNetInceptionV1 inception v1 dataset
+    GoogLeNetInceptionV1ConvolutionLayerDataset()
     {
         // conv1/7x7_s2
         add_config(TensorShape(224U, 224U, 3U), TensorShape(7U, 7U, 3U, 64U), TensorShape(64U), TensorShape(112U, 112U, 64U), PadStrideInfo(2, 2, 3, 3));
@@ -144,11 +144,11 @@ public:
     }
 };
 
-class GoogLeNetDirectConvolutionLayerDataset final : public ConvolutionLayerDataset
+class GoogLeNetInceptionV1DirectConvolutionLayerDataset final : public ConvolutionLayerDataset
 {
 public:
-    // subset of GoogLeNet inception v1 dataset
-    GoogLeNetDirectConvolutionLayerDataset()
+    // subset of GoogLeNetInceptionV1 inception v1 dataset
+    GoogLeNetInceptionV1DirectConvolutionLayerDataset()
     {
         // conv2/3x3_reduce
         add_config(TensorShape(56U, 56U, 64U), TensorShape(1U, 1U, 64U, 64U), TensorShape(64U), TensorShape(56U, 56U, 64U), PadStrideInfo(1, 1, 0, 0));
@@ -234,4 +234,4 @@ public:
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_CONVOLUTION_LAYER_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_CONVOLUTION_LAYER_DATASET */
diff --git a/tests/datasets_new/GoogLeNetFullyConnectedLayerDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h
index 435bf8505d..346bb521ad 100644
--- a/tests/datasets_new/GoogLeNetFullyConnectedLayerDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1FullyConnectedLayerDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_FULLYCONNECTED_LAYER_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_FULLYCONNECTED_LAYER_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_FULLYCONNECTED_LAYER_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_FULLYCONNECTED_LAYER_DATASET
 
 #include "tests/datasets_new/FullyConnectedLayerDataset.h"
 
@@ -37,10 +37,10 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetFullyConnectedLayerDataset final : public FullyConnectedLayerDataset
+class GoogLeNetInceptionV1FullyConnectedLayerDataset final : public FullyConnectedLayerDataset
 {
 public:
-    GoogLeNetFullyConnectedLayerDataset()
+    GoogLeNetInceptionV1FullyConnectedLayerDataset()
     {
         add_config(TensorShape(1024U), TensorShape(1024U, 1000U), TensorShape(1000U), TensorShape(1000U));
     }
@@ -48,4 +48,4 @@ public:
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_FULLYCONNECTED_LAYER_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_FULLYCONNECTED_LAYER_DATASET */
diff --git a/tests/datasets_new/GoogLeNetGEMMDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h
index 84f2a48c3e..6df3b92397 100644
--- a/tests/datasets_new/GoogLeNetGEMMDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_GEMM_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_GEMM_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_GEMM_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_GEMM_DATASET
 
 #include "tests/datasets_new/GEMMDataset.h"
 
@@ -36,10 +36,10 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetGEMMDataset final : public GEMMDataset
+class GoogLeNetInceptionV1GEMMDataset final : public GEMMDataset
 {
 public:
-    GoogLeNetGEMMDataset()
+    GoogLeNetInceptionV1GEMMDataset()
     {
         add_config(TensorShape(147U, 12544U), TensorShape(64U, 147U), TensorShape(64U, 12544U), TensorShape(64U, 12544U), 1.0f, 0.0f);
         add_config(TensorShape(64U, 3136U), TensorShape(64U, 64U), TensorShape(64U, 3136U), TensorShape(64U, 3136U), 1.0f, 0.0f);
@@ -110,4 +110,4 @@ public:
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_GEMM_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_GEMM_DATASET */
diff --git a/tests/datasets_new/GoogLeNetNormalizationLayerDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h
index 2c20a6b9af..4751dcd511 100644
--- a/tests/datasets_new/GoogLeNetNormalizationLayerDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1NormalizationLayerDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_NORMALIZATION_LAYER_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_NORMALIZATION_LAYER_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_NORMALIZATION_LAYER_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_NORMALIZATION_LAYER_DATASET
 
 #include "framework/datasets/Datasets.h"
 
@@ -37,11 +37,11 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetNormalizationLayerDataset final : public
+class GoogLeNetInceptionV1NormalizationLayerDataset final : public
     framework::dataset::CartesianProductDataset<framework::dataset::InitializerListDataset<TensorShape>, framework::dataset::SingletonDataset<NormalizationLayerInfo>>
 {
 public:
-    GoogLeNetNormalizationLayerDataset()
+    GoogLeNetInceptionV1NormalizationLayerDataset()
         : CartesianProductDataset
     {
         framework::dataset::make("Shape", { // conv2/norm2
@@ -52,10 +52,10 @@ public:
     }
     {
     }
-    GoogLeNetNormalizationLayerDataset(GoogLeNetNormalizationLayerDataset &&) = default;
-    ~GoogLeNetNormalizationLayerDataset()                                     = default;
+    GoogLeNetInceptionV1NormalizationLayerDataset(GoogLeNetInceptionV1NormalizationLayerDataset &&) = default;
+    ~GoogLeNetInceptionV1NormalizationLayerDataset()                                                = default;
 };
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_NORMALIZATION_LAYER_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_NORMALIZATION_LAYER_DATASET */
diff --git a/tests/datasets_new/GoogLeNetPoolingLayerDataset.h b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h
index 24d5da190d..007175c4db 100644
--- a/tests/datasets_new/GoogLeNetPoolingLayerDataset.h
+++ b/tests/datasets_new/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1PoolingLayerDataset.h
@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-#ifndef ARM_COMPUTE_TEST_GOOGLENET_POOLING_LAYER_DATASET
-#define ARM_COMPUTE_TEST_GOOGLENET_POOLING_LAYER_DATASET
+#ifndef ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_POOLING_LAYER_DATASET
+#define ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_POOLING_LAYER_DATASET
 
 #include "tests/datasets_new/PoolingLayerDataset.h"
 
@@ -37,10 +37,10 @@ namespace test
 {
 namespace datasets
 {
-class GoogLeNetPoolingLayerDataset final : public PoolingLayerDataset
+class GoogLeNetInceptionV1PoolingLayerDataset final : public PoolingLayerDataset
 {
 public:
-    GoogLeNetPoolingLayerDataset()
+    GoogLeNetInceptionV1PoolingLayerDataset()
     {
         // FIXME: Add support for 7x7 pooling layer pool5/7x7_s1
         // pool1/3x3_s2
@@ -68,4 +68,4 @@ public:
 } // namespace datasets
 } // namespace test
 } // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_GOOGLENET_POOLING_LAYER_DATASET */
+#endif /* ARM_COMPUTE_TEST_GOOGLENETINCEPTIONV1_POOLING_LAYER_DATASET */
diff --git a/tests/datasets_new/LeNet5ActivationLayerDataset.h b/tests/datasets_new/system_tests/lenet5/LeNet5ActivationLayerDataset.h
index 5d2a36bfd3..5d2a36bfd3 100644
--- a/tests/datasets_new/LeNet5ActivationLayerDataset.h
+++ b/tests/datasets_new/system_tests/lenet5/LeNet5ActivationLayerDataset.h
diff --git a/tests/datasets_new/LeNet5ConvolutionLayerDataset.h b/tests/datasets_new/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h
index 446a413663..446a413663 100644
--- a/tests/datasets_new/LeNet5ConvolutionLayerDataset.h
+++ b/tests/datasets_new/system_tests/lenet5/LeNet5ConvolutionLayerDataset.h
diff --git a/tests/datasets_new/LeNet5FullyConnectedLayerDataset.h b/tests/datasets_new/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h
index bbbf7121c3..bbbf7121c3 100644
--- a/tests/datasets_new/LeNet5FullyConnectedLayerDataset.h
+++ b/tests/datasets_new/system_tests/lenet5/LeNet5FullyConnectedLayerDataset.h
diff --git a/tests/datasets_new/LeNet5PoolingLayerDataset.h b/tests/datasets_new/system_tests/lenet5/LeNet5PoolingLayerDataset.h
index bc234d858c..bc234d858c 100644
--- a/tests/datasets_new/LeNet5PoolingLayerDataset.h
+++ b/tests/datasets_new/system_tests/lenet5/LeNet5PoolingLayerDataset.h
diff --git a/tests/datasets_new/SqueezeNetActivationLayerDataset.h b/tests/datasets_new/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h
index 9cc9973f8f..9cc9973f8f 100644
--- a/tests/datasets_new/SqueezeNetActivationLayerDataset.h
+++ b/tests/datasets_new/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h
diff --git a/tests/datasets_new/SqueezeNetConvolutionLayerDataset.h b/tests/datasets_new/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h
index 07ec6c9eaf..07ec6c9eaf 100644
--- a/tests/datasets_new/SqueezeNetConvolutionLayerDataset.h
+++ b/tests/datasets_new/system_tests/squeezenet/SqueezeNetConvolutionLayerDataset.h
diff --git a/tests/datasets_new/SqueezeNetPoolingLayerDataset.h b/tests/datasets_new/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h
index dc443c8a03..dc443c8a03 100644
--- a/tests/datasets_new/SqueezeNetPoolingLayerDataset.h
+++ b/tests/datasets_new/system_tests/squeezenet/SqueezeNetPoolingLayerDataset.h
diff --git a/tests/datasets_new/YOLOV2ActivationLayerDataset.h b/tests/datasets_new/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h
index 31327fa0d2..31327fa0d2 100644
--- a/tests/datasets_new/YOLOV2ActivationLayerDataset.h
+++ b/tests/datasets_new/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h
diff --git a/tests/datasets_new/YOLOV2BatchNormalizationLayerDataset.h b/tests/datasets_new/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h
index 8cb69db869..8cb69db869 100644
--- a/tests/datasets_new/YOLOV2BatchNormalizationLayerDataset.h
+++ b/tests/datasets_new/system_tests/yolo/v2/YOLOV2BatchNormalizationLayerDataset.h
diff --git a/tests/datasets_new/YOLOV2ConvolutionLayerDataset.h b/tests/datasets_new/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h
index ad3c38570e..ad3c38570e 100644
--- a/tests/datasets_new/YOLOV2ConvolutionLayerDataset.h
+++ b/tests/datasets_new/system_tests/yolo/v2/YOLOV2ConvolutionLayerDataset.h
diff --git a/tests/datasets_new/YOLOV2PoolingLayerDataset.h b/tests/datasets_new/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h
index 273409dec6..273409dec6 100644
--- a/tests/datasets_new/YOLOV2PoolingLayerDataset.h
+++ b/tests/datasets_new/system_tests/yolo/v2/YOLOV2PoolingLayerDataset.h