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

Changing omp_get_num_threads to omp_get_max_threads (#1831)

Browse Source 
* Updating dmlc-core

* Changing omp_get_num_threads to omp_get_max_threads
This commit is contained in:
Simon DENEL
2016-12-04 20:26:45 +01:00
committed by Tianqi Chen
parent 47ba2de7d4
commit 7078c41dad
10 changed files with 22 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/data/simple_dmatrix.cc
View File

@@ -83,13 +83,8 @@ void SimpleDMatrix::MakeOneBatch(const std::vector<bool>& enabled,
// clear rowset
buffered_rowset_.clear();
// bit map
int nthread;
const int nthread = omp_get_max_threads();
std::vector<bool> bmap;
#pragma omp parallel
{
nthread = omp_get_num_threads();
}
pcol->Clear();
common::ParallelGroupBuilder<SparseBatch::Entry>
builder(&pcol->offset, &pcol->data);
@@ -204,15 +199,7 @@ void SimpleDMatrix::MakeColPage(const RowBatch& batch,
size_t buffer_begin,
const std::vector<bool>& enabled,
SparsePage* pcol) {
int nthread;
#pragma omp parallel
{
nthread = omp_get_num_threads();
int max_nthread = std::max(omp_get_num_procs() / 2 - 2, 1);
if (nthread > max_nthread) {
nthread = max_nthread;
}
}
const int nthread = std::min(omp_get_max_threads(), std::max(omp_get_num_procs() / 2 - 2, 1));
pcol->Clear();
common::ParallelGroupBuilder<SparseBatch::Entry>
builder(&pcol->offset, &pcol->data);

7
src/data/sparse_page_dmatrix.cc
View File

@@ -169,12 +169,7 @@ void SparsePageDMatrix::InitColAccess(const std::vector<bool>& enabled,
SparsePage *pcol) {
pcol->Clear();
pcol->min_index = buffered_rowset_[begin];
int nthread;
#pragma omp parallel
{
nthread = omp_get_num_threads();
nthread = std::max(nthread, std::max(omp_get_num_procs() / 2 - 1, 1));
}
const int nthread = std::max(omp_get_max_threads(), std::max(omp_get_num_procs() / 2 - 1, 1));
common::ParallelGroupBuilder<SparseBatch::Entry>
builder(&pcol->offset, &pcol->data);
builder.InitBudget(info.num_col, nthread);