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

remove unused 'levelness' parameter from num_cpu_avail()

This commit is contained in:
Andrew 2018-09-11 21:23:58 +02:00
parent 1e531701b7
commit c88cd15558
61 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common_thread.h
View File

@ -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;

2
interface/axpy.c
View File

@ -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

2
interface/gbmv.c
View File

@ -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

2
interface/gemm.c
View File

@ -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) {

2
interface/gemv.c
View File

@ -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

2
interface/ger.c
View File

@ -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;

2
interface/lapack/gesv.c
View File

@ -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

2
interface/lapack/getrf.c
View File

@ -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

2
interface/lapack/getrs.c
View File

@ -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

2
interface/lapack/laswp.c
View File

@ -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

2
interface/lapack/lauum.c
View File

@ -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

2
interface/lapack/potrf.c
View File

@ -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

2
interface/lapack/trtri.c
View File

@ -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

2
interface/lapack/zgetrf.c
View File

@ -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

2
interface/lapack/zgetrs.c
View File

@ -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

2
interface/lapack/zlaswp.c
View File

@ -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

2
interface/lapack/zlauum.c
View File

@ -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

2
interface/lapack/zpotrf.c
View File

@ -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

2
interface/lapack/ztrtri.c
View File

@ -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

2
interface/scal.c
View File

@ -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) {

2
interface/spr.c
View File

@ -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

2
interface/spr2.c
View File

@ -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

2
interface/symm.c
View File

@ -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

2
interface/symv.c
View File

@ -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

2
interface/syr.c
View File

@ -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

2
interface/syr2.c
View File

@ -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

2
interface/syr2k.c
View File

@ -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

2
interface/syrk.c
View File

@ -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

2
interface/tbmv.c
View File

@ -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

2
interface/tpmv.c
View File

@ -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

2
interface/trsm.c
View File

@ -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) {

2
interface/zaxpy.c
View File

@ -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

2
interface/zgbmv.c
View File

@ -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

2
interface/zgemv.c
View File

@ -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

2
interface/zger.c
View File

@ -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;

2
interface/zhemv.c
View File

@ -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

2
interface/zher.c
View File

@ -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

2
interface/zher2.c
View File

@ -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

2
interface/zhpmv.c
View File

@ -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

2
interface/zhpr.c
View File

@ -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

2
interface/zhpr2.c
View File

@ -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

2
interface/zscal.c
View File

@ -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

2
interface/zspr2.c
View File

@ -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

2
interface/zswap.c
View File

@ -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

2
interface/zsyr2.c
View File

@ -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

2
interface/ztbmv.c
View File

@ -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

2
interface/ztpmv.c
View File

@ -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

2
interface/ztrmv.c
View File

@ -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

2
kernel/arm64/casum_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/copy_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/dasum_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/dot_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/dznrm2_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/dznrm2_thunderx2t99_fast.c
View File

@ -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);

2
kernel/arm64/iamax_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/izamax_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/sasum_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/scnrm2_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/zasum_thunderx2t99.c
View File

@ -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);

2
kernel/arm64/zdot_thunderx2t99.c
View File

@ -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);

2
kernel/x86_64/ddot.c
View File

@ -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);