Small cleanup to hist tree method. (#7735)

* Remove special optimization using number of bins.
* Remove 1-based index for column sampling.
* Remove data layout.
* Unify update prediction cache.
This commit is contained in:
Jiaming Yuan
2022-03-20 03:44:55 +08:00
committed by GitHub
parent 718472dbe2
commit 996cc705af
9 changed files with 140 additions and 205 deletions

View File

@@ -254,8 +254,7 @@ TEST(GpuHist, EvaluateRootSplit) {
std::vector<float> feature_weights;
maker.column_sampler.Init(kNCols, feature_weights, param.colsample_bynode,
param.colsample_bylevel, param.colsample_bytree,
false);
param.colsample_bylevel, param.colsample_bytree);
RegTree tree;
MetaInfo info;

View File

@@ -35,8 +35,7 @@ class QuantileHistMock : public QuantileHistMaker {
std::vector<GradientPair>* gpair,
DMatrix* p_fmat,
const RegTree& tree) {
RealImpl::InitData(gmat, *p_fmat, tree, gpair);
ASSERT_EQ(this->data_layout_, RealImpl::DataLayout::kSparseData);
RealImpl::InitData(gmat, p_fmat, tree, gpair);
/* The creation of HistCutMatrix and GHistIndexMatrix are not technically
* part of QuantileHist updater logic, but we include it here because