[layer/test] Add unittests for conv1d

[platform/core/ml/nntrainer.git] / test / unittest / layers / unittest_layers_convolution2d.cpp

diff --git a/test/unittest/layers/unittest_layers_convolution2d.cpp b/test/unittest/layers/unittest_layers_convolution2d.cpp
index ea29530..e79e9ce 100644 (file)
--- a/test/unittest/layers/unittest_layers_convolution2d.cpp
+++ b/test/unittest/layers/unittest_layers_convolution2d.cpp
@@ -23,27 +23,27 @@ auto semantic_conv2d = LayerSemanticsParamType(
 INSTANTIATE_TEST_CASE_P(Convolution2D, LayerSemantics,
                         ::testing::Values(semantic_conv2d));
 
-auto conv_sb_minimum = LayerGoldenTestParamType(
+auto conv2d_sb_minimum = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
-  {"filters=3", "kernel_size=2,2"}, "1:1:4:4", "conv_sb_minimum.nnlayergolden",
-  LayerGoldenTestParamOptions::DEFAULT);
+  {"filters=3", "kernel_size=2,2"}, "1:1:4:4",
+  "conv2d_sb_minimum.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_minimum = LayerGoldenTestParamType(
+auto conv2d_mb_minimum = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
-  {"filters=3", "kernel_size=2,2"}, "3:1:4:4", "conv_mb_minimum.nnlayergolden",
-  LayerGoldenTestParamOptions::DEFAULT);
+  {"filters=3", "kernel_size=2,2"}, "3:1:4:4",
+  "conv2d_mb_minimum.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_same_remain = LayerGoldenTestParamType(
+auto conv2d_sb_same_remain = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {"filters=2", "kernel_size=3,3", "padding=same"}, "1:1:4:4",
-  "conv_sb_same_remain.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
+  "conv2d_sb_same_remain.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_same_remain = LayerGoldenTestParamType(
+auto conv2d_mb_same_remain = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {"filters=2", "kernel_size=3,3", "padding=same"}, "3:1:4:4",
-  "conv_mb_same_remain.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
+  "conv2d_mb_same_remain.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_same_uneven_remain_1 = LayerGoldenTestParamType(
+auto conv2d_sb_same_uneven_remain_1 = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {
     "filters=2",
@@ -51,10 +51,10 @@ auto conv_sb_same_uneven_remain_1 = LayerGoldenTestParamType(
     "stride=2,2",
     "padding=same",
   },
-  "1:3:4:4", "conv_sb_same_uneven_remain.nnlayergolden",
+  "1:3:4:4", "conv2d_sb_same_uneven_remain.nnlayergolden",
   LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_same_uneven_remain_2 = LayerGoldenTestParamType(
+auto conv2d_sb_same_uneven_remain_2 = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {
     "filters=2",
@@ -62,10 +62,10 @@ auto conv_sb_same_uneven_remain_2 = LayerGoldenTestParamType(
     "stride=2,2",
     "padding=0,1,0,1",
   },
-  "1:3:4:4", "conv_sb_same_uneven_remain.nnlayergolden",
+  "1:3:4:4", "conv2d_sb_same_uneven_remain.nnlayergolden",
   LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_same_uneven_remain_1 = LayerGoldenTestParamType(
+auto conv2d_mb_same_uneven_remain_1 = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {
     "filters=2",
@@ -73,10 +73,10 @@ auto conv_mb_same_uneven_remain_1 = LayerGoldenTestParamType(
     "stride=2,2",
     "padding=same",
   },
-  "3:3:4:4", "conv_mb_same_uneven_remain.nnlayergolden",
+  "3:3:4:4", "conv2d_mb_same_uneven_remain.nnlayergolden",
   LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_same_uneven_remain_2 = LayerGoldenTestParamType(
+auto conv2d_mb_same_uneven_remain_2 = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {
     "filters=2",
@@ -84,10 +84,10 @@ auto conv_mb_same_uneven_remain_2 = LayerGoldenTestParamType(
     "stride=2,2",
     "padding=0,1,0,1",
   },
-  "3:3:4:4", "conv_mb_same_uneven_remain.nnlayergolden",
+  "3:3:4:4", "conv2d_mb_same_uneven_remain.nnlayergolden",
   LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_valid_drop_last =
+auto conv2d_sb_valid_drop_last =
   LayerGoldenTestParamType(nntrainer::createLayer<nntrainer::Conv2DLayer>,
                            {
                              "filters=2",
@@ -95,10 +95,10 @@ auto conv_sb_valid_drop_last =
                              "stride=2,2",
                              "padding=valid",
                            },
-                           "1:3:7:7", "conv_sb_valid_drop_last.nnlayergolden",
+                           "1:3:7:7", "conv2d_sb_valid_drop_last.nnlayergolden",
                            LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_valid_drop_last =
+auto conv2d_mb_valid_drop_last =
   LayerGoldenTestParamType(nntrainer::createLayer<nntrainer::Conv2DLayer>,
                            {
                              "filters=2",
@@ -106,45 +106,46 @@ auto conv_mb_valid_drop_last =
                              "stride=2,2",
                              "padding=valid",
                            },
-                           "3:3:7:7", "conv_mb_valid_drop_last.nnlayergolden",
+                           "3:3:7:7", "conv2d_mb_valid_drop_last.nnlayergolden",
                            LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_no_overlap = LayerGoldenTestParamType(
+auto conv2d_sb_no_overlap = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {"filters=3", "kernel_size=2,2", "stride=3,3"}, "1:2:5:5",
-  "conv_sb_no_overlap.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
+  "conv2d_sb_no_overlap.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_no_overlap =
+auto conv2d_mb_no_overlap =
   LayerGoldenTestParamType(nntrainer::createLayer<nntrainer::Conv2DLayer>,
                            {
                              "filters=3",
                              "kernel_size=2,2",
                              "stride=3,3",
                            },
-                           "3:2:5:5", "conv_mb_no_overlap.nnlayergolden",
+                           "3:2:5:5", "conv2d_mb_no_overlap.nnlayergolden",
                            LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_sb_1x1_kernel = LayerGoldenTestParamType(
+auto conv2d_sb_1x1_kernel = LayerGoldenTestParamType(
   nntrainer::createLayer<nntrainer::Conv2DLayer>,
   {"filters=3", "kernel_size=1,1", "stride=2,2"}, "1:2:5:5",
-  "conv_sb_1x1_kernel.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
+  "conv2d_sb_1x1_kernel.nnlayergolden", LayerGoldenTestParamOptions::DEFAULT);
 
-auto conv_mb_1x1_kernel =
+auto conv2d_mb_1x1_kernel =
   LayerGoldenTestParamType(nntrainer::createLayer<nntrainer::Conv2DLayer>,
                            {
                              "filters=3",
                              "kernel_size=1,1",
                              "stride=2,2",
                            },
-                           "3:2:5:5", "conv_mb_1x1_kernel.nnlayergolden",
+                           "3:2:5:5", "conv2d_mb_1x1_kernel.nnlayergolden",
                            LayerGoldenTestParamOptions::DEFAULT);
 
 INSTANTIATE_TEST_CASE_P(
   Convolution2D, LayerGoldenTest,
-  ::testing::Values(conv_sb_minimum, conv_mb_minimum, conv_sb_same_remain,
-                    conv_mb_same_remain, conv_sb_same_uneven_remain_1,
-                    conv_sb_same_uneven_remain_2, conv_mb_same_uneven_remain_1,
-                    conv_mb_same_uneven_remain_2, conv_sb_valid_drop_last,
-                    conv_mb_valid_drop_last, conv_sb_no_overlap,
-                    conv_mb_no_overlap, conv_sb_1x1_kernel,
-                    conv_mb_1x1_kernel));
+  ::testing::Values(conv2d_sb_minimum, conv2d_mb_minimum, conv2d_sb_same_remain,
+                    conv2d_mb_same_remain, conv2d_sb_same_uneven_remain_1,
+                    conv2d_sb_same_uneven_remain_2,
+                    conv2d_mb_same_uneven_remain_1,
+                    conv2d_mb_same_uneven_remain_2, conv2d_sb_valid_drop_last,
+                    conv2d_mb_valid_drop_last, conv2d_sb_no_overlap,
+                    conv2d_mb_no_overlap, conv2d_sb_1x1_kernel,
+                    conv2d_mb_1x1_kernel));