Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Revert "Manually track num_max_thread (#12380)" #13501

Merged
merged 1 commit into from
Dec 3, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/engine/openmp.cc
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,18 @@ void OpenMP::set_reserve_cores(int cores) {
CHECK_GE(cores, 0);
reserve_cores_ = cores;
#ifdef _OPENMP
omp_thread_max_ = std::max(omp_thread_max_ - reserve_cores_, 1);
if (reserve_cores_ >= omp_thread_max_) {
omp_set_num_threads(1);
} else {
omp_set_num_threads(omp_thread_max_ - reserve_cores_);
zhreshold marked this conversation as resolved.
Show resolved Hide resolved
}
#endif
}

int OpenMP::GetRecommendedOMPThreadCount(bool exclude_reserved) const {
#ifdef _OPENMP
if (omp_num_threads_set_in_environment_) {
return omp_thread_max_;
return omp_get_max_threads();
}
if (enabled_) {
int thread_count = omp_get_max_threads();
Expand All @@ -97,8 +101,10 @@ int OpenMP::GetRecommendedOMPThreadCount(bool exclude_reserved) const {
}
return omp_thread_max_;
}
#endif
return 1;
#else
return 1;
#endif
}

OpenMP *__init_omp__ = OpenMP::Get();
Expand Down