[neurun] Simpify TypeInfo constructor using default parameters (#4926)

`scale` and `offset` are used only in case of `TENSOR_QUANT8_ASYMM`.
For most cases, we don't need the values at all.

Signed-off-by: Sanggyu Lee <sg5.lee@samsung.com>

diff --git a/runtimes/neurun/core/include/model/operand/TypeInfo.h b/runtimes/neurun/core/include/model/operand/TypeInfo.h
index 10a47d9..35f43cf 100644 (file)
--- a/runtimes/neurun/core/include/model/operand/TypeInfo.h
+++ b/runtimes/neurun/core/include/model/operand/TypeInfo.h
@@ -33,9 +33,9 @@ class TypeInfo
 public:
   TypeInfo() = delete;
 
-  TypeInfo(DataType type, float scale, int32_t offset) : _type(type), _scale(scale), _offset(offset)
+  explicit TypeInfo(DataType type, float scale = 0, int32_t offset = 0)
+      : _type(type), _scale(scale), _offset(offset)
   {
-    // DO NOTHING
   }
 
 public:

diff --git a/runtimes/neurun/test/graph/operand/Set.cc b/runtimes/neurun/test/graph/operand/Set.cc
index 2a0836c..310cf91 100644 (file)
--- a/runtimes/neurun/test/graph/operand/Set.cc
+++ b/runtimes/neurun/test/graph/operand/Set.cc
@@ -30,7 +30,7 @@ TEST(graph_operand_Set, set_test)
   shape1.dim(2) = 30;
   shape1.dim(3) = 40;
 
-  ::neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32, 0, 0};
+  ::neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32};
 
   set.append(shape0, type);
   set.append(shape1, type);

diff --git a/runtimes/neurun/test/graph/operand/UseDef.cc b/runtimes/neurun/test/graph/operand/UseDef.cc
index 00f22f8..34fc829 100644 (file)
--- a/runtimes/neurun/test/graph/operand/UseDef.cc
+++ b/runtimes/neurun/test/graph/operand/UseDef.cc
@@ -38,7 +38,7 @@ TEST(graph_operand_usedef, usedef_test)
   neurun::graph::verifier::DAGChecker verifier;
 
   neurun::model::operand::Shape shape(3);
-  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32, 0, 0};
+  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32};
 
   // Model Input/Output
   auto input_operand = model->operands.append(shape, type);

diff --git a/runtimes/neurun/test/graph/operation/SetIO.cc b/runtimes/neurun/test/graph/operation/SetIO.cc
index 5d1f7a0..48b25f5 100644 (file)
--- a/runtimes/neurun/test/graph/operation/SetIO.cc
+++ b/runtimes/neurun/test/graph/operation/SetIO.cc
@@ -35,7 +35,7 @@ TEST(graph_operation_setIO, operation_setIO_conv)
   neurun::model::Model model;
 
   neurun::model::operand::Shape shape{3};
-  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32, 0, 0};
+  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32};
 
   // Add Conv
   using GraphNode = neurun::model::operation::Conv2DNode;
@@ -70,7 +70,7 @@ TEST(graph_operation_setIO, operation_setIO_concat)
 
   neurun::model::operand::Shape shape{3};
 
-  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32, 0, 0};
+  neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32};
 
   using GraphNode = neurun::model::operation::ConcatNode;
 

diff --git a/runtimes/neurun/test/graph/verifier/Verifier.cc b/runtimes/neurun/test/graph/verifier/Verifier.cc
index 65523be..e3f0d51 100644 (file)
--- a/runtimes/neurun/test/graph/verifier/Verifier.cc
+++ b/runtimes/neurun/test/graph/verifier/Verifier.cc
@@ -32,7 +32,7 @@ TEST(Verifier, dag_checker)
   std::unique_ptr<neurun::model::Model> model = nnfw::cpp14::make_unique<neurun::model::Model>();
 
   ::neurun::model::operand::Shape shape{3};
-  ::neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32, 0, 0};
+  ::neurun::model::operand::TypeInfo type{neurun::model::operand::DataType::TENSOR_INT32};
 
   auto operand1 = model->operands.append(shape, type);
   auto operand2 = model->operands.append(shape, type);

diff --git a/runtimes/neurun/test/interp/ExecManager.cc b/runtimes/neurun/test/interp/ExecManager.cc
index c8f05fa..7a93f85 100644 (file)
--- a/runtimes/neurun/test/interp/ExecManager.cc
+++ b/runtimes/neurun/test/interp/ExecManager.cc
@@ -46,9 +46,9 @@ protected:
     std::unique_ptr<neurun::model::Model> model = nnfw::cpp14::make_unique<neurun::model::Model>();
 
     operand::Shape shape{1, 2, 2, 1};
-    operand::TypeInfo type{DataType::TENSOR_INT32, 0, 0};
+    operand::TypeInfo type{DataType::TENSOR_INT32};
     operand::Shape shape_scalar(0);
-    operand::TypeInfo type_scalar{DataType::SCALAR_INT32, 0, 0};
+    operand::TypeInfo type_scalar{DataType::SCALAR_INT32};
 
     auto operand_lhs = model->operands.append(shape, type);
     auto operand_rhs = model->operands.append(shape, type);