[IniWrapper] Add factory method

This patch adds a function to create ini section directly from
exportable which implements .exportTo to reduce overlapping codes

**Self evaluation:**
1. Build test: [X]Passed [ ]Failed [ ]Skipped
2. Run test: [X]Passed [ ]Failed [ ]Skipped

Signed-off-by: Jihoon Lee <jhoon.it.lee@samsung.com>

diff --git a/nntrainer/compiler/ini_interpreter.cpp b/nntrainer/compiler/ini_interpreter.cpp
index 1d46d69368c498d81c32e928b9000ffced9fc998..5377a1bd844aee264499c46b5e41a5590c184e20 100644 (file)
--- a/nntrainer/compiler/ini_interpreter.cpp
+++ b/nntrainer/compiler/ini_interpreter.cpp
@@ -21,7 +21,6 @@
 #include <layer_node.h>
 #include <nntrainer_error.h>
 #include <nntrainer_log.h>
-#include <node_exporter.h>
 #include <parse_util.h>
 #include <time_dist.h>
 #include <util_func.h>
@@ -260,19 +259,9 @@ void IniGraphInterpreter::serialize(const GraphRepresentation &representation,
        iter++) {
     const auto &ln = *iter;
 
-    IniSection s(ln->getName());
+    IniSection s = IniSection::FromExportable(ln->getName(), *ln);
     s.setEntry("type", ln->getType());
 
-    Exporter e;
-    ln->exportTo(e, ExportMethods::METHOD_STRINGVECTOR);
-
-    const auto key_val_pairs =
-      e.getResult<ExportMethods::METHOD_STRINGVECTOR>();
-
-    for (const auto &pair : *key_val_pairs) {
-      s.setEntry(pair.first, pair.second);
-    }
-
     sections.push_back(s);
   }
 

diff --git a/nntrainer/models/neuralnet.cpp b/nntrainer/models/neuralnet.cpp
index f7706b500378de39d04f7238d38ea63f21723963..d4e4b728769874aad5aff5dabf327decde879f20 100644 (file)
--- a/nntrainer/models/neuralnet.cpp
+++ b/nntrainer/models/neuralnet.cpp
@@ -420,18 +420,9 @@ void NeuralNetwork::saveModelIni(const std::string &file_path) {
        "permitted, path: "
     << file_path;
 
-  IniSection model_section("model");
+  IniSection model_section = IniSection::FromExportable("model", *this);
   model_section.setEntry("type", "NeuralNetwork");
 
-  Exporter e;
-  e.saveResult(model_props, ExportMethods::METHOD_STRINGVECTOR, this);
-  e.saveResult(model_flex_props, ExportMethods::METHOD_STRINGVECTOR, this);
-
-  const auto key_val_pairs = e.getResult<ExportMethods::METHOD_STRINGVECTOR>();
-  for (const auto &pair : *key_val_pairs) {
-    model_section.setEntry(pair.first, pair.second);
-  }
-
   IniWrapper wrapper("model_saver", {model_section});
   wrapper.save_ini(file_path);
 
@@ -836,6 +827,12 @@ void NeuralNetwork::printPreset(std::ostream &out, unsigned int preset) {
   print(out, flags, layer_preset);
 }
 
+void NeuralNetwork::exportTo(Exporter &exporter,
+                             const ExportMethods &method) const {
+  exporter.saveResult(model_props, method, this);
+  exporter.saveResult(model_flex_props, method, this);
+}
+
 void NeuralNetwork::print(std::ostream &out, unsigned int flags,
                           LayerNode::PrintPreset layerPrintPreset) {
   if (flags & PRINT_INST_INFO) {

diff --git a/nntrainer/models/neuralnet.h b/nntrainer/models/neuralnet.h
index 0d41ba4cda5cd41cec766324b6300935aea0ce83..47946e77ee67946b6749a390485a60b9200788b5 100644 (file)
--- a/nntrainer/models/neuralnet.h
+++ b/nntrainer/models/neuralnet.h
@@ -53,6 +53,9 @@ enum class DatasetModeType;
 
 namespace nntrainer {
 
+class Exporter;
+enum class ExportMethods;
+
 /**
  * @brief     Enumeration of Network Type
  */
@@ -353,6 +356,15 @@ public:
    */
   int getLayer(const char *name, NodeType *layer);
 
+  /**
+   * @brief this function helps exporting the layer in a predefined format,
+   * while workarounding issue caused by templated function type eraser
+   *
+   * @param     exporter exporter that conatins exporting logic
+   * @param     method enum value to identify how it should be exported to
+   */
+  void exportTo(Exporter &exporter, const ExportMethods &method) const;
+
   /**
    * @brief     get input dimension of neural network
    * @retval std::vector<TensorDim> input dimension

diff --git a/nntrainer/utils/ini_wrapper.h b/nntrainer/utils/ini_wrapper.h
index d12fa3cae1a65decadf9affef236853a82837ac0..e4557f666f50a4c69e91081b0896c63464f91536 100644 (file)
--- a/nntrainer/utils/ini_wrapper.h
+++ b/nntrainer/utils/ini_wrapper.h
@@ -16,9 +16,10 @@
 #include <iostream>
 #include <map>
 #include <string>
-
 #include <vector>
 
+#include <node_exporter.h>
+
 #ifndef __INI_WRAPPER_H__
 #define __INI_WRAPPER_H__
 
@@ -75,6 +76,32 @@ public:
    */
   IniSection() : section_name(""), entry{} {};
 
+  /**
+   * @brief Construct a new Ini Section object which implements object::exportTo
+   *
+   * @tparam Exportable object with member object::exportTo
+   * @param section_name section name
+   * @param exportable exportable object
+   */
+  template <typename Exportable>
+  static IniSection FromExportable(const std::string &section_name,
+                                   const Exportable &exportable) {
+    IniSection s(section_name);
+    Exporter e;
+    exportable.exportTo(e, ExportMethods::METHOD_STRINGVECTOR);
+    const auto key_val_pairs =
+      e.getResult<ExportMethods::METHOD_STRINGVECTOR>();
+
+    if (!key_val_pairs) {
+      throw std::invalid_argument("returend pairs are nullptr!");
+    }
+
+    for (const auto &pair : *key_val_pairs) {
+      s.setEntry(pair.first, pair.second);
+    }
+    return s;
+  }
+
   /**
    * @brief Default destructor for the Ini Section object
    *