From c88cd15558f7e9d74f78e7f23db5223706132a5a Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:23:58 +0200
Subject: [PATCH 1/3] remove unused 'levelness' parameter from num_cpu_avail()

---
 common_thread.h                         | 2 +-
 interface/axpy.c                        | 2 +-
 interface/gbmv.c                        | 2 +-
 interface/gemm.c                        | 2 +-
 interface/gemv.c                        | 2 +-
 interface/ger.c                         | 2 +-
 interface/lapack/gesv.c                 | 2 +-
 interface/lapack/getrf.c                | 2 +-
 interface/lapack/getrs.c                | 2 +-
 interface/lapack/laswp.c                | 2 +-
 interface/lapack/lauum.c                | 2 +-
 interface/lapack/potrf.c                | 2 +-
 interface/lapack/trtri.c                | 2 +-
 interface/lapack/zgetrf.c               | 2 +-
 interface/lapack/zgetrs.c               | 2 +-
 interface/lapack/zlaswp.c               | 2 +-
 interface/lapack/zlauum.c               | 2 +-
 interface/lapack/zpotrf.c               | 2 +-
 interface/lapack/ztrtri.c               | 2 +-
 interface/scal.c                        | 2 +-
 interface/spr.c                         | 2 +-
 interface/spr2.c                        | 2 +-
 interface/symm.c                        | 2 +-
 interface/symv.c                        | 2 +-
 interface/syr.c                         | 2 +-
 interface/syr2.c                        | 2 +-
 interface/syr2k.c                       | 2 +-
 interface/syrk.c                        | 2 +-
 interface/tbmv.c                        | 2 +-
 interface/tpmv.c                        | 2 +-
 interface/trsm.c                        | 2 +-
 interface/zaxpy.c                       | 2 +-
 interface/zgbmv.c                       | 2 +-
 interface/zgemv.c                       | 2 +-
 interface/zger.c                        | 2 +-
 interface/zhemv.c                       | 2 +-
 interface/zher.c                        | 2 +-
 interface/zher2.c                       | 2 +-
 interface/zhpmv.c                       | 2 +-
 interface/zhpr.c                        | 2 +-
 interface/zhpr2.c                       | 2 +-
 interface/zscal.c                       | 2 +-
 interface/zspr2.c                       | 2 +-
 interface/zswap.c                       | 2 +-
 interface/zsyr2.c                       | 2 +-
 interface/ztbmv.c                       | 2 +-
 interface/ztpmv.c                       | 2 +-
 interface/ztrmv.c                       | 2 +-
 kernel/arm64/casum_thunderx2t99.c       | 2 +-
 kernel/arm64/copy_thunderx2t99.c        | 2 +-
 kernel/arm64/dasum_thunderx2t99.c       | 2 +-
 kernel/arm64/dot_thunderx2t99.c         | 2 +-
 kernel/arm64/dznrm2_thunderx2t99.c      | 2 +-
 kernel/arm64/dznrm2_thunderx2t99_fast.c | 2 +-
 kernel/arm64/iamax_thunderx2t99.c       | 2 +-
 kernel/arm64/izamax_thunderx2t99.c      | 2 +-
 kernel/arm64/sasum_thunderx2t99.c       | 2 +-
 kernel/arm64/scnrm2_thunderx2t99.c      | 2 +-
 kernel/arm64/zasum_thunderx2t99.c       | 2 +-
 kernel/arm64/zdot_thunderx2t99.c        | 2 +-
 kernel/x86_64/ddot.c                    | 2 +-
 61 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/common_thread.h b/common_thread.h
index bd964445e..5a05e4136 100644
--- a/common_thread.h
+++ b/common_thread.h
@@ -129,7 +129,7 @@ typedef struct blas_queue {
 
 extern int blas_server_avail;
 
-static __inline int num_cpu_avail(int level) {
+static __inline int num_cpu_avail(void) {
 
 #ifdef USE_OPENMP
 	int openmp_nthreads=0;
diff --git a/interface/axpy.c b/interface/axpy.c
index 39edea6af..4c60819f0 100644
--- a/interface/axpy.c
+++ b/interface/axpy.c
@@ -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)
 	  nthreads = 1;
   else
-	  nthreads = num_cpu_avail(1);
+	  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/gbmv.c b/interface/gbmv.c
index 1d58ba807..00fa4fed8 100644
--- a/interface/gbmv.c
+++ b/interface/gbmv.c
@@ -227,7 +227,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/gemm.c b/interface/gemm.c
index a3bac5984..ddc414aaa 100644
--- a/interface/gemm.c
+++ b/interface/gemm.c
@@ -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)  )
 	args.nthreads = 1;
   else
-	args.nthreads = num_cpu_avail(3);
+	args.nthreads = num_cpu_avail();
   args.common = NULL;
 
  if (args.nthreads == 1) {
diff --git a/interface/gemv.c b/interface/gemv.c
index c9d52cd69..1c349f119 100644
--- a/interface/gemv.c
+++ b/interface/gemv.c
@@ -223,7 +223,7 @@ void CNAME(enum CBLAS_ORDER order,
   if ( 1L * m * n < 2304L * GEMM_MULTITHREAD_THRESHOLD )
     nthreads = 1;
   else
-    nthreads = num_cpu_avail(2);
+    nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/ger.c b/interface/ger.c
index 8cf1614e3..a01ec5cd9 100644
--- a/interface/ger.c
+++ b/interface/ger.c
@@ -176,7 +176,7 @@ void CNAME(enum CBLAS_ORDER order,
 #ifdef SMPTEST
   // Threshold chosen so that speed-up is > 1 on a Xeon E5-2630
   if(1L * m * n > 2048L * GEMM_MULTITHREAD_THRESHOLD)
-    nthreads = num_cpu_avail(2);
+    nthreads = num_cpu_avail();
   else
     nthreads = 1;
 
diff --git a/interface/lapack/gesv.c b/interface/lapack/gesv.c
index 721da970d..e6b92e273 100644
--- a/interface/lapack/gesv.c
+++ b/interface/lapack/gesv.c
@@ -114,7 +114,7 @@ int NAME(blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA, blasint *ipiv,
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/getrf.c b/interface/lapack/getrf.c
index 44a92ddc4..5d907e75e 100644
--- a/interface/lapack/getrf.c
+++ b/interface/lapack/getrf.c
@@ -95,7 +95,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/getrs.c b/interface/lapack/getrs.c
index 1b8c83aca..3537f229a 100644
--- a/interface/lapack/getrs.c
+++ b/interface/lapack/getrs.c
@@ -126,7 +126,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA,
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/laswp.c b/interface/lapack/laswp.c
index ebeb103e7..ef7f9f570 100644
--- a/interface/lapack/laswp.c
+++ b/interface/lapack/laswp.c
@@ -77,7 +77,7 @@ int NAME(blasint *N, FLOAT *a, blasint *LDA, blasint *K1, blasint *K2, blasint *
   flag = (incx < 0);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(1);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/lapack/lauum.c b/interface/lapack/lauum.c
index 2c49eb0b0..6ba7100a2 100644
--- a/interface/lapack/lauum.c
+++ b/interface/lapack/lauum.c
@@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/potrf.c b/interface/lapack/potrf.c
index 092272225..fc2ae4f1a 100644
--- a/interface/lapack/potrf.c
+++ b/interface/lapack/potrf.c
@@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/trtri.c b/interface/lapack/trtri.c
index 6724a678a..fad55720c 100644
--- a/interface/lapack/trtri.c
+++ b/interface/lapack/trtri.c
@@ -127,7 +127,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
 #endif
 
 #ifdef SMP
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/zgetrf.c b/interface/lapack/zgetrf.c
index 5031f587b..8dfb3a2ff 100644
--- a/interface/lapack/zgetrf.c
+++ b/interface/lapack/zgetrf.c
@@ -95,7 +95,7 @@ int NAME(blasint *M, blasint *N, FLOAT *a, blasint *ldA, blasint *ipiv, blasint
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/zgetrs.c b/interface/lapack/zgetrs.c
index 54d4b0905..98eaaec3a 100644
--- a/interface/lapack/zgetrs.c
+++ b/interface/lapack/zgetrs.c
@@ -125,7 +125,7 @@ int NAME(char *TRANS, blasint *N, blasint *NRHS, FLOAT *a, blasint *ldA,
 #endif
 
 #ifdef SMP
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/zlaswp.c b/interface/lapack/zlaswp.c
index 31e08451d..5bbe8abc1 100644
--- a/interface/lapack/zlaswp.c
+++ b/interface/lapack/zlaswp.c
@@ -78,7 +78,7 @@ int NAME(blasint *N, FLOAT *a, blasint *LDA, blasint *K1, blasint *K2, blasint *
   flag = (incx < 0);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/lapack/zlauum.c b/interface/lapack/zlauum.c
index 4a36cc173..916686996 100644
--- a/interface/lapack/zlauum.c
+++ b/interface/lapack/zlauum.c
@@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/zpotrf.c b/interface/lapack/zpotrf.c
index 8cd3980d5..b361807c8 100644
--- a/interface/lapack/zpotrf.c
+++ b/interface/lapack/zpotrf.c
@@ -112,7 +112,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/ztrtri.c b/interface/lapack/ztrtri.c
index b3ce85b9f..4928d5ba4 100644
--- a/interface/lapack/ztrtri.c
+++ b/interface/lapack/ztrtri.c
@@ -125,7 +125,7 @@ int NAME(char *UPLO, char *DIAG, blasint *N, FLOAT *a, blasint *ldA, blasint *In
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/scal.c b/interface/scal.c
index 6d07b1650..53b90b327 100644
--- a/interface/scal.c
+++ b/interface/scal.c
@@ -79,7 +79,7 @@ void CNAME(blasint n, FLOAT alpha, FLOAT *x, blasint incx){
   if (n <= 1048576 )
 	nthreads = 1;
   else
-	nthreads = num_cpu_avail(1);
+	nthreads = num_cpu_avail();
 
 
   if (nthreads == 1) {
diff --git a/interface/spr.c b/interface/spr.c
index 1956986e9..b7f159195 100644
--- a/interface/spr.c
+++ b/interface/spr.c
@@ -172,7 +172,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/spr2.c b/interface/spr2.c
index 73a811c3e..7f9f01a96 100644
--- a/interface/spr2.c
+++ b/interface/spr2.c
@@ -178,7 +178,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/symm.c b/interface/symm.c
index 0e29a5f48..fea5b7e6c 100644
--- a/interface/symm.c
+++ b/interface/symm.c
@@ -375,7 +375,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_SIDE Side, enum CBLAS_UPLO Uplo,
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(3);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/symv.c b/interface/symv.c
index 07bd20022..15c319d09 100644
--- a/interface/symv.c
+++ b/interface/symv.c
@@ -180,7 +180,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/syr.c b/interface/syr.c
index 1374bcc69..2f636ec6a 100644
--- a/interface/syr.c
+++ b/interface/syr.c
@@ -174,7 +174,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/syr2.c b/interface/syr2.c
index 08fd47e57..589fce5a1 100644
--- a/interface/syr2.c
+++ b/interface/syr2.c
@@ -178,7 +178,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/syr2k.c b/interface/syr2k.c
index a72330c0b..235a22789 100644
--- a/interface/syr2k.c
+++ b/interface/syr2k.c
@@ -368,7 +368,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr
   mode |= (uplo  << BLAS_UPLO_SHIFT);
 
   args.common = NULL;
-  args.nthreads = num_cpu_avail(3);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/syrk.c b/interface/syrk.c
index 7699db683..c0efd40cb 100644
--- a/interface/syrk.c
+++ b/interface/syrk.c
@@ -354,7 +354,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr
 #endif
 
   args.common = NULL;
-  args.nthreads = num_cpu_avail(3);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/tbmv.c b/interface/tbmv.c
index b5f3ab740..a514174a8 100644
--- a/interface/tbmv.c
+++ b/interface/tbmv.c
@@ -223,7 +223,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/tpmv.c b/interface/tpmv.c
index 262af2285..d26116820 100644
--- a/interface/tpmv.c
+++ b/interface/tpmv.c
@@ -221,7 +221,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/trsm.c b/interface/trsm.c
index 5c2750e79..9dd4000e5 100644
--- a/interface/trsm.c
+++ b/interface/trsm.c
@@ -372,7 +372,7 @@ void CNAME(enum CBLAS_ORDER order,
 	if ( args.n < 2*GEMM_MULTITHREAD_THRESHOLD )
 		args.nthreads = 1;
   else
-	args.nthreads = num_cpu_avail(3);
+	args.nthreads = num_cpu_avail();
 		
 
   if (args.nthreads == 1) {
diff --git a/interface/zaxpy.c b/interface/zaxpy.c
index 1a0259c96..a07d6d626 100644
--- a/interface/zaxpy.c
+++ b/interface/zaxpy.c
@@ -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)
 	  nthreads = 1;
   else
-	  nthreads = num_cpu_avail(1);
+	  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zgbmv.c b/interface/zgbmv.c
index 5e275a8ed..ba8293f48 100644
--- a/interface/zgbmv.c
+++ b/interface/zgbmv.c
@@ -251,7 +251,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zgemv.c b/interface/zgemv.c
index 3e98dba7f..22d3b443d 100644
--- a/interface/zgemv.c
+++ b/interface/zgemv.c
@@ -255,7 +255,7 @@ void CNAME(enum CBLAS_ORDER order,
   if ( 1L * m * n < 1024L * GEMM_MULTITHREAD_THRESHOLD )
     nthreads = 1;
   else
-    nthreads = num_cpu_avail(2);
+    nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zger.c b/interface/zger.c
index 1360c5873..287dcfc90 100644
--- a/interface/zger.c
+++ b/interface/zger.c
@@ -220,7 +220,7 @@ void CNAME(enum CBLAS_ORDER order,
 #ifdef SMPTEST
   // 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)
-    nthreads = num_cpu_avail(2);
+    nthreads = num_cpu_avail();
   else
     nthreads = 1;
 
diff --git a/interface/zhemv.c b/interface/zhemv.c
index d1996ad69..f616cbd5e 100644
--- a/interface/zhemv.c
+++ b/interface/zhemv.c
@@ -195,7 +195,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zher.c b/interface/zher.c
index 0d24984e6..ea6df82fb 100644
--- a/interface/zher.c
+++ b/interface/zher.c
@@ -177,7 +177,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, FLOAT alpha,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zher2.c b/interface/zher2.c
index 1cae633ce..605e71965 100644
--- a/interface/zher2.c
+++ b/interface/zher2.c
@@ -186,7 +186,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, blasint n, void *VALPHA
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zhpmv.c b/interface/zhpmv.c
index ff49716b5..38dae5659 100644
--- a/interface/zhpmv.c
+++ b/interface/zhpmv.c
@@ -194,7 +194,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zhpr.c b/interface/zhpr.c
index 10507a71f..adaab6153 100644
--- a/interface/zhpr.c
+++ b/interface/zhpr.c
@@ -175,7 +175,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zhpr2.c b/interface/zhpr2.c
index c9bfb44b0..49c797648 100644
--- a/interface/zhpr2.c
+++ b/interface/zhpr2.c
@@ -187,7 +187,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zscal.c b/interface/zscal.c
index bfaddc260..5bf188dab 100644
--- a/interface/zscal.c
+++ b/interface/zscal.c
@@ -93,7 +93,7 @@ void CNAME(blasint n, FLOAT alpha_r, void *vx, blasint incx){
   if ( n <= 1048576 )
 	nthreads = 1;
   else
-	nthreads = num_cpu_avail(1);
+	nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zspr2.c b/interface/zspr2.c
index 44c36d553..c9e8a2df4 100644
--- a/interface/zspr2.c
+++ b/interface/zspr2.c
@@ -124,7 +124,7 @@ void NAME(char *UPLO, blasint *N, FLOAT  *ALPHA,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zswap.c b/interface/zswap.c
index e33bbafba..d55716119 100644
--- a/interface/zswap.c
+++ b/interface/zswap.c
@@ -84,7 +84,7 @@ FLOAT *y = (FLOAT*)vy;
   if (incx == 0 || incy == 0)
 	  nthreads = 1;
   else
-	  nthreads = num_cpu_avail(1);
+	  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zsyr2.c b/interface/zsyr2.c
index 7c81c2093..95a9f46b5 100644
--- a/interface/zsyr2.c
+++ b/interface/zsyr2.c
@@ -126,7 +126,7 @@ void NAME(char *UPLO, blasint *N, FLOAT  *ALPHA,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/ztbmv.c b/interface/ztbmv.c
index d56620c5b..813589977 100644
--- a/interface/ztbmv.c
+++ b/interface/ztbmv.c
@@ -238,7 +238,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/ztpmv.c b/interface/ztpmv.c
index 3791d1602..c8710edac 100644
--- a/interface/ztpmv.c
+++ b/interface/ztpmv.c
@@ -229,7 +229,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/ztrmv.c b/interface/ztrmv.c
index 0e16632e0..59dd6cfaf 100644
--- a/interface/ztrmv.c
+++ b/interface/ztrmv.c
@@ -233,7 +233,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
 #ifdef SMP
   // Calibrated on a Xeon E5-2630
   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)
       nthreads = 2;
   } else
diff --git a/kernel/arm64/casum_thunderx2t99.c b/kernel/arm64/casum_thunderx2t99.c
index c6dbb3f77..164cb0a21 100644
--- a/kernel/arm64/casum_thunderx2t99.c
+++ b/kernel/arm64/casum_thunderx2t99.c
@@ -236,7 +236,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		asum = casum_compute(n, x, inc_x);
diff --git a/kernel/arm64/copy_thunderx2t99.c b/kernel/arm64/copy_thunderx2t99.c
index e31876139..b7453b8d3 100644
--- a/kernel/arm64/copy_thunderx2t99.c
+++ b/kernel/arm64/copy_thunderx2t99.c
@@ -186,7 +186,7 @@ int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		do_copy(n, x, inc_x, y, inc_y);
diff --git a/kernel/arm64/dasum_thunderx2t99.c b/kernel/arm64/dasum_thunderx2t99.c
index a212c9534..6f7e1c331 100644
--- a/kernel/arm64/dasum_thunderx2t99.c
+++ b/kernel/arm64/dasum_thunderx2t99.c
@@ -231,7 +231,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		asum = dasum_compute(n, x, inc_x);
diff --git a/kernel/arm64/dot_thunderx2t99.c b/kernel/arm64/dot_thunderx2t99.c
index 3940acddd..2f0d3ee64 100644
--- a/kernel/arm64/dot_thunderx2t99.c
+++ b/kernel/arm64/dot_thunderx2t99.c
@@ -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)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		dot = dot_compute(n, x, inc_x, y, inc_y);
diff --git a/kernel/arm64/dznrm2_thunderx2t99.c b/kernel/arm64/dznrm2_thunderx2t99.c
index b94f0cffc..623c25d34 100644
--- a/kernel/arm64/dznrm2_thunderx2t99.c
+++ b/kernel/arm64/dznrm2_thunderx2t99.c
@@ -331,7 +331,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		nrm2_compute(n, x, inc_x, &ssq, &scale);
diff --git a/kernel/arm64/dznrm2_thunderx2t99_fast.c b/kernel/arm64/dznrm2_thunderx2t99_fast.c
index 8405b388b..cd4065462 100644
--- a/kernel/arm64/dznrm2_thunderx2t99_fast.c
+++ b/kernel/arm64/dznrm2_thunderx2t99_fast.c
@@ -238,7 +238,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		nrm2 = nrm2_compute(n, x, inc_x);
diff --git a/kernel/arm64/iamax_thunderx2t99.c b/kernel/arm64/iamax_thunderx2t99.c
index e3bec4a20..d55963ae6 100644
--- a/kernel/arm64/iamax_thunderx2t99.c
+++ b/kernel/arm64/iamax_thunderx2t99.c
@@ -324,7 +324,7 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		max_index = iamax_compute(n, x, inc_x);
diff --git a/kernel/arm64/izamax_thunderx2t99.c b/kernel/arm64/izamax_thunderx2t99.c
index b2e2828f0..46db15bee 100644
--- a/kernel/arm64/izamax_thunderx2t99.c
+++ b/kernel/arm64/izamax_thunderx2t99.c
@@ -333,7 +333,7 @@ BLASLONG CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		max_index = izamax_compute(n, x, inc_x);
diff --git a/kernel/arm64/sasum_thunderx2t99.c b/kernel/arm64/sasum_thunderx2t99.c
index 014c667ba..52bca0f35 100644
--- a/kernel/arm64/sasum_thunderx2t99.c
+++ b/kernel/arm64/sasum_thunderx2t99.c
@@ -233,7 +233,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		asum = sasum_compute(n, x, inc_x);
diff --git a/kernel/arm64/scnrm2_thunderx2t99.c b/kernel/arm64/scnrm2_thunderx2t99.c
index f96de441e..1279eb42c 100644
--- a/kernel/arm64/scnrm2_thunderx2t99.c
+++ b/kernel/arm64/scnrm2_thunderx2t99.c
@@ -321,7 +321,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		nrm2_double = nrm2_compute(n, x, inc_x);
diff --git a/kernel/arm64/zasum_thunderx2t99.c b/kernel/arm64/zasum_thunderx2t99.c
index 1d303a9a3..f713e3718 100644
--- a/kernel/arm64/zasum_thunderx2t99.c
+++ b/kernel/arm64/zasum_thunderx2t99.c
@@ -233,7 +233,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
 	if (inc_x == 0 || n <= 10000)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		asum = zasum_compute(n, x, inc_x);
diff --git a/kernel/arm64/zdot_thunderx2t99.c b/kernel/arm64/zdot_thunderx2t99.c
index 6185bc7d9..d50184572 100644
--- a/kernel/arm64/zdot_thunderx2t99.c
+++ b/kernel/arm64/zdot_thunderx2t99.c
@@ -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)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		zdot_compute(n, x, inc_x, y, inc_y, &zdot);
diff --git a/kernel/x86_64/ddot.c b/kernel/x86_64/ddot.c
index 969357614..7e80e58b7 100644
--- a/kernel/x86_64/ddot.c
+++ b/kernel/x86_64/ddot.c
@@ -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)
 		nthreads = 1;
 	else
-		nthreads = num_cpu_avail(1);
+		nthreads = num_cpu_avail();
 
 	if (nthreads == 1) {
 		dot = dot_compute(n, x, inc_x, y, inc_y);

From 74c4b9165971b81cd7ebb9d40f0b72db410e3125 Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:44:55 +0200
Subject: [PATCH 2/3] had to clean build tree before test build myself

---
 interface/sbmv.c  | 2 +-
 interface/spmv.c  | 2 +-
 interface/trmv.c  | 2 +-
 interface/zhbmv.c | 2 +-
 interface/zsbmv.c | 2 +-
 interface/zspmv.c | 2 +-
 interface/zspr.c  | 2 +-
 interface/zsymv.c | 2 +-
 interface/zsyr.c  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/sbmv.c b/interface/sbmv.c
index 25e99ca34..114d08486 100644
--- a/interface/sbmv.c
+++ b/interface/sbmv.c
@@ -198,7 +198,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMPTEST
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/spmv.c b/interface/spmv.c
index e08ae3f6e..090733a7a 100644
--- a/interface/spmv.c
+++ b/interface/spmv.c
@@ -182,7 +182,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMPTEST
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/trmv.c b/interface/trmv.c
index 7c40ae976..99bb0577f 100644
--- a/interface/trmv.c
+++ b/interface/trmv.c
@@ -218,7 +218,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-/*  nthreads = num_cpu_avail(2);
+/*  nthreads = num_cpu_avail();
 
 FIXME trmv_thread was found to be broken, see issue 1332 */
   nthreads = 1;
diff --git a/interface/zhbmv.c b/interface/zhbmv.c
index 656f137c6..184a2ddd0 100644
--- a/interface/zhbmv.c
+++ b/interface/zhbmv.c
@@ -204,7 +204,7 @@ void CNAME(enum CBLAS_ORDER order,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMPBUG
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zsbmv.c b/interface/zsbmv.c
index cd5cefed9..a041b81fb 100644
--- a/interface/zsbmv.c
+++ b/interface/zsbmv.c
@@ -140,7 +140,7 @@ void NAME(char *UPLO, blasint *N, blasint *K, FLOAT  *ALPHA, FLOAT *a, blasint *
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMPTEST
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zspmv.c b/interface/zspmv.c
index be11463c0..8d38cb122 100644
--- a/interface/zspmv.c
+++ b/interface/zspmv.c
@@ -128,7 +128,7 @@ void NAME(char *UPLO, blasint *N, FLOAT  *ALPHA, FLOAT *a,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMPTEST
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zspr.c b/interface/zspr.c
index 574b59aa2..abe5beb34 100644
--- a/interface/zspr.c
+++ b/interface/zspr.c
@@ -121,7 +121,7 @@ void NAME(char *UPLO, blasint *N, FLOAT  *ALPHA,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zsymv.c b/interface/zsymv.c
index 1d6ff1f34..8f3f0cc4c 100644
--- a/interface/zsymv.c
+++ b/interface/zsymv.c
@@ -118,7 +118,7 @@ void NAME(char *UPLO, blasint *N, FLOAT  *ALPHA, FLOAT *a, blasint *LDA,
   buffer = (FLOAT *)blas_memory_alloc(1);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif
diff --git a/interface/zsyr.c b/interface/zsyr.c
index 09b1de578..108119136 100644
--- a/interface/zsyr.c
+++ b/interface/zsyr.c
@@ -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);
 
 #ifdef SMP
-  nthreads = num_cpu_avail(2);
+  nthreads = num_cpu_avail();
 
   if (nthreads == 1) {
 #endif

From 80f7c5daf5a53c79753a81c387ba3d19e3daabc2 Mon Sep 17 00:00:00 2001
From: Andrew <16061801+brada4@users.noreply.github.com>
Date: Tue, 11 Sep 2018 21:51:44 +0200
Subject: [PATCH 3/3] had to clean build tree before test build myself 2

---
 interface/lapack/potri.c  | 2 +-
 interface/lapack/zpotri.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/lapack/potri.c b/interface/lapack/potri.c
index d6230621f..88e121594 100644
--- a/interface/lapack/potri.c
+++ b/interface/lapack/potri.c
@@ -121,7 +121,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 
 #ifdef SMP
   args.common = NULL;
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif
diff --git a/interface/lapack/zpotri.c b/interface/lapack/zpotri.c
index 7c72a7e62..238748723 100644
--- a/interface/lapack/zpotri.c
+++ b/interface/lapack/zpotri.c
@@ -120,7 +120,7 @@ int NAME(char *UPLO, blasint *N, FLOAT *a, blasint *ldA, blasint *Info){
 #endif
 
 #ifdef SMP
-  args.nthreads = num_cpu_avail(4);
+  args.nthreads = num_cpu_avail();
 
   if (args.nthreads == 1) {
 #endif