[coco] Modified FeatureObject test, working for coco::FeatureShape (#2674)
author윤현식/동작제어Lab(SR)/Principal Engineer/삼성전자 <hyunsik.yoon@samsung.com>
Fri, 14 Dec 2018 05:29:41 +0000 (14:29 +0900)
committer박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Fri, 14 Dec 2018 05:29:41 +0000 (14:29 +0900)
With #2667, a warning was thrown. (ambiguous operator) This PR resolve the issue.

Signed-off-by: Hyun Sik Yoon hyunsik.yoon@samsung.com
contrib/coco/core/src/IR/FeatureObject.test.cpp

index f6b4fbf..7cd875a 100644 (file)
@@ -33,7 +33,7 @@ class FeatureObjectTest : public ::testing::Test
 {
 protected:
   // TODO Deprecate this method
-  coco::FeatureObject *allocate(const feature::Shape &shape)
+  coco::FeatureObject *allocate(const coco::FeatureShape &shape)
   {
     auto o = new coco::FeatureObject{};
     o->layout(coco::FeatureLayouts::Generic::create(shape));
@@ -48,7 +48,7 @@ private:
 
 TEST_F(FeatureObjectTest, ctor)
 {
-  const nncc::core::ADT::feature::Shape shape{1, 3, 3};
+  const coco::FeatureShape shape{1, 3, 3};
 
   auto o = allocate(shape);
 
@@ -64,7 +64,7 @@ TEST_F(FeatureObjectTest, at)
   const uint32_t H = 3;
   const uint32_t W = 3;
 
-  const nncc::core::ADT::feature::Shape shape{C, H, W};
+  const coco::FeatureShape shape{C, H, W};
 
   auto o = allocate(shape);
 
@@ -97,7 +97,7 @@ TEST_F(FeatureObjectTest, at)
 
 TEST_F(FeatureObjectTest, asFeature)
 {
-  const nncc::core::ADT::feature::Shape shape{1, 3, 3};
+  const coco::FeatureShape shape{1, 3, 3};
 
   auto o = allocate(shape);