Skip to content

Commit 298804e

Browse files
jprhynejprhyne
authored
Merge branch 'Reference-LAPACK:master' into larft
2 parents 5495628 + 6061809 commit 298804e

File tree

9 files changed

+21
-21
lines changed

9 files changed

+21
-21
lines changed

‎LAPACKE/src/lapacke_ctpmqrt_work.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ lapack_int API_SUFFIX(LAPACKE_ctpmqrt_work)( int matrix_layout, char side, char
5151
}
5252
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
5353
lapack_int nrowsA, ncolsA, nrowsV;
54-
if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
55-
else if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
54+
if ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
55+
else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
5656
else {
5757
info = -2;
5858
API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ctpmqrt_work", info );

‎LAPACKE/src/lapacke_dtpmqrt_work.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ lapack_int API_SUFFIX(LAPACKE_dtpmqrt_work)( int matrix_layout, char side, char
4949
}
5050
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
5151
lapack_int nrowsA, ncolsA, nrowsV;
52-
if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
53-
else if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
52+
if ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
53+
else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
5454
else {
5555
info = -2;
5656
API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_dtpmqrt_work", info );

‎LAPACKE/src/lapacke_nancheck.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ int LAPACKE_get_nancheck( )
4747
}
4848

4949
/* Check environment variable, once and only once */
50-
env = getenv( "API_SUFFIX(LAPACKE_)NANCHECK" );
50+
env = getenv( "LAPACKE_NANCHECK" );
5151
if ( !env ) {
5252
/* By default, NaN checking is enabled */
5353
nancheck_flag = 1;

‎LAPACKE/src/lapacke_stpmqrt_work.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ lapack_int API_SUFFIX(LAPACKE_stpmqrt_work)( int matrix_layout, char side, char
4949
}
5050
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
5151
lapack_int nrowsA, ncolsA, nrowsV;
52-
if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
53-
else if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
52+
if ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
53+
else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
5454
else {
5555
info = -2;
5656
API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_stpmqrt_work", info );

‎LAPACKE/src/lapacke_ztpmqrt_work.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ lapack_int API_SUFFIX(LAPACKE_ztpmqrt_work)( int matrix_layout, char side, char
5151
}
5252
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
5353
lapack_int nrowsA, ncolsA, nrowsV;
54-
if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
55-
else if ( side == API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
54+
if ( API_SUFFIX(LAPACKE_lsame)(side, 'l') ) { nrowsA = k; ncolsA = n; nrowsV = m; }
55+
else if ( API_SUFFIX(LAPACKE_lsame)(side, 'r') ) { nrowsA = m; ncolsA = k; nrowsV = n; }
5656
else {
5757
info = -2;
5858
API_SUFFIX(LAPACKE_xerbla)( "LAPACKE_ztpmqrt_work", info );

‎TESTING/EIG/cget52.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ SUBROUTINE CGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
256256
END IF
257257
CALL CGEMV( TRANS, N, N, ACOEFF, A, LDA, E( 1, JVEC ), 1,
258258
$ CZERO, WORK( N*( JVEC-1 )+1 ), 1 )
259-
CALL CGEMV( TRANS, N, N, -BCOEFF, B, LDA, E( 1, JVEC ), 1,
259+
CALL CGEMV( TRANS, N, N, -BCOEFF, B, LDB, E( 1, JVEC ), 1,
260260
$ CONE, WORK( N*( JVEC-1 )+1 ), 1 )
261261
10 CONTINUE
262262
*

‎TESTING/EIG/dget52.f

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ SUBROUTINE DGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
293293
BCOEFR = SCALE*SALFR
294294
CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
295295
$ ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
296-
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
296+
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
297297
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
298298
ELSE
299299
*
@@ -323,16 +323,16 @@ SUBROUTINE DGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
323323
*
324324
CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
325325
$ ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
326-
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
326+
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
327327
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
328-
CALL DGEMV( TRANS, N, N, BCOEFI, B, LDA, E( 1, JVEC+1 ),
328+
CALL DGEMV( TRANS, N, N, BCOEFI, B, LDB, E( 1, JVEC+1 ),
329329
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
330330
*
331331
CALL DGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC+1 ),
332332
$ 1, ZERO, WORK( N*JVEC+1 ), 1 )
333-
CALL DGEMV( TRANS, N, N, -BCOEFI, B, LDA, E( 1, JVEC ),
333+
CALL DGEMV( TRANS, N, N, -BCOEFI, B, LDB, E( 1, JVEC ),
334334
$ 1, ONE, WORK( N*JVEC+1 ), 1 )
335-
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC+1 ),
335+
CALL DGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC+1 ),
336336
$ 1, ONE, WORK( N*JVEC+1 ), 1 )
337337
END IF
338338
END IF

‎TESTING/EIG/sget52.f

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ SUBROUTINE SGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
293293
BCOEFR = SCALE*SALFR
294294
CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
295295
$ ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
296-
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
296+
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
297297
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
298298
ELSE
299299
*
@@ -323,16 +323,16 @@ SUBROUTINE SGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHAR,
323323
*
324324
CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC ), 1,
325325
$ ZERO, WORK( N*( JVEC-1 )+1 ), 1 )
326-
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC ),
326+
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC ),
327327
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
328-
CALL SGEMV( TRANS, N, N, BCOEFI, B, LDA, E( 1, JVEC+1 ),
328+
CALL SGEMV( TRANS, N, N, BCOEFI, B, LDB, E( 1, JVEC+1 ),
329329
$ 1, ONE, WORK( N*( JVEC-1 )+1 ), 1 )
330330
*
331331
CALL SGEMV( TRANS, N, N, ACOEF, A, LDA, E( 1, JVEC+1 ),
332332
$ 1, ZERO, WORK( N*JVEC+1 ), 1 )
333-
CALL SGEMV( TRANS, N, N, -BCOEFI, B, LDA, E( 1, JVEC ),
333+
CALL SGEMV( TRANS, N, N, -BCOEFI, B, LDB, E( 1, JVEC ),
334334
$ 1, ONE, WORK( N*JVEC+1 ), 1 )
335-
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDA, E( 1, JVEC+1 ),
335+
CALL SGEMV( TRANS, N, N, -BCOEFR, B, LDB, E( 1, JVEC+1 ),
336336
$ 1, ONE, WORK( N*JVEC+1 ), 1 )
337337
END IF
338338
END IF

‎TESTING/EIG/zget52.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ SUBROUTINE ZGET52( LEFT, N, A, LDA, B, LDB, E, LDE, ALPHA, BETA,
257257
END IF
258258
CALL ZGEMV( TRANS, N, N, ACOEFF, A, LDA, E( 1, JVEC ), 1,
259259
$ CZERO, WORK( N*( JVEC-1 )+1 ), 1 )
260-
CALL ZGEMV( TRANS, N, N, -BCOEFF, B, LDA, E( 1, JVEC ), 1,
260+
CALL ZGEMV( TRANS, N, N, -BCOEFF, B, LDB, E( 1, JVEC ), 1,
261261
$ CONE, WORK( N*( JVEC-1 )+1 ), 1 )
262262
10 CONTINUE
263263
*

0 commit comments

Comments
 (0)