From 10a2923f640e9b1aa3f8bca34e71481586aa3acd Mon Sep 17 00:00:00 2001
From: Jussi Enkovaara <jussi.enkovaara@csc.fi>
Date: Tue, 7 Jul 2020 13:35:43 +0300
Subject: [PATCH] fixes #2238

Always obey omp_get_max_threads() when build with USE_OPENMP
---
 common_thread.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common_thread.h b/common_thread.h
index 6ec40e096d..ec0c65b220 100644
--- a/common_thread.h
+++ b/common_thread.h
@@ -132,18 +132,18 @@ extern int blas_server_avail;
 static __inline int num_cpu_avail(int level) {
 
 #ifdef USE_OPENMP
-	int openmp_nthreads=0;
+	int openmp_nthreads=omp_get_max_threads();
 #endif
 
+#ifndef USE_OPENMP 
   if (blas_cpu_number == 1
-
+#endif
 #ifdef USE_OPENMP
-      || omp_in_parallel()
+     if (openmp_nthreads == 1 || omp_in_parallel()
 #endif
-      ) return 1;
+      ) return 1;        
 
 #ifdef USE_OPENMP
-  openmp_nthreads=omp_get_max_threads();
   if (blas_cpu_number != openmp_nthreads) {
 	  goto_set_num_threads(openmp_nthreads);
   }