Merge pull request #1359 from brada4/develop

Eliminate mode variable where not needed in syrk interface
This commit is contained in:
Martin Kroeker 2017-11-18 23:47:17 +01:00 committed by GitHub
commit 9251a2efde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions

View File

@ -101,6 +101,7 @@ void NAME(char *UPLO, char *TRANS,
FLOAT *sa, *sb; FLOAT *sa, *sb;
#ifdef SMP #ifdef SMP
#ifdef USE_SIMPLE_THREADED_LEVEL3
#ifndef COMPLEX #ifndef COMPLEX
#ifdef XDOUBLE #ifdef XDOUBLE
int mode = BLAS_XDOUBLE | BLAS_REAL; int mode = BLAS_XDOUBLE | BLAS_REAL;
@ -118,6 +119,7 @@ void NAME(char *UPLO, char *TRANS,
int mode = BLAS_SINGLE | BLAS_COMPLEX; int mode = BLAS_SINGLE | BLAS_COMPLEX;
#endif #endif
#endif #endif
#endif
#endif #endif
blasint info; blasint info;
@ -223,6 +225,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr
FLOAT *sa, *sb; FLOAT *sa, *sb;
#ifdef SMP #ifdef SMP
#ifdef USE_SIMPLE_THREADED_LEVEL3
#ifndef COMPLEX #ifndef COMPLEX
#ifdef XDOUBLE #ifdef XDOUBLE
int mode = BLAS_XDOUBLE | BLAS_REAL; int mode = BLAS_XDOUBLE | BLAS_REAL;
@ -240,6 +243,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr
int mode = BLAS_SINGLE | BLAS_COMPLEX; int mode = BLAS_SINGLE | BLAS_COMPLEX;
#endif #endif
#endif #endif
#endif
#endif #endif
PRINT_DEBUG_CNAME; PRINT_DEBUG_CNAME;
@ -340,13 +344,14 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_UPLO Uplo, enum CBLAS_TRANSPOSE Tr
sb = (FLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B); sb = (FLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
#ifdef SMP #ifdef SMP
#ifdef USE_SIMPLE_THREADED_LEVEL3
if (!trans){ if (!trans){
mode |= (BLAS_TRANSA_N | BLAS_TRANSB_T); mode |= (BLAS_TRANSA_N | BLAS_TRANSB_T);
} else { } else {
mode |= (BLAS_TRANSA_T | BLAS_TRANSB_N); mode |= (BLAS_TRANSA_T | BLAS_TRANSB_N);
} }
mode |= (uplo << BLAS_UPLO_SHIFT); mode |= (uplo << BLAS_UPLO_SHIFT);
#endif
args.common = NULL; args.common = NULL;
args.nthreads = num_cpu_avail(3); args.nthreads = num_cpu_avail(3);