From 51e8ef121a2fa4c79dc4733cf8fbaecd9c0339ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Fri, 31 Aug 2018 13:20:03 +0900 Subject: [PATCH] [enco] Add ConvolutionSpec::ifm_shape test (#1266) This commit extracts repeated tests over ifm_shape as a seperate test. Signed-off-by: Jonghyun Park --- .../frontend/caffe/src/ConvolutionSpec.test.cpp | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) 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()); -- 2.7.4