| @@ -129,7 +129,7 @@ typedef struct blas_queue { | |||||
| extern int blas_server_avail; | extern int blas_server_avail; | ||||
| static __inline int num_cpu_avail(int level) { | |||||
| static __inline int num_cpu_avail(void) { | |||||
| #ifdef USE_OPENMP | #ifdef USE_OPENMP | ||||
| int openmp_nthreads=0; | int openmp_nthreads=0; | ||||
| @@ -91,7 +91,7 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx, FLOAT *y, blasint inc | |||||
| if (incx == 0 || incy == 0 || n <= MULTI_THREAD_MINIMAL) | if (incx == 0 || incy == 0 || n <= MULTI_THREAD_MINIMAL) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -227,7 +227,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -413,7 +413,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS | |||||
| if ( MNK <= (SMP_THRESHOLD_MIN * (double) GEMM_MULTITHREAD_THRESHOLD) ) | if ( MNK <= (SMP_THRESHOLD_MIN * (double) GEMM_MULTITHREAD_THRESHOLD) ) | ||||
| args.nthreads = 1; | args.nthreads = 1; | ||||
| else | else | ||||
| args.nthreads = num_cpu_avail(3); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| args.common = NULL; | args.common = NULL; | ||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| @@ -223,7 +223,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| if ( 1L * m * n < 2304L * GEMM_MULTITHREAD_THRESHOLD ) | if ( 1L * m * n < 2304L * GEMM_MULTITHREAD_THRESHOLD ) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -176,7 +176,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| // Threshold chosen so that speed-up is > 1 on a Xeon E5-2630 | // Threshold chosen so that speed-up is > 1 on a Xeon E5-2630 | ||||
| if(1L * m * n > 2048L * GEMM_MULTITHREAD_THRESHOLD) | if(1L * m * n > 2048L * GEMM_MULTITHREAD_THRESHOLD) | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| else | else | ||||
| nthreads = 1; | nthreads = 1; | ||||
| @@ -114,7 +114,7 @@ int NAME(blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA, blasint *ipiv, | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -95,7 +95,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -126,7 +126,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA, | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -77,7 +77,7 @@ int NAME(blasint *N, FLOAT *a, blasint *LDA, blasint *K1, blasint *K2, blasint * | |||||
| flag = (incx < 0); | flag = (incx < 0); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -121,7 +121,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -127,7 +127,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In | |||||
| #endif | #endif | ||||
| #ifdef SMP | #ifdef SMP | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -95,7 +95,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -125,7 +125,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA, | |||||
| #endif | #endif | ||||
| #ifdef SMP | #ifdef SMP | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -78,7 +78,7 @@ int NAME(blasint *N, FLOAT *a, blasint *LDA, blasint *K1, blasint *K2, blasint * | |||||
| flag = (incx < 0); | flag = (incx < 0); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -120,7 +120,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){ | |||||
| #endif | #endif | ||||
| #ifdef SMP | #ifdef SMP | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -125,7 +125,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(4); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -198,7 +198,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -79,7 +79,7 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx){ | |||||
| if (n <= 1048576 ) | if (n <= 1048576 ) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| @@ -182,7 +182,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -172,7 +172,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -178,7 +178,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -375,7 +375,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo, | |||||
| #ifdef SMP | #ifdef SMP | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(3); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -180,7 +180,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -174,7 +174,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -178,7 +178,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -368,7 +368,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr | |||||
| mode |= (uplo << BLAS_UPLO_SHIFT); | mode |= (uplo << BLAS_UPLO_SHIFT); | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(3); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -354,7 +354,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr | |||||
| #endif | #endif | ||||
| args.common = NULL; | args.common = NULL; | ||||
| args.nthreads = num_cpu_avail(3); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -223,7 +223,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -221,7 +221,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -218,7 +218,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| /* nthreads = num_cpu_avail(2); | |||||
| /* nthreads = num_cpu_avail(); | |||||
| FIXME trmv_thread was found to be broken, see issue 1332 */ | FIXME trmv_thread was found to be broken, see issue 1332 */ | ||||
| nthreads = 1; | nthreads = 1; | ||||
| @@ -372,7 +372,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| if ( args.n < 2*GEMM_MULTITHREAD_THRESHOLD ) | if ( args.n < 2*GEMM_MULTITHREAD_THRESHOLD ) | ||||
| args.nthreads = 1; | args.nthreads = 1; | ||||
| else | else | ||||
| args.nthreads = num_cpu_avail(3); | |||||
| args.nthreads = num_cpu_avail(); | |||||
| if (args.nthreads == 1) { | if (args.nthreads == 1) { | ||||
| @@ -98,7 +98,7 @@ void CNAME(blasint n, FLOAT *ALPHA, FLOAT *x, blasint incx, FLOAT *y, blasint in | |||||
| if (incx == 0 || incy == 0 || n <= MULTI_THREAD_MINIMAL) | if (incx == 0 || incy == 0 || n <= MULTI_THREAD_MINIMAL) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -251,7 +251,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -255,7 +255,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| if ( 1L * m * n < 1024L * GEMM_MULTITHREAD_THRESHOLD ) | if ( 1L * m * n < 1024L * GEMM_MULTITHREAD_THRESHOLD ) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -220,7 +220,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| // Threshold chosen so that speed-up is > 1 on a Xeon E5-2630 | // Threshold chosen so that speed-up is > 1 on a Xeon E5-2630 | ||||
| if(1L * m * n > 36L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) | if(1L * m * n > 36L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| else | else | ||||
| nthreads = 1; | nthreads = 1; | ||||
| @@ -204,7 +204,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMPBUG | #ifdef SMPBUG | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -195,7 +195,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -177,7 +177,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -186,7 +186,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -194,7 +194,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -175,7 +175,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -187,7 +187,7 @@ void CNAME(enum CBLAS_ORDER order, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -140,7 +140,7 @@ void NAME(char *UPLO, blasint *N, blasint *K, FLOAT *ALPHA, FLOAT *a, blasint * | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -93,7 +93,7 @@ void CNAME(blasint n, FLOAT alpha_r, void *vx, blasint incx){ | |||||
| if ( n <= 1048576 ) | if ( n <= 1048576 ) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -128,7 +128,7 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, FLOAT *a, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMPTEST | #ifdef SMPTEST | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -121,7 +121,7 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -124,7 +124,7 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -84,7 +84,7 @@ FLOAT *y = (FLOAT*)vy; | |||||
| if (incx == 0 || incy == 0) | if (incx == 0 || incy == 0) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -118,7 +118,7 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, FLOAT *a, blasint *LDA, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -181,7 +181,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, int n, FLOAT alpha, FLO | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -126,7 +126,7 @@ void NAME(char *UPLO, blasint *N, FLOAT *ALPHA, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -238,7 +238,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -229,7 +229,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| buffer = (FLOAT *)blas_memory_alloc(1); | buffer = (FLOAT *)blas_memory_alloc(1); | ||||
| #ifdef SMP | #ifdef SMP | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| #endif | #endif | ||||
| @@ -233,7 +233,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, | |||||
| #ifdef SMP | #ifdef SMP | ||||
| // Calibrated on a Xeon E5-2630 | // Calibrated on a Xeon E5-2630 | ||||
| if(1L * n * n > 36L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) { | if(1L * n * n > 36L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) { | ||||
| nthreads = num_cpu_avail(2); | |||||
| nthreads = num_cpu_avail(); | |||||
| if(nthreads > 2 && 1L * n * n < 64L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) | if(nthreads > 2 && 1L * n * n < 64L * sizeof(FLOAT) * sizeof(FLOAT) * GEMM_MULTITHREAD_THRESHOLD) | ||||
| nthreads = 2; | nthreads = 2; | ||||
| } else | } else | ||||
| @@ -236,7 +236,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| asum = casum_compute(n, x, inc_x); | asum = casum_compute(n, x, inc_x); | ||||
| @@ -186,7 +186,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| do_copy(n, x, inc_x, y, inc_y); | do_copy(n, x, inc_x, y, inc_y); | ||||
| @@ -231,7 +231,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| asum = dasum_compute(n, x, inc_x); | asum = dasum_compute(n, x, inc_x); | ||||
| @@ -387,7 +387,7 @@ RETURN_TYPE CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y | |||||
| if (inc_x == 0 || inc_y == 0 || n <= 10000) | if (inc_x == 0 || inc_y == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| dot = dot_compute(n, x, inc_x, y, inc_y); | dot = dot_compute(n, x, inc_x, y, inc_y); | ||||
| @@ -331,7 +331,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (n <= 10000) | if (n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| nrm2_compute(n, x, inc_x, &ssq, &scale); | nrm2_compute(n, x, inc_x, &ssq, &scale); | ||||
| @@ -238,7 +238,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (n <= 10000) | if (n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| nrm2 = nrm2_compute(n, x, inc_x); | nrm2 = nrm2_compute(n, x, inc_x); | ||||
| @@ -324,7 +324,7 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| max_index = iamax_compute(n, x, inc_x); | max_index = iamax_compute(n, x, inc_x); | ||||
| @@ -333,7 +333,7 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| max_index = izamax_compute(n, x, inc_x); | max_index = izamax_compute(n, x, inc_x); | ||||
| @@ -233,7 +233,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| asum = sasum_compute(n, x, inc_x); | asum = sasum_compute(n, x, inc_x); | ||||
| @@ -321,7 +321,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (n <= 10000) | if (n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| nrm2_double = nrm2_compute(n, x, inc_x); | nrm2_double = nrm2_compute(n, x, inc_x); | ||||
| @@ -233,7 +233,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x) | |||||
| if (inc_x == 0 || n <= 10000) | if (inc_x == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| asum = zasum_compute(n, x, inc_x); | asum = zasum_compute(n, x, inc_x); | ||||
| @@ -320,7 +320,7 @@ OPENBLAS_COMPLEX_FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLA | |||||
| if (inc_x == 0 || inc_y == 0 || n <= 10000) | if (inc_x == 0 || inc_y == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| zdot_compute(n, x, inc_x, y, inc_y, &zdot); | zdot_compute(n, x, inc_x, y, inc_y, &zdot); | ||||
| @@ -174,7 +174,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y) | |||||
| if (inc_x == 0 || inc_y == 0 || n <= 10000) | if (inc_x == 0 || inc_y == 0 || n <= 10000) | ||||
| nthreads = 1; | nthreads = 1; | ||||
| else | else | ||||
| nthreads = num_cpu_avail(1); | |||||
| nthreads = num_cpu_avail(); | |||||
| if (nthreads == 1) { | if (nthreads == 1) { | ||||
| dot = dot_compute(n, x, inc_x, y, inc_y); | dot = dot_compute(n, x, inc_x, y, inc_y); | ||||