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

Moved declarations to start of functions to satisfy MSVC C89 implementation.

This commit is contained in:
Hank Anderson 2015-02-11 11:16:57 -06:00
parent 056ba26755
commit e74462a3f5
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver/level3/trmm_R.c
View File

@ -70,6 +70,9 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
BLASLONG ls, is, js; BLASLONG ls, is, js;
BLASLONG min_l, min_i, min_j; BLASLONG min_l, min_i, min_j;
BLASLONG jjs, min_jj; BLASLONG jjs, min_jj;
#if !((!defined(UPPER) && !defined(TRANSA)) || (defined(UPPER) && defined(TRANSA)))
BLASLONG start_ls;
#endif
m = args -> m; m = args -> m;
n = args -> n; n = args -> n;
@ -226,8 +229,6 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
} }
#else #else
BLASLONG start_ls;
for(js = n; js > 0; js -= GEMM_R){ for(js = n; js > 0; js -= GEMM_R){
min_j = js; min_j = js;
if (min_j > GEMM_R) min_j = GEMM_R; if (min_j > GEMM_R) min_j = GEMM_R;

5
driver/level3/trsm_L.c
View File

@ -76,6 +76,9 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
BLASLONG ls, is, js; BLASLONG ls, is, js;
BLASLONG min_l, min_i, min_j; BLASLONG min_l, min_i, min_j;
BLASLONG jjs, min_jj; BLASLONG jjs, min_jj;
#if !((!defined(UPPER) && !defined(TRANSA)) || (defined(UPPER) && defined(TRANSA)))
BLASLONG start_is;
#endif
m = args -> m; m = args -> m;
n = args -> n; n = args -> n;
@ -178,8 +181,6 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
} }
} }
#else #else
BLASLONG start_is;
for(ls = m; ls > 0; ls -= GEMM_Q){ for(ls = m; ls > 0; ls -= GEMM_Q){
min_l = ls; min_l = ls;
if (min_l > GEMM_Q) min_l = GEMM_Q; if (min_l > GEMM_Q) min_l = GEMM_Q;

5
driver/level3/trsm_R.c
View File

@ -75,6 +75,9 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
BLASLONG ls, is, js; BLASLONG ls, is, js;
BLASLONG min_l, min_i, min_j; BLASLONG min_l, min_i, min_j;
BLASLONG jjs, min_jj; BLASLONG jjs, min_jj;
#if !((defined(UPPER) && !defined(TRANSA)) || (!defined(UPPER) && defined(TRANSA)))
BLASLONG start_ls;
#endif
m = args -> m; m = args -> m;
n = args -> n; n = args -> n;
@ -226,8 +229,6 @@ int CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa, FLO
} }
#else #else
BLASLONG start_ls;
for(js = n; js > 0; js -= GEMM_R){ for(js = n; js > 0; js -= GEMM_R){
min_j = js; min_j = js;
if (min_j > GEMM_R) min_j = GEMM_R; if (min_j > GEMM_R) min_j = GEMM_R;

14
interface/gemm.c
View File

@ -121,6 +121,9 @@ void NAME(char *TRANSA, char *TRANSB,
FLOAT *sa, *sb; FLOAT *sa, *sb;
#ifdef SMP #ifdef SMP
int nthreads_max;
int nthreads_avail;
double MNK;
#ifndef COMPLEX #ifndef COMPLEX
#ifdef XDOUBLE #ifdef XDOUBLE
int mode = BLAS_XDOUBLE | BLAS_REAL; int mode = BLAS_XDOUBLE | BLAS_REAL;
@ -237,6 +240,9 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS
XFLOAT *sa, *sb; XFLOAT *sa, *sb;
#ifdef SMP #ifdef SMP
int nthreads_max;
int nthreads_avail;
double MNK;
#ifndef COMPLEX #ifndef COMPLEX
#ifdef XDOUBLE #ifdef XDOUBLE
int mode = BLAS_XDOUBLE | BLAS_REAL; int mode = BLAS_XDOUBLE | BLAS_REAL;
@ -400,15 +406,15 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS
mode |= (transa << BLAS_TRANSA_SHIFT); mode |= (transa << BLAS_TRANSA_SHIFT);
mode |= (transb << BLAS_TRANSB_SHIFT); mode |= (transb << BLAS_TRANSB_SHIFT);
int nthreads_max = num_cpu_avail(3); nthreads_max = num_cpu_avail(3);
int nthreads_avail = nthreads_max; nthreads_avail = nthreads_max;
#ifndef COMPLEX #ifndef COMPLEX
double MNK = (double) args.m * (double) args.n * (double) args.k; MNK = (double) args.m * (double) args.n * (double) args.k;
if ( MNK <= (65536.0 * (double) GEMM_MULTITHREAD_THRESHOLD) ) if ( MNK <= (65536.0 * (double) GEMM_MULTITHREAD_THRESHOLD) )
nthreads_max = 1; nthreads_max = 1;
#else #else
double MNK = (double) args.m * (double) args.n * (double) args.k; MNK = (double) args.m * (double) args.n * (double) args.k;
if ( MNK <= (8192.0 * (double) GEMM_MULTITHREAD_THRESHOLD) ) if ( MNK <= (8192.0 * (double) GEMM_MULTITHREAD_THRESHOLD) )
nthreads_max = 1; nthreads_max = 1;
#endif #endif

12
interface/gemv.c
View File

@ -80,6 +80,9 @@ void NAME(char *TRANS, blasint *M, blasint *N,
FLOAT *buffer; FLOAT *buffer;
#ifdef SMP #ifdef SMP
int nthreads; int nthreads;
int nthreads_max;
int nthreads_avail;
double MNK;
#endif #endif
int (*gemv[])(BLASLONG, BLASLONG, BLASLONG, FLOAT, FLOAT *, BLASLONG, FLOAT * , BLASLONG, FLOAT *, BLASLONG, FLOAT *) = { int (*gemv[])(BLASLONG, BLASLONG, BLASLONG, FLOAT, FLOAT *, BLASLONG, FLOAT * , BLASLONG, FLOAT *, BLASLONG, FLOAT *) = {
@ -134,6 +137,9 @@ void CNAME(enum CBLAS_ORDER order,
blasint info, t; blasint info, t;
#ifdef SMP #ifdef SMP
int nthreads; int nthreads;
int nthreads_max;
int nthreads_avail;
double MNK;
#endif #endif
int (*gemv[])(BLASLONG, BLASLONG, BLASLONG, FLOAT, FLOAT *, BLASLONG, FLOAT * , BLASLONG, FLOAT *, BLASLONG, FLOAT *) = { int (*gemv[])(BLASLONG, BLASLONG, BLASLONG, FLOAT, FLOAT *, BLASLONG, FLOAT * , BLASLONG, FLOAT *, BLASLONG, FLOAT *) = {
@ -212,10 +218,10 @@ void CNAME(enum CBLAS_ORDER order,
#ifdef SMP #ifdef SMP
int nthreads_max = num_cpu_avail(2); nthreads_max = num_cpu_avail(2);
int nthreads_avail = nthreads_max; nthreads_avail = nthreads_max;
double MNK = (double) m * (double) n; MNK = (double) m * (double) n;
if ( MNK <= (24.0 * 24.0 * (double) (GEMM_MULTITHREAD_THRESHOLD*GEMM_MULTITHREAD_THRESHOLD) ) ) if ( MNK <= (24.0 * 24.0 * (double) (GEMM_MULTITHREAD_THRESHOLD*GEMM_MULTITHREAD_THRESHOLD) ) )
nthreads_max = 1; nthreads_max = 1;

4
lapack/getrf/getrf_parallel.c
View File

@ -373,7 +373,11 @@ blasint CNAME(blas_arg_t *args, BLASLONG *range_m, BLASLONG *range_n, FLOAT *sa,
BLASLONG num_cpu; BLASLONG num_cpu;
#ifdef _MSC_VER
BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE];
#else
volatile BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE] __attribute__((aligned(128))); volatile BLASLONG flag[MAX_CPU_NUMBER * CACHE_LINE_SIZE] __attribute__((aligned(128)));
#endif
#ifndef COMPLEX #ifndef COMPLEX
#ifdef XDOUBLE #ifdef XDOUBLE