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

Merge pull request #552 from yoori/perf

Browse Source 
GBTree::Predict performance fix: removed excess thread_temp initializ…
This commit is contained in:
Tianqi Chen 2015-10-22 08:39:05 -07:00
commit c4181e5f2e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/gbm/gbtree-inl.hpp
View File

@ -138,10 +138,7 @@ class GBTree : public IGradBooster {
{ {
nthread = omp_get_num_threads(); nthread = omp_get_num_threads();
} }
thread_temp.resize(nthread, tree::RegTree::FVec()); InitThreadTemp(nthread);
for (int i = 0; i < nthread; ++i) {
thread_temp[i].Init(mparam.num_feature);
}
std::vector<float> &preds = *out_preds; std::vector<float> &preds = *out_preds;
const size_t stride = info.num_row * mparam.num_output_group; const size_t stride = info.num_row * mparam.num_output_group;
preds.resize(stride * (mparam.size_leaf_vector+1)); preds.resize(stride * (mparam.size_leaf_vector+1));
@ -194,10 +191,7 @@ class GBTree : public IGradBooster {
{ {
nthread = omp_get_num_threads(); nthread = omp_get_num_threads();
} }
thread_temp.resize(nthread, tree::RegTree::FVec()); InitThreadTemp(nthread);
for (int i = 0; i < nthread; ++i) {
thread_temp[i].Init(mparam.num_feature);
}
this->PredPath(p_fmat, info, out_preds, ntree_limit); this->PredPath(p_fmat, info, out_preds, ntree_limit);
} }
virtual std::vector<std::string> DumpModel(const utils::FeatMap& fmap, int option) { virtual std::vector<std::string> DumpModel(const utils::FeatMap& fmap, int option) {
@ -391,6 +385,16 @@ class GBTree : public IGradBooster {
} }
} }
} }
// init thread buffers
inline void InitThreadTemp(int nthread) {
int prev_thread_temp_size = thread_temp.size();
if (prev_thread_temp_size < nthread) {
thread_temp.resize(nthread, tree::RegTree::FVec());
for (int i = prev_thread_temp_size; i < nthread; ++i) {
thread_temp[i].Init(mparam.num_feature);
}
}
}
// --- data structure --- // --- data structure ---
/*! \brief training parameters */ /*! \brief training parameters */