From: 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Fri, 31 Aug 2018 04:20:03 +0000 (+0900)
Subject: [enco] Add ConvolutionSpec::ifm_shape test (#1266)
X-Git-Tag: nncc_backup~1995
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51e8ef121a2fa4c79dc4733cf8fbaecd9c0339ef;p=platform%2Fcore%2Fml%2Fnnfw.git

[enco] Add ConvolutionSpec::ifm_shape test (#1266)

This commit extracts repeated tests over ifm_shape as a seperate test.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
---

diff --git a/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp b/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
index 4870a52..ffd399c 100644
--- a/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
+++ b/contrib/enco/frontend/caffe/src/ConvolutionSpec.test.cpp
@@ -47,6 +47,20 @@ protected:
 };
 } // namespace
 
+TEST_F(ConvolutionSpecTest, ifm_shape)
+{
+  ::caffe::ConvolutionParameter param;
+  ConvolutionSpec spec{param};
+
+  const tensor::Shape ifm_shape{1, 3, 244, 244};
+
+  spec.ifm_shape(ifm_shape);
+
+  ASSERT_EQ(spec.ifm_shape(), ifm_shape);
+  ASSERT_EQ(spec.num_batch_axes(), 1);
+  ASSERT_EQ(spec.num_spatial_axes(), 2);
+}
+
 namespace
 {
 // clang-format off
@@ -84,14 +98,6 @@ TEST_F(ConvolutionSpecTest, conv_0)
 
   spec.ifm_shape(ifm_shape);
 
-  // Check 'ifm_shape'
-  {
-    ASSERT_EQ(spec.ifm_rank(), 4);
-    ASSERT_EQ(spec.ifm_shape(), ifm_shape);
-    ASSERT_EQ(spec.num_batch_axes(), 1);
-    ASSERT_EQ(spec.num_spatial_axes(), 2);
-  }
-
   // Check 'ker_shape'
   {
     auto expected = as_tensor_shape(net.layer_by_name("conv")->blobs().at(0)->shape());
@@ -147,14 +153,6 @@ TEST_F(ConvolutionSpecTest, conv_1)
 
   spec.ifm_shape(ifm_shape);
 
-  // Check 'ifm_shape'
-  {
-    ASSERT_EQ(spec.ifm_rank(), 4);
-    ASSERT_EQ(spec.ifm_shape(), ifm_shape);
-    ASSERT_EQ(spec.num_batch_axes(), 1);
-    ASSERT_EQ(spec.num_spatial_axes(), 2);
-  }
-
   // Check 'ker_shape'
   {
     auto expected = as_tensor_shape(net.layer_by_name("conv")->blobs().at(0)->shape());