diff --git a/make/travis.mk b/make/travis.mk index 85f53ca32..0c9fd5b7d 100644 --- a/make/travis.mk +++ b/make/travis.mk @@ -31,4 +31,4 @@ LIBJVM=$(JAVA_HOME)/jre/lib/amd64/server # XGB_PLUGINS += plugin/example/plugin.mk XGB_PLUGINS += plugin/lz4/plugin.mk -XGB_PLUGINS += plugin/dense_libsvm/plugin.mk +XGB_PLUGINS += plugin/dense_parser/plugin.mk diff --git a/src/data/data.cc b/src/data/data.cc index 39fa260d1..cea87c09f 100644 --- a/src/data/data.cc +++ b/src/data/data.cc @@ -124,6 +124,14 @@ void MetaInfo::SetInfo(const char* key, const void* dptr, DataType dtype, size_t base_margin.resize(num); DISPATCH_CONST_PTR(dtype, dptr, cast_dptr, std::copy(cast_dptr, cast_dptr + num, base_margin.begin())); + } else if (!std::strcmp(key, "group")) { + group_ptr.resize(num + 1); + DISPATCH_CONST_PTR(dtype, dptr, cast_dptr, + std::copy(cast_dptr, cast_dptr + num, group_ptr.begin() + 1)); + group_ptr[0] = 0; + for (size_t i = 1; i < group_ptr.size(); ++i) { + group_ptr[i] = group_ptr[i - 1] + group_ptr[i]; + } } } diff --git a/src/tree/param.h b/src/tree/param.h index b6ac89aef..e9de3ac14 100644 --- a/src/tree/param.h +++ b/src/tree/param.h @@ -87,7 +87,7 @@ struct TrainParam : public dmlc::Parameter { .describe("Subsample ratio of columns, resample on each tree construction."); DMLC_DECLARE_FIELD(opt_dense_col).set_range(0.0f, 1.0f).set_default(1.0f) .describe("EXP Param: speed optimization for dense column."); - DMLC_DECLARE_FIELD(sketch_eps).set_range(0.0f, 1.0f).set_default(0.1f) + DMLC_DECLARE_FIELD(sketch_eps).set_range(0.0f, 1.0f).set_default(0.03f) .describe("EXP Param: Sketch accuracy of approximate algorithm."); DMLC_DECLARE_FIELD(sketch_ratio).set_lower_bound(0.0f).set_default(2.0f) .describe("EXP Param: Sketch accuracy related parameter of approximate algorithm."); diff --git a/src/tree/updater_histmaker.cc b/src/tree/updater_histmaker.cc index 6af7c8117..fce76808a 100644 --- a/src/tree/updater_histmaker.cc +++ b/src/tree/updater_histmaker.cc @@ -871,7 +871,7 @@ class QuantileHistMaker: public HistMaker { std::vector > sketchs; }; -XGBOOST_REGISTER_TREE_UPDATER(HistMaker, "grow_histmaker") +XGBOOST_REGISTER_TREE_UPDATER(LocalHistMaker, "grow_local_histmaker") .describe("Tree constructor that uses approximate histogram construction.") .set_body([]() { return new CQHistMaker(); @@ -879,6 +879,12 @@ XGBOOST_REGISTER_TREE_UPDATER(HistMaker, "grow_histmaker") XGBOOST_REGISTER_TREE_UPDATER(GlobalHistMaker, "grow_global_histmaker") .describe("Tree constructor that uses approximate global proposal of histogram construction.") +.set_body([]() { + return new GlobalProposalHistMaker(); + }); + +XGBOOST_REGISTER_TREE_UPDATER(HistMaker, "grow_histmaker") +.describe("Tree constructor that uses approximate global of histogram construction.") .set_body([]() { return new GlobalProposalHistMaker(); });