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

Merge pull request #1085 from vladimir-ch/lapacke_laswp_work 

LAPACKE: fix incorrect value of lda_t in lapacke_?laswp_work
This commit is contained in:
Martin Kroeker 2017-02-07 11:40:41 +01:00 committed by GitHub
parent 60eea75409 4c2b713ce5
commit a9594e8072
4 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lapack-netlib/LAPACKE/src/lapacke_claswp_work.c
View File

@ -46,7 +46,11 @@ lapack_int LAPACKE_claswp_work( int matrix_layout, lapack_int n,
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,lda);
lapack_int lda_t = MAX(1,k2);
lapack_int i;
for( i = k1; i <= k2; i++ ) {
lda_t = MAX( lda_t, ipiv[k1 + ( i - k1 ) * ABS( incx ) - 1] );
}
lapack_complex_float* a_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
@ -62,12 +66,12 @@ lapack_int LAPACKE_claswp_work( int matrix_layout, lapack_int n,
goto exit_level_0;
}
/* Transpose input matrices */
LAPACKE_cge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
LAPACKE_cge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_claswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
info = 0; /* LAPACK call is ok! */
/* Transpose output matrices */
LAPACKE_cge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
LAPACKE_cge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
/* Release memory and exit */
LAPACKE_free( a_t );
exit_level_0:

10
lapack-netlib/LAPACKE/src/lapacke_dlaswp_work.c
View File

@ -45,7 +45,11 @@ lapack_int LAPACKE_dlaswp_work( int matrix_layout, lapack_int n, double* a,
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,lda);
lapack_int lda_t = MAX(1,k2);
lapack_int i;
for( i = k1; i <= k2; i++ ) {
lda_t = MAX( lda_t, ipiv[k1 + ( i - k1 ) * ABS( incx ) - 1] );
}
double* a_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
@ -60,12 +64,12 @@ lapack_int LAPACKE_dlaswp_work( int matrix_layout, lapack_int n, double* a,
goto exit_level_0;
}
/* Transpose input matrices */
LAPACKE_dge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
LAPACKE_dge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_dlaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
info = 0; /* LAPACK call is ok! */
/* Transpose output matrices */
LAPACKE_dge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
LAPACKE_dge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
/* Release memory and exit */
LAPACKE_free( a_t );
exit_level_0:

10
lapack-netlib/LAPACKE/src/lapacke_slaswp_work.c
View File

@ -45,7 +45,11 @@ lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,lda);
lapack_int lda_t = MAX(1,k2);
lapack_int i;
for( i = k1; i <= k2; i++ ) {
lda_t = MAX( lda_t, ipiv[k1 + ( i - k1 ) * ABS( incx ) - 1] );
}
float* a_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
@ -60,12 +64,12 @@ lapack_int LAPACKE_slaswp_work( int matrix_layout, lapack_int n, float* a,
goto exit_level_0;
}
/* Transpose input matrices */
LAPACKE_sge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
LAPACKE_sge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_slaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
info = 0; /* LAPACK call is ok! */
/* Transpose output matrices */
LAPACKE_sge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
LAPACKE_sge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
/* Release memory and exit */
LAPACKE_free( a_t );
exit_level_0:

10
lapack-netlib/LAPACKE/src/lapacke_zlaswp_work.c
View File

@ -46,7 +46,11 @@ lapack_int LAPACKE_zlaswp_work( int matrix_layout, lapack_int n,
info = info - 1;
}
} else if( matrix_layout == LAPACK_ROW_MAJOR ) {
lapack_int lda_t = MAX(1,lda);
lapack_int lda_t = MAX(1,k2);
lapack_int i;
for( i = k1; i <= k2; i++ ) {
lda_t = MAX( lda_t, ipiv[k1 + ( i - k1 ) * ABS( incx ) - 1] );
}
lapack_complex_double* a_t = NULL;
/* Check leading dimension(s) */
if( lda < n ) {
@ -62,12 +66,12 @@ lapack_int LAPACKE_zlaswp_work( int matrix_layout, lapack_int n,
goto exit_level_0;
}
/* Transpose input matrices */
LAPACKE_zge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t );
LAPACKE_zge_trans( matrix_layout, lda_t, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */
LAPACK_zlaswp( &n, a_t, &lda_t, &k1, &k2, ipiv, &incx );
info = 0; /* LAPACK call is ok! */
/* Transpose output matrices */
LAPACKE_zge_trans( LAPACK_COL_MAJOR, lda, n, a_t, lda_t, a, lda );
LAPACKE_zge_trans( LAPACK_COL_MAJOR, lda_t, n, a_t, lda_t, a, lda );
/* Release memory and exit */
LAPACKE_free( a_t );
exit_level_0: