drop model_file_path parameter from CreateModel()

NNTrainer needs only config file path so drop it,
and consider model_conf_path.

Change-Id: Iffb04b81905716a64e5a922689f6e6ca6cbe501b
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/packaging/training-engine-nntrainer.spec b/packaging/training-engine-nntrainer.spec
index bfbda682c744edf7b3a4a070c8c9255d5c4b9612..e0f5ff91806c7198129bd0dc9b609498e2c9f29a 100644 (file)
--- a/packaging/training-engine-nntrainer.spec
+++ b/packaging/training-engine-nntrainer.spec
@@ -1,6 +1,6 @@
 Name:       training-engine-nntrainer
 Summary:    Training engine NNTrainer backend
-Version:    0.0.1
+Version:    0.0.2
 Release:    1
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/training_engine_nntrainer.cpp b/src/training_engine_nntrainer.cpp
index 232b738c1de7ab3aa350f1d83f142afadae8d23b..090b10a2a8cb5ae1f4aafba889bfe6ac8444ea16 100644 (file)
--- a/src/training_engine_nntrainer.cpp
+++ b/src/training_engine_nntrainer.cpp
@@ -157,8 +157,7 @@ namespace NntrainerImpl
                }
        }
 
-       unique_ptr<training_engine_model> TrainingNntrainer::CreateModel(std::string backbone_model_path,
-                                                                                                                                        std::string model_config_path)
+       unique_ptr<training_engine_model> TrainingNntrainer::CreateModel(std::string model_config_path)
        {
                LOGI("ENTER");
 
@@ -167,7 +166,13 @@ namespace NntrainerImpl
                auto model = make_unique<training_engine_model>();
                ml_train_model_h model_handle;
 
-               int ret = ml_train_model_construct(&model_handle);
+               int ret = ML_ERROR_NONE;
+
+               if (!model_config_path.empty())
+                       ret = ml_train_model_construct_with_conf(model_config_path.c_str(), &model_handle);
+               else
+                       ret = ml_train_model_construct(&model_handle);
+
                if (ret != ML_ERROR_NONE) {
                        LOGE("Failed to create a model.");
                        return NULL;

diff --git a/src/training_engine_nntrainer_private.h b/src/training_engine_nntrainer_private.h
index 5c53f12ad341e0bffb95f9a48f1d2e2065181bd8..92a8eb9e6ac9db4c57f3ffcdf44ad036ff868f48 100644 (file)
--- a/src/training_engine_nntrainer_private.h
+++ b/src/training_engine_nntrainer_private.h
@@ -52,7 +52,7 @@ namespace NntrainerImpl
                ~TrainingNntrainer();
 
                int GetBackendCapacity(training_engine_capacity &capacity) final;
-               std::unique_ptr<training_engine_model> CreateModel(std::string backbone_model_path, std::string model_config_path) final;
+               std::unique_ptr<training_engine_model> CreateModel(std::string model_config_path) final;
                void DestroyModel(const training_engine_model *model) final;
                std::unique_ptr<training_engine_layer> CreateLayer(training_engine_layer_type_e type) final;
                void DestroyLayer(const training_engine_layer *layer) final;