Merge branch 'master' of ssh://github.com/tqchen/xgboost

Conflicts:
	src/utils/omp.h
This commit is contained in:
tqchen
2014-09-01 17:03:20 -07:00
3 changed files with 11 additions and 7 deletions

View File

@@ -10,7 +10,7 @@
#else
#ifndef DISABLE_OPENMP
// use pragma message instead of warning
#pragma message ("Warning: OpenMP is not available. XGBoost will be compiled with single thread mode. You may want to use compiler with OpenMP support to get benefit of multi-threading.")
#pragma message ("Warning: OpenMP is not available, xgboost will be compiled into single-thread code. Use OpenMP-enabled compiler to get benefit of multi-threading")
#endif
inline int omp_get_thread_num() { return 0; }
inline int omp_get_num_threads() { return 1; }