floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #2238 

Always obey omp_get_max_threads() when build with USE_OPENMP
This commit is contained in:
Jussi Enkovaara 2020-07-07 13:35:43 +03:00
parent 5ff83a4261
commit 10a2923f64
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common_thread.h
View File

@ -132,18 +132,18 @@ extern int blas_server_avail;
static __inline int num_cpu_avail(int level) { static __inline int num_cpu_avail(int level) {
#ifdef USE_OPENMP #ifdef USE_OPENMP
int openmp_nthreads=0; int openmp_nthreads=omp_get_max_threads();
#endif #endif
#ifndef USE_OPENMP
if (blas_cpu_number == 1 if (blas_cpu_number == 1
#ifdef USE_OPENMP
|| omp_in_parallel()
#endif #endif
) return 1; #ifdef USE_OPENMP
if (openmp_nthreads == 1 || omp_in_parallel()
#endif
) return 1;
#ifdef USE_OPENMP #ifdef USE_OPENMP
openmp_nthreads=omp_get_max_threads();
if (blas_cpu_number != openmp_nthreads) { if (blas_cpu_number != openmp_nthreads) {
goto_set_num_threads(openmp_nthreads); goto_set_num_threads(openmp_nthreads);
} }