Update LAPACK to 3.9.0

This commit is contained in:
Martin Kroeker 2019-12-29 19:55:05 +01:00 committed by GitHub
parent 6725bbf4dd
commit d7c84c1fdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 44 additions and 31 deletions

View File

@ -64,7 +64,7 @@ lapack_int LAPACKE_sstevd( int matrix_layout, char jobz, lapack_int n, float* d,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -81,7 +81,7 @@ lapack_int LAPACKE_sstevr( int matrix_layout, char jobz, char range,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -65,14 +65,14 @@ lapack_int LAPACKE_ssyev_work( int matrix_layout, char jobz, char uplo,
goto exit_level_0; goto exit_level_0;
} }
/* Transpose input matrices */ /* Transpose input matrices */
LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t ); LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */ /* Call LAPACK function and adjust info */
LAPACK_ssyev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info ); LAPACK_ssyev( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, &info );
if( info < 0 ) { if( info < 0 ) {
info = info - 1; info = info - 1;
} }
/* Transpose output matrices */ /* Transpose output matrices */
LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda ); LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
/* Release memory and exit */ /* Release memory and exit */
LAPACKE_free( a_t ); LAPACKE_free( a_t );
exit_level_0: exit_level_0:

View File

@ -50,7 +50,7 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n
#ifndef LAPACK_DISABLE_NAN_CHECK #ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) { if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */ /* Optionally check input matrices for NaNs */
if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) { if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
return -5; return -5;
} }
} }
@ -61,7 +61,7 @@ lapack_int LAPACKE_ssyevd( int matrix_layout, char jobz, char uplo, lapack_int n
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -50,7 +50,7 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
#ifndef LAPACK_DISABLE_NAN_CHECK #ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) { if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */ /* Optionally check input matrices for NaNs */
if( LAPACKE_sge_nancheck( matrix_layout, n, n, a, lda ) ) { if( LAPACKE_ssy_nancheck( matrix_layout, uplo, n, a, lda ) ) {
return -5; return -5;
} }
} }
@ -61,7 +61,7 @@ lapack_int LAPACKE_ssyevd_2stage( int matrix_layout, char jobz, char uplo, lapac
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -68,7 +68,7 @@ lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
goto exit_level_0; goto exit_level_0;
} }
/* Transpose input matrices */ /* Transpose input matrices */
LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t ); LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */ /* Call LAPACK function and adjust info */
LAPACK_ssyevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork, LAPACK_ssyevd_2stage( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
&liwork, &info ); &liwork, &info );
@ -76,7 +76,7 @@ lapack_int LAPACKE_ssyevd_2stage_work( int matrix_layout, char jobz, char uplo,
info = info - 1; info = info - 1;
} }
/* Transpose output matrices */ /* Transpose output matrices */
LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda ); LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
/* Release memory and exit */ /* Release memory and exit */
LAPACKE_free( a_t ); LAPACKE_free( a_t );
exit_level_0: exit_level_0:

View File

@ -68,7 +68,7 @@ lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
goto exit_level_0; goto exit_level_0;
} }
/* Transpose input matrices */ /* Transpose input matrices */
LAPACKE_sge_trans( matrix_layout, n, n, a, lda, a_t, lda_t ); LAPACKE_ssy_trans( matrix_layout, uplo, n, a, lda, a_t, lda_t );
/* Call LAPACK function and adjust info */ /* Call LAPACK function and adjust info */
LAPACK_ssyevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork, LAPACK_ssyevd( &jobz, &uplo, &n, a_t, &lda_t, w, work, &lwork, iwork,
&liwork, &info ); &liwork, &info );
@ -76,7 +76,7 @@ lapack_int LAPACKE_ssyevd_work( int matrix_layout, char jobz, char uplo,
info = info - 1; info = info - 1;
} }
/* Transpose output matrices */ /* Transpose output matrices */
LAPACKE_sge_trans( LAPACK_COL_MAJOR, n, n, a_t, lda_t, a, lda ); LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda );
/* Release memory and exit */ /* Release memory and exit */
LAPACKE_free( a_t ); LAPACKE_free( a_t );
exit_level_0: exit_level_0:

View File

@ -78,7 +78,7 @@ lapack_int LAPACKE_ssyevr( int matrix_layout, char jobz, char range, char uplo,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -78,7 +78,7 @@ lapack_int LAPACKE_ssyevr_2stage( int matrix_layout, char jobz, char range, char
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -66,7 +66,7 @@ lapack_int LAPACKE_ssygvd( int matrix_layout, lapack_int itype, char jobz,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork ); iwork = (lapack_int*)LAPACKE_malloc( sizeof(lapack_int) * liwork );

View File

@ -34,7 +34,7 @@
#include "lapacke_utils.h" #include "lapacke_utils.h"
lapack_int LAPACKE_ssytrs2( int matrix_layout, char uplo, lapack_int n, lapack_int LAPACKE_ssytrs2( int matrix_layout, char uplo, lapack_int n,
lapack_int nrhs, const float* a, lapack_int lda, lapack_int nrhs, float* a, lapack_int lda,
const lapack_int* ipiv, float* b, lapack_int ldb ) const lapack_int* ipiv, float* b, lapack_int ldb )
{ {
lapack_int info = 0; lapack_int info = 0;

View File

@ -34,7 +34,7 @@
#include "lapacke_utils.h" #include "lapacke_utils.h"
lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n, lapack_int LAPACKE_ssytrs2_work( int matrix_layout, char uplo, lapack_int n,
lapack_int nrhs, const float* a, lapack_int nrhs, float* a,
lapack_int lda, const lapack_int* ipiv, lapack_int lda, const lapack_int* ipiv,
float* b, lapack_int ldb, float* work ) float* b, lapack_int ldb, float* work )
{ {

View File

@ -81,7 +81,7 @@ lapack_int LAPACKE_stgsen( int matrix_layout, lapack_int ijob,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
if( ijob != 0 ) { if( ijob != 0 ) {

View File

@ -39,7 +39,7 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
lapack_int ldv, const float* t, lapack_int ldt, lapack_int ldv, const float* t, lapack_int ldt,
float* a, lapack_int lda, float* b, lapack_int ldb) float* a, lapack_int lda, float* b, lapack_int ldb)
{ {
lapack_int ncols_v, nrows_v; lapack_int ncols_v, nrows_v, ncols_a, nrows_a;
lapack_int info = 0; lapack_int info = 0;
lapack_int ldwork; lapack_int ldwork;
lapack_int work_size; lapack_int work_size;
@ -50,20 +50,33 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
} }
#ifndef LAPACK_DISABLE_NAN_CHECK #ifndef LAPACK_DISABLE_NAN_CHECK
if( LAPACKE_get_nancheck() ) { if( LAPACKE_get_nancheck() ) {
/* Optionally check input matrices for NaNs */ /* Optionally check input matrices for NaNs
* V is m-by-k (left, columnwise)
* or n-by-k (right, columnwise)
* or k-by-m (left, rowwise)
* or k-by-n (right, rowwise)
* T is k-by-k
* A is k-by-n (left)
* or m-by-k (right)
* B is m-by-n
*/
if( LAPACKE_lsame( storev, 'C' ) ) { if( LAPACKE_lsame( storev, 'C' ) ) {
ncols_v = k; ncols_v = k;
nrows_v = LAPACKE_lsame( side, 'L' ) ? m : nrows_v = LAPACKE_lsame( side, 'L' ) ? m :
( LAPACKE_lsame( side, 'R' ) ? n : 0 ); LAPACKE_lsame( side, 'R' ) ? n : 0;
} else if( LAPACKE_lsame( storev, 'R' ) ) { } else if( LAPACKE_lsame( storev, 'R' ) ) {
ncols_v = LAPACKE_lsame( side, 'L' ) ? m : ncols_v = LAPACKE_lsame( side, 'L' ) ? m :
( LAPACKE_lsame( side, 'R' ) ? n : 0 ); LAPACKE_lsame( side, 'R' ) ? n : 0;
nrows_v = k; nrows_v = k;
} else { } else {
ncols_v = 0; ncols_v = 0;
nrows_v = 0; nrows_v = 0;
} }
if( LAPACKE_sge_nancheck( matrix_layout, k, m, a, lda ) ) { nrows_a = LAPACKE_lsame( side, 'L' ) ? k :
LAPACKE_lsame( side, 'R' ) ? m : 0;
ncols_a = LAPACKE_lsame( side, 'L' ) ? n :
LAPACKE_lsame( side, 'R' ) ? k : 0;
if( LAPACKE_sge_nancheck( matrix_layout, ncols_a, nrows_a, a, lda ) ) {
return -14; return -14;
} }
if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) { if( LAPACKE_sge_nancheck( matrix_layout, m, n, b, ldb ) ) {
@ -78,14 +91,14 @@ lapack_int LAPACKE_stprfb( int matrix_layout, char side, char trans, char direct
} }
#endif #endif
if (side=='l' || side=='L') { if (side=='l' || side=='L') {
ldwork = k; ldwork = k;
work_size = MAX(1,ldwork) * MAX(1,n); work_size = MAX(1,ldwork) * MAX(1,n);
} }
else { else {
ldwork = m; ldwork = m;
work_size = MAX(1,ldwork) * MAX(1,k); work_size = MAX(1,ldwork) * MAX(1,k);
} }
/* Allocate memory for working array(s) */ /* Allocate memory for working array(s) */
work = (float*) work = (float*)
LAPACKE_malloc( sizeof(float) * work_size ); LAPACKE_malloc( sizeof(float) * work_size );
if( work == NULL ) { if( work == NULL ) {

View File

@ -69,7 +69,7 @@ lapack_int LAPACKE_strsen( int matrix_layout, char job, char compq,
if( info != 0 ) { if( info != 0 ) {
goto exit_level_0; goto exit_level_0;
} }
liwork = (lapack_int)iwork_query; liwork = iwork_query;
lwork = (lapack_int)work_query; lwork = (lapack_int)work_query;
/* Allocate memory for work arrays */ /* Allocate memory for work arrays */
if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) { if( LAPACKE_lsame( job, 'b' ) || LAPACKE_lsame( job, 'v' ) ) {