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

Combine TreeModel and RegTree (#3995)

Browse Source
This commit is contained in:
Rory Mitchell
2018-12-19 12:16:40 +13:00
committed by GitHub
parent c055a32609
commit 84c99f86f4
10 changed files with 559 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/cpp/predictor/test_cpu_predictor.cc
View File

@@ -10,7 +10,6 @@ TEST(cpu_predictor, Test) {
std::vector<std::unique_ptr<RegTree>> trees;
trees.push_back(std::unique_ptr<RegTree>(new RegTree));
trees.back()->InitModel();
(*trees.back())[0].SetLeaf(1.5f);
(*trees.back()).Stat(0).sum_hess = 1.0f;
gbm::GBTreeModel model(0.5);

2
tests/cpp/predictor/test_gpu_predictor.cu
View File

@@ -35,7 +35,6 @@ TEST(gpu_predictor, Test) {
std::vector<std::unique_ptr<RegTree>> trees;
trees.push_back(std::unique_ptr<RegTree>(new RegTree()));
trees.back()->InitModel();
(*trees.back())[0].SetLeaf(1.5f);
(*trees.back()).Stat(0).sum_hess = 1.0f;
gbm::GBTreeModel model(0.5);
@@ -181,7 +180,6 @@ TEST(gpu_predictor, MGPU_Test) {
std::vector<std::unique_ptr<RegTree>> trees;
trees.push_back(std::unique_ptr<RegTree>(new RegTree()));
trees.back()->InitModel();
(*trees.back())[0].SetLeaf(1.5f);
(*trees.back()).Stat(0).sum_hess = 1.0f;
gbm::GBTreeModel model(0.5);

3
tests/cpp/tree/test_gpu_hist.cu
View File

@@ -291,8 +291,6 @@ TEST(GpuHist, EvaluateSplits) {
false);
RegTree tree;
tree.InitModel();
MetaInfo info;
info.num_row_ = n_rows;
info.num_col_ = n_cols;
@@ -339,7 +337,6 @@ TEST(GpuHist, ApplySplit) {
// Initialize GPUHistMaker
hist_maker.param_ = param;
RegTree tree;
tree.InitModel();
DeviceSplitCandidate candidate;
candidate.Update(2, kLeftDir,

1
tests/cpp/tree/test_prune.cc
View File

@@ -31,7 +31,6 @@ TEST(Updater, Prune) {
// prepare tree
RegTree tree = RegTree();
tree.InitModel();
tree.param.InitAllowUnknown(cfg);
std::vector<RegTree*> trees {&tree};
// prepare pruner

3
tests/cpp/tree/test_quantile_hist.cc
View File

@@ -122,7 +122,6 @@ class QuantileHistMock : public QuantileHistMaker {
gmat.Init((*dmat).get(), max_bins);
RegTree tree = RegTree();
tree.InitModel();
tree.param.InitAllowUnknown(cfg);
std::vector<GradientPair> gpair =
@@ -134,7 +133,6 @@ class QuantileHistMock : public QuantileHistMaker {
void TestBuildHist() {
RegTree tree = RegTree();
tree.InitModel();
tree.param.InitAllowUnknown(cfg);
size_t constexpr max_bins = 4;
@@ -146,7 +144,6 @@ class QuantileHistMock : public QuantileHistMaker {
void TestEvaluateSplit() {
RegTree tree = RegTree();
tree.InitModel();
tree.param.InitAllowUnknown(cfg);
builder_->TestEvaluateSplit(gmatb_, tree);

1
tests/cpp/tree/test_refresh.cc
View File

@@ -25,7 +25,6 @@ TEST(Updater, Refresh) {
{"reg_lambda", "1"}};
RegTree tree = RegTree();
tree.InitModel();
tree.param.InitAllowUnknown(cfg);
std::vector<RegTree*> trees {&tree};
std::unique_ptr<TreeUpdater> refresher(TreeUpdater::Create("refresh"));