Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small refinements for JSON model. (#5112)

Browse Source 
* Naming consistency.

* Remove duplicated test.
This commit is contained in:
Jiaming Yuan
2019-12-11 19:49:01 +08:00
committed by GitHub
parent 208ab3b1ff
commit ad4a1c732c
7 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gbm/gbtree_model.cc
View File

@@ -40,7 +40,7 @@ void GBTreeModel::Load(dmlc::Stream* fi) {
void GBTreeModel::SaveModel(Json* p_out) const {
auto& out = *p_out;
CHECK_EQ(param.num_trees, static_cast<int>(trees.size()));
out["model_param"] = toJson(param);
out["gbtree_model_param"] = toJson(param);
std::vector<Json> trees_json;
size_t t = 0;
for (auto const& tree : trees) {
@@ -61,7 +61,7 @@ void GBTreeModel::SaveModel(Json* p_out) const {
}
void GBTreeModel::LoadModel(Json const& in) {
fromJson(in["model_param"], &param);
fromJson(in["gbtree_model_param"], &param);
trees.clear();
trees_to_update.clear();

6
src/learner.cc
View File

@@ -269,7 +269,7 @@ class LearnerImpl : public Learner {
void LoadModel(Json const& in) override {
CHECK(IsA<Object>(in));
Version::Load(in, false);
auto const& learner = get<Object>(in["Learner"]);
auto const& learner = get<Object>(in["learner"]);
mparam_.FromJson(learner.at("learner_model_param"));
auto const& objective_fn = learner.at("objective");
@@ -305,8 +305,8 @@ class LearnerImpl : public Learner {
Version::Save(p_out);
Json& out { *p_out };
out["Learner"] = Object();
auto& learner = out["Learner"];
out["learner"] = Object();
auto& learner = out["learner"];
learner["learner_model_param"] = mparam_.ToJson();
learner["gradient_booster"] = Object();