Skip to content

Commit d690540

Browse files
authored
Merge pull request #3068 from alexhenrie/scan-build
scan-build fixes
2 parents 411926b + f1bf260 commit d690540

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

interface/gemm.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS
246246

247247
#ifdef SMP
248248
double MNK;
249+
#if defined(USE_SIMPLE_THREADED_LEVEL3) || !defined(NO_AFFINITY)
249250
#ifndef COMPLEX
250251
#ifdef XDOUBLE
251252
int mode = BLAS_XDOUBLE | BLAS_REAL;
@@ -264,6 +265,7 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS
264265
#endif
265266
#endif
266267
#endif
268+
#endif
267269

268270
#if defined(SMP) && !defined(NO_AFFINITY) && !defined(USE_SIMPLE_THREADED_LEVEL3)
269271
int nodes;
@@ -417,8 +419,10 @@ void CNAME(enum CBLAS_ORDER order, enum CBLAS_TRANSPOSE TransA, enum CBLAS_TRANS
417419
sb = (XFLOAT *)(((BLASLONG)sa + ((GEMM_P * GEMM_Q * COMPSIZE * SIZE + GEMM_ALIGN) & ~GEMM_ALIGN)) + GEMM_OFFSET_B);
418420

419421
#ifdef SMP
422+
#if defined(USE_SIMPLE_THREADED_LEVEL3) || !defined(NO_AFFINITY)
420423
mode |= (transa << BLAS_TRANSA_SHIFT);
421424
mode |= (transb << BLAS_TRANSB_SHIFT);
425+
#endif
422426

423427
MNK = (double) args.m * (double) args.n * (double) args.k;
424428
if ( MNK <= (SMP_THRESHOLD_MIN * (double) GEMM_MULTITHREAD_THRESHOLD) )

interface/rotmg.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ void CNAME(FLOAT *dd1, FLOAT *dd2, FLOAT *dx1, FLOAT dy1, FLOAT *dparam){
107107
dq1 = dp1 * *dx1;
108108
if(ABS(dq1) > ABS(dq2))
109109
{
110-
dflag = ZERO;
111110
dh11 = ONE;
112111
dh22 = ONE;
113112
dh21 = - dy1 / *dx1;

kernel/x86_64/dasum.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
9393
#if defined(SMP)
9494
int nthreads;
9595
FLOAT dummy_alpha;
96-
FLOAT * dummy_b;
9796
#endif
9897
FLOAT sumf = 0.0;
9998

@@ -115,7 +114,7 @@ FLOAT CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x)
115114
#else
116115
mode = BLAS_DOUBLE | BLAS_REAL;
117116
#endif
118-
blas_level1_thread_with_return_value(mode, n, 0, 0, &dummy_alpha, x, inc_x, dummy_b, 0, result, 0, (void *)asum_thread_function, nthreads);
117+
blas_level1_thread_with_return_value(mode, n, 0, 0, &dummy_alpha, x, inc_x, NULL, 0, result, 0, (void *)asum_thread_function, nthreads);
119118
ptr = (FLOAT *)result;
120119
for (i = 0; i < nthreads; i++) {
121120
sumf += (*ptr);

0 commit comments

Comments
 (0)