From: 박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Date: Wed, 10 Jul 2019 04:05:38 +0000 (+0900)
Subject: [locomotiv] Remove make_dimension(uint32_t) usage (#4171)
X-Git-Tag: nncc_backup~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0021bedfaa31455fa0bdfc00b45f43a9f383f56a;p=platform%2Fcore%2Fml%2Fnnfw.git

[locomotiv] Remove make_dimension(uint32_t) usage (#4171)

This commit revises locomotiv not to invoke deprecated
make_dimension(uint32_t).

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

diff --git a/contrib/locomotiv/src/Node/FeatureDecode.cpp b/contrib/locomotiv/src/Node/FeatureDecode.cpp
index 66b5866..8f1a178 100644
--- a/contrib/locomotiv/src/Node/FeatureDecode.cpp
+++ b/contrib/locomotiv/src/Node/FeatureDecode.cpp
@@ -45,10 +45,10 @@ std::unique_ptr<locomotiv::NodeData> feature_decode(const loco::FeatureDecode *n
   // Make FeatureShape from input. Note that feature in locomotiv represented as NHWC
   loco::FeatureShape input_shape;
   assert(input_buf->shape().rank() == 4);
-  input_shape.count() = loco::make_dimension(input_buf->shape().dim(0));
-  input_shape.height() = loco::make_dimension(input_buf->shape().dim(1));
-  input_shape.width() = loco::make_dimension(input_buf->shape().dim(2));
-  input_shape.depth() = loco::make_dimension(input_buf->shape().dim(3));
+  input_shape.count() = input_buf->shape().dim(0);
+  input_shape.height() = input_buf->shape().dim(1);
+  input_shape.width() = input_buf->shape().dim(2);
+  input_shape.depth() = input_buf->shape().dim(3);
 
   loco::TensorShape node_shape = decoder->shape(input_shape);
 
diff --git a/contrib/locomotiv/src/Node/FeatureEncode.cpp b/contrib/locomotiv/src/Node/FeatureEncode.cpp
index 6d9cdf0..aa1a52f 100644
--- a/contrib/locomotiv/src/Node/FeatureEncode.cpp
+++ b/contrib/locomotiv/src/Node/FeatureEncode.cpp
@@ -47,7 +47,7 @@ std::unique_ptr<locomotiv::NodeData> feature_encode(const loco::FeatureEncode *n
   assert(input_shape.rank() == 4);
   for (uint32_t i = 0; i < input_shape.rank(); ++i)
   {
-    input_shape.dim(i) = loco::make_dimension(input_buf->shape().dim(i));
+    input_shape.dim(i) = input_buf->shape().dim(i);
   }
 
   loco::FeatureShape node_shape = encoder->shape(input_shape);
diff --git a/contrib/locomotiv/src/Node/FilterEncode.cpp b/contrib/locomotiv/src/Node/FilterEncode.cpp
index 4ad10fb..686c7ae 100644
--- a/contrib/locomotiv/src/Node/FilterEncode.cpp
+++ b/contrib/locomotiv/src/Node/FilterEncode.cpp
@@ -47,7 +47,7 @@ std::unique_ptr<locomotiv::NodeData> filter_encode(const loco::FilterEncode *nod
   assert(input_shape.rank() == 4);
   for (uint32_t i = 0; i < input_shape.rank(); ++i)
   {
-    input_shape.dim(i) = loco::make_dimension(input_buf->shape().dim(i));
+    input_shape.dim(i) = input_buf->shape().dim(i);
   }
 
   loco::FilterShape node_shape = encoder->shape(input_shape);
diff --git a/contrib/locomotiv/src/Session.test.cpp b/contrib/locomotiv/src/Session.test.cpp
index b0c15fb..1eeddc7 100644
--- a/contrib/locomotiv/src/Session.test.cpp
+++ b/contrib/locomotiv/src/Session.test.cpp
@@ -64,7 +64,7 @@ TEST(Session, set_input)
   auto pull = g->nodes()->create<loco::Pull>();
   pull->dtype(loco::DataType::FLOAT32);
   pull->rank(1);
-  pull->dim(0) = loco::make_dimension(1);
+  pull->dim(0) = 1;
   g->inputs()->create()->node(pull);
 
   // Make good data
@@ -105,7 +105,7 @@ TEST(Session, inference_identity)
     auto pull_node = g->nodes()->create<loco::Pull>();
     pull_node->dtype(loco::DataType::FLOAT32);
     pull_node->rank(1);
-    pull_node->dim(0) = loco::make_dimension(1);
+    pull_node->dim(0) = 1;
 
     // Push node
     auto push_node = g->nodes()->create<loco::Push>();
@@ -187,7 +187,7 @@ TEST(Session, dtor)
   auto pull = g->nodes()->create<loco::Pull>();
   pull->dtype(loco::DataType::FLOAT32);
   pull->rank(1);
-  pull->dim(0) = loco::make_dimension(1);
+  pull->dim(0) = 1;
 
   // Input
   auto input = g->inputs()->create();