From f38c5d3c13f304a993c1a17a65c22adbea685b32 Mon Sep 17 00:00:00 2001 From: julie Date: Fri, 9 Dec 2011 02:43:13 +0000 Subject: [PATCH] Put declaration before executable statment to respect ISO 99 standard (Windows compiler was barking) --- lapacke/src/lapacke_cbbcsd.c | 9 +++++---- lapacke/src/lapacke_chfrk_work.c | 12 +++++++----- lapacke/src/lapacke_clansy_work.c | 2 -- lapacke/src/lapacke_clarfb_work.c | 19 +++++++++++-------- lapacke/src/lapacke_clarft.c | 5 +++-- lapacke/src/lapacke_clarft_work.c | 13 +++++++------ lapacke/src/lapacke_cunbdb.c | 9 +++++---- lapacke/src/lapacke_cuncsd.c | 9 +++++---- lapacke/src/lapacke_cunmbr.c | 5 +++-- lapacke/src/lapacke_cunmhr.c | 3 ++- lapacke/src/lapacke_cunmql.c | 3 ++- lapacke/src/lapacke_cunmqr.c | 3 ++- lapacke/src/lapacke_cunmtr.c | 3 ++- lapacke/src/lapacke_cupmtr.c | 3 ++- lapacke/src/lapacke_dbbcsd.c | 9 +++++---- lapacke/src/lapacke_dgejsv.c | 5 +++-- lapacke/src/lapacke_dgesvj.c | 3 ++- lapacke/src/lapacke_dlansy_work.c | 2 -- lapacke/src/lapacke_dlarfb_work.c | 19 +++++++++++-------- lapacke/src/lapacke_dlarft.c | 5 +++-- lapacke/src/lapacke_dlarft_work.c | 13 +++++++------ lapacke/src/lapacke_dopgtr_work.c | 6 +++--- lapacke/src/lapacke_dopmtr.c | 3 ++- lapacke/src/lapacke_dopmtr_work.c | 9 +++++---- lapacke/src/lapacke_dorbdb.c | 9 +++++---- lapacke/src/lapacke_dorcsd.c | 9 +++++---- lapacke/src/lapacke_dormbr.c | 5 +++-- lapacke/src/lapacke_dormbr_work.c | 13 +++++++------ lapacke/src/lapacke_dormhr.c | 3 ++- lapacke/src/lapacke_dormhr_work.c | 11 ++++++----- lapacke/src/lapacke_dormlq_work.c | 8 ++++---- lapacke/src/lapacke_dormql.c | 3 ++- lapacke/src/lapacke_dormql_work.c | 11 ++++++----- lapacke/src/lapacke_dormqr.c | 3 ++- lapacke/src/lapacke_dormqr_work.c | 11 ++++++----- lapacke/src/lapacke_dormrq_work.c | 8 ++++---- lapacke/src/lapacke_dormrz_work.c | 8 ++++---- lapacke/src/lapacke_dormtr.c | 3 ++- lapacke/src/lapacke_dormtr_work.c | 10 +++++----- lapacke/src/lapacke_sbbcsd.c | 9 +++++---- lapacke/src/lapacke_sgejsv.c | 5 +++-- lapacke/src/lapacke_sgesvj.c | 3 ++- lapacke/src/lapacke_slansy_work.c | 2 -- lapacke/src/lapacke_slantr_work.c | 5 +---- lapacke/src/lapacke_slarfb_work.c | 19 +++++++++++-------- lapacke/src/lapacke_slarft.c | 5 +++-- lapacke/src/lapacke_slarft_work.c | 13 +++++++------ lapacke/src/lapacke_sopgtr_work.c | 6 +++--- lapacke/src/lapacke_sopmtr.c | 3 ++- lapacke/src/lapacke_sopmtr_work.c | 9 +++++---- lapacke/src/lapacke_sorbdb.c | 9 +++++---- lapacke/src/lapacke_sorcsd.c | 9 +++++---- lapacke/src/lapacke_sormbr.c | 5 +++-- lapacke/src/lapacke_sormbr_work.c | 13 +++++++------ lapacke/src/lapacke_sormhr.c | 3 ++- lapacke/src/lapacke_sormhr_work.c | 11 ++++++----- lapacke/src/lapacke_sormlq_work.c | 8 ++++---- lapacke/src/lapacke_sormql.c | 3 ++- lapacke/src/lapacke_sormql_work.c | 11 ++++++----- lapacke/src/lapacke_sormqr.c | 3 ++- lapacke/src/lapacke_sormqr_work.c | 11 ++++++----- lapacke/src/lapacke_sormrq_work.c | 8 ++++---- lapacke/src/lapacke_sormrz_work.c | 8 ++++---- lapacke/src/lapacke_sormtr.c | 3 ++- lapacke/src/lapacke_sormtr_work.c | 10 +++++----- lapacke/src/lapacke_zbbcsd.c | 9 +++++---- lapacke/src/lapacke_zhfrk_work.c | 12 +++++++----- lapacke/src/lapacke_zlarfb_work.c | 19 +++++++++++-------- lapacke/src/lapacke_zlarft.c | 5 +++-- lapacke/src/lapacke_zlarft_work.c | 9 +++++---- lapacke/src/lapacke_zunbdb.c | 9 +++++---- lapacke/src/lapacke_zuncsd.c | 9 +++++---- lapacke/src/lapacke_zunmbr.c | 5 +++-- lapacke/src/lapacke_zunmhr.c | 3 ++- lapacke/src/lapacke_zunmql.c | 3 ++- lapacke/src/lapacke_zunmqr.c | 3 ++- lapacke/src/lapacke_zunmtr.c | 3 ++- lapacke/src/lapacke_zupmtr.c | 3 ++- 78 files changed, 319 insertions(+), 254 deletions(-) diff --git a/lapacke/src/lapacke_cbbcsd.c b/lapacke/src/lapacke_cbbcsd.c index ee1e636..3549e7a 100644 --- a/lapacke/src/lapacke_cbbcsd.c +++ b/lapacke/src/lapacke_cbbcsd.c @@ -48,16 +48,17 @@ lapack_int LAPACKE_cbbcsd( int matrix_order, char jobu1, char jobu2, lapack_int lrwork = -1; float* rwork = NULL; float rwork_query; + lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cbbcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); - lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); - lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); - lapack_int nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); + nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); + nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); + nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); + nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); if( LAPACKE_s_nancheck( q-1, phi, 1 ) ) { return -11; } diff --git a/lapacke/src/lapacke_chfrk_work.c b/lapacke/src/lapacke_chfrk_work.c index be970a9..e6e077a 100644 --- a/lapacke/src/lapacke_chfrk_work.c +++ b/lapacke/src/lapacke_chfrk_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_chfrk_work( int matrix_order, char transr, char uplo, lapack_complex_float* c ) { lapack_int info = 0; + lapack_int na, ka, lda_t; + lapack_complex_float* a_t,c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_chfrk( &transr, &uplo, &trans, &n, &k, &alpha, a, &lda, &beta, @@ -49,11 +51,11 @@ lapack_int LAPACKE_chfrk_work( int matrix_order, char transr, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int lda_t = MAX(1,na); - lapack_complex_float* a_t = NULL; - lapack_complex_float* c_t = NULL; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + lda_t = MAX(1,na); + a_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( lda < ka ) { info = -9; diff --git a/lapacke/src/lapacke_clansy_work.c b/lapacke/src/lapacke_clansy_work.c index f2ba0eb..4daf7c5 100644 --- a/lapacke/src/lapacke_clansy_work.c +++ b/lapacke/src/lapacke_clansy_work.c @@ -67,8 +67,6 @@ float LAPACKE_clansy_work( int matrix_order, char norm, char uplo, /* Call LAPACK function and adjust info */ res = LAPACK_clansy( &norm, &uplo, &n, a_t, &lda_t, work ); info = 0; /* LAPACK call is ok! */ - /* Transpose output matrices */ - LAPACKE_csy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); /* Release memory and exit */ LAPACKE_free( a_t ); exit_level_0: diff --git a/lapacke/src/lapacke_clarfb_work.c b/lapacke/src/lapacke_clarfb_work.c index 3513b33..e89bb3a 100644 --- a/lapacke/src/lapacke_clarfb_work.c +++ b/lapacke/src/lapacke_clarfb_work.c @@ -43,6 +43,9 @@ lapack_int LAPACKE_clarfb_work( int matrix_order, char side, char trans, lapack_complex_float* work, lapack_int ldwork ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldc_t, ldt_t, ldv_t; + lapack_complex_float* v_t, t_t, c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_clarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -51,22 +54,22 @@ lapack_int LAPACKE_clarfb_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = ( LAPACKE_lsame( storev, 'c' ) && + nrows_v = ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1) ); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - lapack_int ldc_t = MAX(1,m); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - lapack_complex_float* v_t = NULL; - lapack_complex_float* t_t = NULL; - lapack_complex_float* c_t = NULL; + ldc_t = MAX(1,m); + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); + v_t = NULL; + t_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( ldc < n ) { info = -14; diff --git a/lapacke/src/lapacke_clarft.c b/lapacke/src/lapacke_clarft.c index c397a53..db96284 100644 --- a/lapacke/src/lapacke_clarft.c +++ b/lapacke/src/lapacke_clarft.c @@ -40,15 +40,16 @@ lapack_int LAPACKE_clarft( int matrix_order, char direct, char storev, const lapack_complex_float* tau, lapack_complex_float* t, lapack_int ldt ) { + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_clarft", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); if( LAPACKE_c_nancheck( k, tau, 1 ) ) { return -8; diff --git a/lapacke/src/lapacke_clarft_work.c b/lapacke/src/lapacke_clarft_work.c index 7a5b52f..c264341 100644 --- a/lapacke/src/lapacke_clarft_work.c +++ b/lapacke/src/lapacke_clarft_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_clarft_work( int matrix_order, char direct, char storev, lapack_complex_float* t, lapack_int ldt ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldt_t, ldv_t; + lapack_complex_float *v_t= NULL, *t_t= NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_clarft( &direct, &storev, &n, &k, v, &ldv, tau, t, &ldt ); @@ -48,14 +51,12 @@ lapack_int LAPACKE_clarft_work( int matrix_order, char direct, char storev, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - lapack_complex_float* v_t = NULL; - lapack_complex_float* t_t = NULL; + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); /* Check leading dimension(s) */ if( ldt < k ) { info = -10; diff --git a/lapacke/src/lapacke_cunbdb.c b/lapacke/src/lapacke_cunbdb.c index 74c8129..c05dabe 100644 --- a/lapacke/src/lapacke_cunbdb.c +++ b/lapacke/src/lapacke_cunbdb.c @@ -50,16 +50,17 @@ lapack_int LAPACKE_cunbdb( int matrix_order, char trans, char signs, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunbdb", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_cge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -7; } diff --git a/lapacke/src/lapacke_cuncsd.c b/lapacke/src/lapacke_cuncsd.c index ba87da0..28733cc 100644 --- a/lapacke/src/lapacke_cuncsd.c +++ b/lapacke/src/lapacke_cuncsd.c @@ -55,16 +55,17 @@ lapack_int LAPACKE_cuncsd( int matrix_order, char jobu1, char jobu2, lapack_complex_float* work = NULL; float rwork_query; lapack_complex_float work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cuncsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_cge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -11; } diff --git a/lapacke/src/lapacke_cunmbr.c b/lapacke/src/lapacke_cunmbr.c index 507faf5..5f82324 100644 --- a/lapacke/src/lapacke_cunmbr.c +++ b/lapacke/src/lapacke_cunmbr.c @@ -44,14 +44,15 @@ lapack_int LAPACKE_cunmbr( int matrix_order, char vect, char side, char trans, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int nq, r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunmbr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); if( LAPACKE_cge_nancheck( matrix_order, r, MIN(nq,k), a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_cunmhr.c b/lapacke/src/lapacke_cunmhr.c index 5685cb2..4d12001 100644 --- a/lapacke/src/lapacke_cunmhr.c +++ b/lapacke/src/lapacke_cunmhr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_cunmhr( int matrix_order, char side, char trans, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunmhr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_cge_nancheck( matrix_order, r, r, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_cunmql.c b/lapacke/src/lapacke_cunmql.c index c8b91cf..72e8253 100644 --- a/lapacke/src/lapacke_cunmql.c +++ b/lapacke/src/lapacke_cunmql.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_cunmql( int matrix_order, char side, char trans, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunmql", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_cge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_cunmqr.c b/lapacke/src/lapacke_cunmqr.c index 7f77748..1608427 100644 --- a/lapacke/src/lapacke_cunmqr.c +++ b/lapacke/src/lapacke_cunmqr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_cunmqr( int matrix_order, char side, char trans, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunmqr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_cge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_cunmtr.c b/lapacke/src/lapacke_cunmtr.c index 2924f79..ce6cedd 100644 --- a/lapacke/src/lapacke_cunmtr.c +++ b/lapacke/src/lapacke_cunmtr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_cunmtr( int matrix_order, char side, char uplo, char trans, lapack_int lwork = -1; lapack_complex_float* work = NULL; lapack_complex_float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cunmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_cge_nancheck( matrix_order, r, r, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_cupmtr.c b/lapacke/src/lapacke_cupmtr.c index 7d00505..6d062c6 100644 --- a/lapacke/src/lapacke_cupmtr.c +++ b/lapacke/src/lapacke_cupmtr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_cupmtr( int matrix_order, char side, char uplo, char trans, /* Additional scalars declarations for work arrays */ lapack_int lwork; lapack_complex_float* work = NULL; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_cupmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_cpp_nancheck( r, ap ) ) { return -7; } diff --git a/lapacke/src/lapacke_dbbcsd.c b/lapacke/src/lapacke_dbbcsd.c index ffa0ef3..d05359b 100644 --- a/lapacke/src/lapacke_dbbcsd.c +++ b/lapacke/src/lapacke_dbbcsd.c @@ -48,16 +48,17 @@ lapack_int LAPACKE_dbbcsd( int matrix_order, char jobu1, char jobu2, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dbbcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); - lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); - lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); - lapack_int nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); + nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); + nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); + nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); + nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); if( LAPACKE_d_nancheck( q-1, phi, 1 ) ) { return -11; } diff --git a/lapacke/src/lapacke_dgejsv.c b/lapacke/src/lapacke_dgejsv.c index c80f3d2..f2e7770 100644 --- a/lapacke/src/lapacke_dgejsv.c +++ b/lapacke/src/lapacke_dgejsv.c @@ -75,14 +75,15 @@ lapack_int LAPACKE_dgejsv( int matrix_order, char joba, char jobu, char jobv, lapack_int* iwork = NULL; double* work = NULL; lapack_int i; + lapack_int nu, nv; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dgejsv", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m; - lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n; + nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m; + nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n; if( LAPACKE_dge_nancheck( matrix_order, m, n, a, lda ) ) { return -10; } diff --git a/lapacke/src/lapacke_dgesvj.c b/lapacke/src/lapacke_dgesvj.c index 93ede7c..1bbf4bf 100644 --- a/lapacke/src/lapacke_dgesvj.c +++ b/lapacke/src/lapacke_dgesvj.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_dgesvj( int matrix_order, char joba, char jobu, char jobv, lapack_int lwork = MAX(6,m+n); double* work = NULL; lapack_int i; + lapack_int nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dgesvj", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? n : + nrows_v = LAPACKE_lsame( jobv, 'v' ) ? n : ( LAPACKE_lsame( jobv, 'a' ) ? mv : 1); if( LAPACKE_dge_nancheck( matrix_order, m, n, a, lda ) ) { return -7; diff --git a/lapacke/src/lapacke_dlansy_work.c b/lapacke/src/lapacke_dlansy_work.c index 12403c7..675bf06 100644 --- a/lapacke/src/lapacke_dlansy_work.c +++ b/lapacke/src/lapacke_dlansy_work.c @@ -66,8 +66,6 @@ double LAPACKE_dlansy_work( int matrix_order, char norm, char uplo, /* Call LAPACK function and adjust info */ res = LAPACK_dlansy( &norm, &uplo, &n, a_t, &lda_t, work ); info = 0; /* LAPACK call is ok! */ - /* Transpose output matrices */ - LAPACKE_dsy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); /* Release memory and exit */ LAPACKE_free( a_t ); exit_level_0: diff --git a/lapacke/src/lapacke_dlarfb_work.c b/lapacke/src/lapacke_dlarfb_work.c index 844fab9..d9211f5 100644 --- a/lapacke/src/lapacke_dlarfb_work.c +++ b/lapacke/src/lapacke_dlarfb_work.c @@ -42,6 +42,9 @@ lapack_int LAPACKE_dlarfb_work( int matrix_order, char side, char trans, lapack_int ldwork ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldc_t, ldt_t, ldv_t; + double* v_t, t_t, c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -50,22 +53,22 @@ lapack_int LAPACKE_dlarfb_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = ( LAPACKE_lsame( storev, 'c' ) && + nrows_v = ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1) ); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - lapack_int ldc_t = MAX(1,m); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - double* v_t = NULL; - double* t_t = NULL; - double* c_t = NULL; + ldc_t = MAX(1,m); + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); + v_t = NULL; + t_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( ldc < n ) { info = -14; diff --git a/lapacke/src/lapacke_dlarft.c b/lapacke/src/lapacke_dlarft.c index 0209087..efc9933 100644 --- a/lapacke/src/lapacke_dlarft.c +++ b/lapacke/src/lapacke_dlarft.c @@ -39,15 +39,16 @@ lapack_int LAPACKE_dlarft( int matrix_order, char direct, char storev, lapack_int ldv, const double* tau, double* t, lapack_int ldt ) { + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dlarft", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); if( LAPACKE_d_nancheck( k, tau, 1 ) ) { return -8; diff --git a/lapacke/src/lapacke_dlarft_work.c b/lapacke/src/lapacke_dlarft_work.c index ea08c56..c3a7865 100644 --- a/lapacke/src/lapacke_dlarft_work.c +++ b/lapacke/src/lapacke_dlarft_work.c @@ -40,6 +40,9 @@ lapack_int LAPACKE_dlarft_work( int matrix_order, char direct, char storev, lapack_int ldt ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldt_t, ldv_t; + double *v_t = NULL, *t_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dlarft( &direct, &storev, &n, &k, v, &ldv, tau, t, &ldt ); @@ -47,14 +50,12 @@ lapack_int LAPACKE_dlarft_work( int matrix_order, char direct, char storev, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - double* v_t = NULL; - double* t_t = NULL; + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); /* Check leading dimension(s) */ if( ldt < k ) { info = -10; diff --git a/lapacke/src/lapacke_dopgtr_work.c b/lapacke/src/lapacke_dopgtr_work.c index c195eba..d1df0e9 100644 --- a/lapacke/src/lapacke_dopgtr_work.c +++ b/lapacke/src/lapacke_dopgtr_work.c @@ -39,6 +39,8 @@ lapack_int LAPACKE_dopgtr_work( int matrix_order, char uplo, lapack_int n, lapack_int ldq, double* work ) { lapack_int info = 0; + lapack_int ldq_t; + double *q_t = NULL, *ap_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dopgtr( &uplo, &n, ap, tau, q, &ldq, work, &info ); @@ -46,9 +48,7 @@ lapack_int LAPACKE_dopgtr_work( int matrix_order, char uplo, lapack_int n, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int ldq_t = MAX(1,n); - double* q_t = NULL; - double* ap_t = NULL; + ldq_t = MAX(1,n); /* Check leading dimension(s) */ if( ldq < n ) { info = -7; diff --git a/lapacke/src/lapacke_dopmtr.c b/lapacke/src/lapacke_dopmtr.c index a0452fb..ef307eb 100644 --- a/lapacke/src/lapacke_dopmtr.c +++ b/lapacke/src/lapacke_dopmtr.c @@ -42,13 +42,14 @@ lapack_int LAPACKE_dopmtr( int matrix_order, char side, char uplo, char trans, /* Additional scalars declarations for work arrays */ lapack_int lwork; double* work = NULL; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dopmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_dsp_nancheck( r, ap ) ) { return -7; } diff --git a/lapacke/src/lapacke_dopmtr_work.c b/lapacke/src/lapacke_dopmtr_work.c index eea6352..f0b8564 100644 --- a/lapacke/src/lapacke_dopmtr_work.c +++ b/lapacke/src/lapacke_dopmtr_work.c @@ -40,6 +40,9 @@ lapack_int LAPACKE_dopmtr_work( int matrix_order, char side, char uplo, lapack_int ldc, double* work ) { lapack_int info = 0; + lapack_int r; + lapack_int ldc_t; + double *c_t = NULL, *ap_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dopmtr( &side, &uplo, &trans, &m, &n, ap, tau, c, &ldc, work, @@ -48,10 +51,8 @@ lapack_int LAPACKE_dopmtr_work( int matrix_order, char side, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int ldc_t = MAX(1,m); - double* c_t = NULL; - double* ap_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( ldc < n ) { info = -10; diff --git a/lapacke/src/lapacke_dorbdb.c b/lapacke/src/lapacke_dorbdb.c index cb92dd1..b3f9d45 100644 --- a/lapacke/src/lapacke_dorbdb.c +++ b/lapacke/src/lapacke_dorbdb.c @@ -46,16 +46,17 @@ lapack_int LAPACKE_dorbdb( int matrix_order, char trans, char signs, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dorbdb", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_dge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -7; } diff --git a/lapacke/src/lapacke_dorcsd.c b/lapacke/src/lapacke_dorcsd.c index fefe9a2..66e0799 100644 --- a/lapacke/src/lapacke_dorcsd.c +++ b/lapacke/src/lapacke_dorcsd.c @@ -49,16 +49,17 @@ lapack_int LAPACKE_dorcsd( int matrix_order, char jobu1, char jobu2, lapack_int* iwork = NULL; double* work = NULL; double work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dorcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_dge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -11; } diff --git a/lapacke/src/lapacke_dormbr.c b/lapacke/src/lapacke_dormbr.c index 8b93827..a31fa6e 100644 --- a/lapacke/src/lapacke_dormbr.c +++ b/lapacke/src/lapacke_dormbr.c @@ -43,14 +43,15 @@ lapack_int LAPACKE_dormbr( int matrix_order, char vect, char side, char trans, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int nq, r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dormbr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); if( LAPACKE_dge_nancheck( matrix_order, r, MIN(nq,k), a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_dormbr_work.c b/lapacke/src/lapacke_dormbr_work.c index 5adbb07..edebaea 100644 --- a/lapacke/src/lapacke_dormbr_work.c +++ b/lapacke/src/lapacke_dormbr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_dormbr_work( int matrix_order, char vect, char side, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int nq, r; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormbr( &vect, &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, @@ -49,12 +52,10 @@ lapack_int LAPACKE_dormbr_work( int matrix_order, char vect, char side, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < MIN(nq,k) ) { info = -9; diff --git a/lapacke/src/lapacke_dormhr.c b/lapacke/src/lapacke_dormhr.c index fbeca98..08e4fc6 100644 --- a/lapacke/src/lapacke_dormhr.c +++ b/lapacke/src/lapacke_dormhr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_dormhr( int matrix_order, char side, char trans, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dormhr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_dge_nancheck( matrix_order, r, r, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_dormhr_work.c b/lapacke/src/lapacke_dormhr_work.c index f1f9036..1787a15 100644 --- a/lapacke/src/lapacke_dormhr_work.c +++ b/lapacke/src/lapacke_dormhr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_dormhr_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormhr( &side, &trans, &m, &n, &ilo, &ihi, a, &lda, tau, c, &ldc, @@ -49,11 +52,9 @@ lapack_int LAPACKE_dormhr_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < r ) { info = -9; diff --git a/lapacke/src/lapacke_dormlq_work.c b/lapacke/src/lapacke_dormlq_work.c index 71ffa41..17a1c66 100644 --- a/lapacke/src/lapacke_dormlq_work.c +++ b/lapacke/src/lapacke_dormlq_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_dormlq_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormlq( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,10 +51,8 @@ lapack_int LAPACKE_dormlq_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -8; diff --git a/lapacke/src/lapacke_dormql.c b/lapacke/src/lapacke_dormql.c index 896dc03..8d82b05 100644 --- a/lapacke/src/lapacke_dormql.c +++ b/lapacke/src/lapacke_dormql.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_dormql( int matrix_order, char side, char trans, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dormql", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_dge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_dormql_work.c b/lapacke/src/lapacke_dormql_work.c index 6cc18a9..0b1ecda 100644 --- a/lapacke/src/lapacke_dormql_work.c +++ b/lapacke/src/lapacke_dormql_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_dormql_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormql( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,11 +52,9 @@ lapack_int LAPACKE_dormql_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < k ) { info = -8; diff --git a/lapacke/src/lapacke_dormqr.c b/lapacke/src/lapacke_dormqr.c index 95f7d24..cd82ec7 100644 --- a/lapacke/src/lapacke_dormqr.c +++ b/lapacke/src/lapacke_dormqr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_dormqr( int matrix_order, char side, char trans, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dormqr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_dge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_dormqr_work.c b/lapacke/src/lapacke_dormqr_work.c index 1c9be1a..2403b38 100644 --- a/lapacke/src/lapacke_dormqr_work.c +++ b/lapacke/src/lapacke_dormqr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_dormqr_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormqr( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,11 +52,9 @@ lapack_int LAPACKE_dormqr_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < k ) { info = -8; diff --git a/lapacke/src/lapacke_dormrq_work.c b/lapacke/src/lapacke_dormrq_work.c index 186f14d..38c6357 100644 --- a/lapacke/src/lapacke_dormrq_work.c +++ b/lapacke/src/lapacke_dormrq_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_dormrq_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormrq( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,10 +51,8 @@ lapack_int LAPACKE_dormrq_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -8; diff --git a/lapacke/src/lapacke_dormrz_work.c b/lapacke/src/lapacke_dormrz_work.c index 2c0325b..2592c83 100644 --- a/lapacke/src/lapacke_dormrz_work.c +++ b/lapacke/src/lapacke_dormrz_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_dormrz_work( int matrix_order, char side, char trans, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormrz( &side, &trans, &m, &n, &k, &l, a, &lda, tau, c, &ldc, @@ -49,10 +51,8 @@ lapack_int LAPACKE_dormrz_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -9; diff --git a/lapacke/src/lapacke_dormtr.c b/lapacke/src/lapacke_dormtr.c index 728959b..475cd45 100644 --- a/lapacke/src/lapacke_dormtr.c +++ b/lapacke/src/lapacke_dormtr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_dormtr( int matrix_order, char side, char uplo, char trans, lapack_int lwork = -1; double* work = NULL; double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dormtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_dge_nancheck( matrix_order, r, r, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_dormtr_work.c b/lapacke/src/lapacke_dormtr_work.c index e23c635..15044db 100644 --- a/lapacke/src/lapacke_dormtr_work.c +++ b/lapacke/src/lapacke_dormtr_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_dormtr_work( int matrix_order, char side, char uplo, double* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r, lda_t, ldc_t; + double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dormtr( &side, &uplo, &trans, &m, &n, a, &lda, tau, c, &ldc, @@ -49,11 +51,9 @@ lapack_int LAPACKE_dormtr_work( int matrix_order, char side, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - double* a_t = NULL; - double* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < r ) { info = -8; diff --git a/lapacke/src/lapacke_sbbcsd.c b/lapacke/src/lapacke_sbbcsd.c index 1aa7cae..c560bd6 100644 --- a/lapacke/src/lapacke_sbbcsd.c +++ b/lapacke/src/lapacke_sbbcsd.c @@ -47,16 +47,17 @@ lapack_int LAPACKE_sbbcsd( int matrix_order, char jobu1, char jobu2, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sbbcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); - lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); - lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); - lapack_int nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); + nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); + nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); + nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); + nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); if( LAPACKE_s_nancheck( q-1, phi, 1 ) ) { return -11; } diff --git a/lapacke/src/lapacke_sgejsv.c b/lapacke/src/lapacke_sgejsv.c index 03d18f1..93094d0 100644 --- a/lapacke/src/lapacke_sgejsv.c +++ b/lapacke/src/lapacke_sgejsv.c @@ -75,14 +75,15 @@ lapack_int LAPACKE_sgejsv( int matrix_order, char joba, char jobu, char jobv, lapack_int* iwork = NULL; float* work = NULL; lapack_int i; + lapack_int nu, nv; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sgejsv", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m; - lapack_int nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n; + nu = LAPACKE_lsame( jobu, 'n' ) ? 1 : m; + nv = LAPACKE_lsame( jobv, 'n' ) ? 1 : n; if( LAPACKE_sge_nancheck( matrix_order, m, n, a, lda ) ) { return -10; } diff --git a/lapacke/src/lapacke_sgesvj.c b/lapacke/src/lapacke_sgesvj.c index 9d3899d..9bf7659 100644 --- a/lapacke/src/lapacke_sgesvj.c +++ b/lapacke/src/lapacke_sgesvj.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_sgesvj( int matrix_order, char joba, char jobu, char jobv, lapack_int lwork = MAX(6,m+n); float* work = NULL; lapack_int i; + lapack_int nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sgesvj", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_v = LAPACKE_lsame( jobv, 'v' ) ? n : + nrows_v = LAPACKE_lsame( jobv, 'v' ) ? n : ( LAPACKE_lsame( jobv, 'a' ) ? mv : 1); if( LAPACKE_sge_nancheck( matrix_order, m, n, a, lda ) ) { return -7; diff --git a/lapacke/src/lapacke_slansy_work.c b/lapacke/src/lapacke_slansy_work.c index 9f8e8bb..027331c 100644 --- a/lapacke/src/lapacke_slansy_work.c +++ b/lapacke/src/lapacke_slansy_work.c @@ -66,8 +66,6 @@ float LAPACKE_slansy_work( int matrix_order, char norm, char uplo, /* Call LAPACK function and adjust info */ res = LAPACK_slansy( &norm, &uplo, &n, a_t, &lda_t, work ); info = 0; /* LAPACK call is ok! */ - /* Transpose output matrices */ - LAPACKE_ssy_trans( LAPACK_COL_MAJOR, uplo, n, a_t, lda_t, a, lda ); /* Release memory and exit */ LAPACKE_free( a_t ); exit_level_0: diff --git a/lapacke/src/lapacke_slantr_work.c b/lapacke/src/lapacke_slantr_work.c index 063d5b6..e0e01bd 100644 --- a/lapacke/src/lapacke_slantr_work.c +++ b/lapacke/src/lapacke_slantr_work.c @@ -64,11 +64,8 @@ float LAPACKE_slantr_work( int matrix_order, char norm, char uplo, /* Transpose input matrices */ LAPACKE_str_trans( matrix_order, uplo, diag, n, a, lda, a_t, lda_t ); /* Call LAPACK function and adjust info */ - LAPACK_slantr( &norm, &uplo, &diag, &m, &n, a_t, &lda_t, work ); + res = LAPACK_slantr( &norm, &uplo, &diag, &m, &n, a_t, &lda_t, work ); info = 0; /* LAPACK call is ok! */ - /* Transpose output matrices */ - LAPACKE_str_trans( LAPACK_COL_MAJOR, uplo, diag, n, a_t, lda_t, a, - lda ); /* Release memory and exit */ LAPACKE_free( a_t ); exit_level_0: diff --git a/lapacke/src/lapacke_slarfb_work.c b/lapacke/src/lapacke_slarfb_work.c index 066e3b6..d7c04e4 100644 --- a/lapacke/src/lapacke_slarfb_work.c +++ b/lapacke/src/lapacke_slarfb_work.c @@ -42,6 +42,9 @@ lapack_int LAPACKE_slarfb_work( int matrix_order, char side, char trans, lapack_int ldwork ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldc_t, ldt_t, ldv_t; + float* v_t, t_t, c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_slarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -50,22 +53,22 @@ lapack_int LAPACKE_slarfb_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = ( LAPACKE_lsame( storev, 'c' ) && + nrows_v = ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1) ); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - lapack_int ldc_t = MAX(1,m); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - float* v_t = NULL; - float* t_t = NULL; - float* c_t = NULL; + ldc_t = MAX(1,m); + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); + v_t = NULL; + t_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( ldc < n ) { info = -14; diff --git a/lapacke/src/lapacke_slarft.c b/lapacke/src/lapacke_slarft.c index 345efac..5265e62 100644 --- a/lapacke/src/lapacke_slarft.c +++ b/lapacke/src/lapacke_slarft.c @@ -39,15 +39,16 @@ lapack_int LAPACKE_slarft( int matrix_order, char direct, char storev, lapack_int ldv, const float* tau, float* t, lapack_int ldt ) { + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_slarft", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); if( LAPACKE_s_nancheck( k, tau, 1 ) ) { return -8; diff --git a/lapacke/src/lapacke_slarft_work.c b/lapacke/src/lapacke_slarft_work.c index 7f678a4..02232cf 100644 --- a/lapacke/src/lapacke_slarft_work.c +++ b/lapacke/src/lapacke_slarft_work.c @@ -40,6 +40,9 @@ lapack_int LAPACKE_slarft_work( int matrix_order, char direct, char storev, lapack_int ldt ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldt_t, ldv_t; + float *v_t = NULL, *t_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_slarft( &direct, &storev, &n, &k, v, &ldv, tau, t, &ldt ); @@ -47,14 +50,12 @@ lapack_int LAPACKE_slarft_work( int matrix_order, char direct, char storev, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - float* v_t = NULL; - float* t_t = NULL; + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); /* Check leading dimension(s) */ if( ldt < k ) { info = -10; diff --git a/lapacke/src/lapacke_sopgtr_work.c b/lapacke/src/lapacke_sopgtr_work.c index 6973d89..80bac9e 100644 --- a/lapacke/src/lapacke_sopgtr_work.c +++ b/lapacke/src/lapacke_sopgtr_work.c @@ -39,6 +39,8 @@ lapack_int LAPACKE_sopgtr_work( int matrix_order, char uplo, lapack_int n, lapack_int ldq, float* work ) { lapack_int info = 0; + lapack_int ldq_t; + float *q_t = NULL, *ap_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sopgtr( &uplo, &n, ap, tau, q, &ldq, work, &info ); @@ -46,9 +48,7 @@ lapack_int LAPACKE_sopgtr_work( int matrix_order, char uplo, lapack_int n, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int ldq_t = MAX(1,n); - float* q_t = NULL; - float* ap_t = NULL; + ldq_t = MAX(1,n); /* Check leading dimension(s) */ if( ldq < n ) { info = -7; diff --git a/lapacke/src/lapacke_sopmtr.c b/lapacke/src/lapacke_sopmtr.c index 19520f3..14b348c 100644 --- a/lapacke/src/lapacke_sopmtr.c +++ b/lapacke/src/lapacke_sopmtr.c @@ -42,13 +42,14 @@ lapack_int LAPACKE_sopmtr( int matrix_order, char side, char uplo, char trans, /* Additional scalars declarations for work arrays */ lapack_int lwork; float* work = NULL; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sopmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_ssp_nancheck( r, ap ) ) { return -7; } diff --git a/lapacke/src/lapacke_sopmtr_work.c b/lapacke/src/lapacke_sopmtr_work.c index 2001ef9..1a72126 100644 --- a/lapacke/src/lapacke_sopmtr_work.c +++ b/lapacke/src/lapacke_sopmtr_work.c @@ -40,6 +40,9 @@ lapack_int LAPACKE_sopmtr_work( int matrix_order, char side, char uplo, lapack_int ldc, float* work ) { lapack_int info = 0; + lapack_int r; + lapack_int ldc_t; + float *ap_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sopmtr( &side, &uplo, &trans, &m, &n, ap, tau, c, &ldc, work, @@ -48,10 +51,8 @@ lapack_int LAPACKE_sopmtr_work( int matrix_order, char side, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int ldc_t = MAX(1,m); - float* c_t = NULL; - float* ap_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( ldc < n ) { info = -10; diff --git a/lapacke/src/lapacke_sorbdb.c b/lapacke/src/lapacke_sorbdb.c index f9a8353..1f7b123 100644 --- a/lapacke/src/lapacke_sorbdb.c +++ b/lapacke/src/lapacke_sorbdb.c @@ -46,16 +46,17 @@ lapack_int LAPACKE_sorbdb( int matrix_order, char trans, char signs, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sorbdb", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_sge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -7; } diff --git a/lapacke/src/lapacke_sorcsd.c b/lapacke/src/lapacke_sorcsd.c index 1cae261..7780e3f 100644 --- a/lapacke/src/lapacke_sorcsd.c +++ b/lapacke/src/lapacke_sorcsd.c @@ -49,16 +49,17 @@ lapack_int LAPACKE_sorcsd( int matrix_order, char jobu1, char jobu2, lapack_int* iwork = NULL; float* work = NULL; float work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sorcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_sge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -11; } diff --git a/lapacke/src/lapacke_sormbr.c b/lapacke/src/lapacke_sormbr.c index 2a59de4..68af1a1 100644 --- a/lapacke/src/lapacke_sormbr.c +++ b/lapacke/src/lapacke_sormbr.c @@ -43,14 +43,15 @@ lapack_int LAPACKE_sormbr( int matrix_order, char vect, char side, char trans, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int nq, r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sormbr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); if( LAPACKE_sge_nancheck( matrix_order, r, MIN(nq,k), a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_sormbr_work.c b/lapacke/src/lapacke_sormbr_work.c index 67e6bd0..464a737 100644 --- a/lapacke/src/lapacke_sormbr_work.c +++ b/lapacke/src/lapacke_sormbr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_sormbr_work( int matrix_order, char vect, char side, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int nq, r; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormbr( &vect, &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, @@ -49,12 +52,10 @@ lapack_int LAPACKE_sormbr_work( int matrix_order, char vect, char side, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < MIN(nq,k) ) { info = -9; diff --git a/lapacke/src/lapacke_sormhr.c b/lapacke/src/lapacke_sormhr.c index 776edb5..4c72142 100644 --- a/lapacke/src/lapacke_sormhr.c +++ b/lapacke/src/lapacke_sormhr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_sormhr( int matrix_order, char side, char trans, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sormhr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_sge_nancheck( matrix_order, r, r, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_sormhr_work.c b/lapacke/src/lapacke_sormhr_work.c index 72b0335..dbf78db 100644 --- a/lapacke/src/lapacke_sormhr_work.c +++ b/lapacke/src/lapacke_sormhr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_sormhr_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormhr( &side, &trans, &m, &n, &ilo, &ihi, a, &lda, tau, c, &ldc, @@ -49,11 +52,9 @@ lapack_int LAPACKE_sormhr_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < r ) { info = -9; diff --git a/lapacke/src/lapacke_sormlq_work.c b/lapacke/src/lapacke_sormlq_work.c index c6a2547..d606876 100644 --- a/lapacke/src/lapacke_sormlq_work.c +++ b/lapacke/src/lapacke_sormlq_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_sormlq_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormlq( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,10 +51,8 @@ lapack_int LAPACKE_sormlq_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -8; diff --git a/lapacke/src/lapacke_sormql.c b/lapacke/src/lapacke_sormql.c index ce1a744..66107ae 100644 --- a/lapacke/src/lapacke_sormql.c +++ b/lapacke/src/lapacke_sormql.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_sormql( int matrix_order, char side, char trans, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sormql", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_sge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_sormql_work.c b/lapacke/src/lapacke_sormql_work.c index 028b3fd..d3203c2 100644 --- a/lapacke/src/lapacke_sormql_work.c +++ b/lapacke/src/lapacke_sormql_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_sormql_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormql( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,11 +52,9 @@ lapack_int LAPACKE_sormql_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < k ) { info = -8; diff --git a/lapacke/src/lapacke_sormqr.c b/lapacke/src/lapacke_sormqr.c index 21d1486..cd84770 100644 --- a/lapacke/src/lapacke_sormqr.c +++ b/lapacke/src/lapacke_sormqr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_sormqr( int matrix_order, char side, char trans, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sormqr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_sge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_sormqr_work.c b/lapacke/src/lapacke_sormqr_work.c index d49b402..c1ea66f 100644 --- a/lapacke/src/lapacke_sormqr_work.c +++ b/lapacke/src/lapacke_sormqr_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_sormqr_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormqr( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,11 +52,9 @@ lapack_int LAPACKE_sormqr_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < k ) { info = -8; diff --git a/lapacke/src/lapacke_sormrq_work.c b/lapacke/src/lapacke_sormrq_work.c index da43723..8d4ec32 100644 --- a/lapacke/src/lapacke_sormrq_work.c +++ b/lapacke/src/lapacke_sormrq_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_sormrq_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormrq( &side, &trans, &m, &n, &k, a, &lda, tau, c, &ldc, work, @@ -49,10 +51,8 @@ lapack_int LAPACKE_sormrq_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -8; diff --git a/lapacke/src/lapacke_sormrz_work.c b/lapacke/src/lapacke_sormrz_work.c index b24c6ee..1740786 100644 --- a/lapacke/src/lapacke_sormrz_work.c +++ b/lapacke/src/lapacke_sormrz_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_sormrz_work( int matrix_order, char side, char trans, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormrz( &side, &trans, &m, &n, &k, &l, a, &lda, tau, c, &ldc, @@ -49,10 +51,8 @@ lapack_int LAPACKE_sormrz_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int lda_t = MAX(1,k); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + lda_t = MAX(1,k); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < m ) { info = -9; diff --git a/lapacke/src/lapacke_sormtr.c b/lapacke/src/lapacke_sormtr.c index 0276b14..9a74a79 100644 --- a/lapacke/src/lapacke_sormtr.c +++ b/lapacke/src/lapacke_sormtr.c @@ -43,13 +43,14 @@ lapack_int LAPACKE_sormtr( int matrix_order, char side, char uplo, char trans, lapack_int lwork = -1; float* work = NULL; float work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_sormtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_sge_nancheck( matrix_order, r, r, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_sormtr_work.c b/lapacke/src/lapacke_sormtr_work.c index 04d7044..330f251 100644 --- a/lapacke/src/lapacke_sormtr_work.c +++ b/lapacke/src/lapacke_sormtr_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_sormtr_work( int matrix_order, char side, char uplo, float* work, lapack_int lwork ) { lapack_int info = 0; + lapack_int r, lda_t, ldc_t; + float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_sormtr( &side, &uplo, &trans, &m, &n, a, &lda, tau, c, &ldc, @@ -49,11 +51,9 @@ lapack_int LAPACKE_sormtr_work( int matrix_order, char side, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int lda_t = MAX(1,r); - lapack_int ldc_t = MAX(1,m); - float* a_t = NULL; - float* c_t = NULL; + r = LAPACKE_lsame( side, 'l' ) ? m : n; + lda_t = MAX(1,r); + ldc_t = MAX(1,m); /* Check leading dimension(s) */ if( lda < r ) { info = -8; diff --git a/lapacke/src/lapacke_zbbcsd.c b/lapacke/src/lapacke_zbbcsd.c index 3dafa9d..f93e569 100644 --- a/lapacke/src/lapacke_zbbcsd.c +++ b/lapacke/src/lapacke_zbbcsd.c @@ -49,16 +49,17 @@ lapack_int LAPACKE_zbbcsd( int matrix_order, char jobu1, char jobu2, lapack_int lrwork = -1; double* rwork = NULL; double rwork_query; + lapack_int nrows_u1, nrows_u2, nrows_v1t, nrows_v2t if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zbbcsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); - lapack_int nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); - lapack_int nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); - lapack_int nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); + nrows_u1 = ( LAPACKE_lsame( jobu1, 'y' ) ? p : 1); + nrows_u2 = ( LAPACKE_lsame( jobu2, 'y' ) ? m-p : 1); + nrows_v1t = ( LAPACKE_lsame( jobv1t, 'y' ) ? q : 1); + nrows_v2t = ( LAPACKE_lsame( jobv2t, 'y' ) ? m-q : 1); if( LAPACKE_d_nancheck( q-1, phi, 1 ) ) { return -11; } diff --git a/lapacke/src/lapacke_zhfrk_work.c b/lapacke/src/lapacke_zhfrk_work.c index 8440c19..d6098c0 100644 --- a/lapacke/src/lapacke_zhfrk_work.c +++ b/lapacke/src/lapacke_zhfrk_work.c @@ -41,6 +41,8 @@ lapack_int LAPACKE_zhfrk_work( int matrix_order, char transr, char uplo, lapack_complex_double* c ) { lapack_int info = 0; + lapack_int na, ka, lda_t; + lapack_complex_double* a_t,c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_zhfrk( &transr, &uplo, &trans, &n, &k, &alpha, a, &lda, &beta, @@ -49,11 +51,11 @@ lapack_int LAPACKE_zhfrk_work( int matrix_order, char transr, char uplo, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int lda_t = MAX(1,na); - lapack_complex_double* a_t = NULL; - lapack_complex_double* c_t = NULL; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + lda_t = MAX(1,na); + a_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( lda < ka ) { info = -9; diff --git a/lapacke/src/lapacke_zlarfb_work.c b/lapacke/src/lapacke_zlarfb_work.c index 42f848c..e351411 100644 --- a/lapacke/src/lapacke_zlarfb_work.c +++ b/lapacke/src/lapacke_zlarfb_work.c @@ -43,6 +43,9 @@ lapack_int LAPACKE_zlarfb_work( int matrix_order, char side, char trans, lapack_complex_double* work, lapack_int ldwork ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldc_t, ldt_t, ldv_t; + lapack_complex_double* v_t, t_t, c_t; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_zlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -51,22 +54,22 @@ lapack_int LAPACKE_zlarfb_work( int matrix_order, char side, char trans, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = ( LAPACKE_lsame( storev, 'c' ) && + nrows_v = ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'c' ) && LAPACKE_lsame( side, 'r' ) ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1) ); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - lapack_int ldc_t = MAX(1,m); - lapack_int ldt_t = MAX(1,k); - lapack_int ldv_t = MAX(1,nrows_v); - lapack_complex_double* v_t = NULL; - lapack_complex_double* t_t = NULL; - lapack_complex_double* c_t = NULL; + ldc_t = MAX(1,m); + ldt_t = MAX(1,k); + ldv_t = MAX(1,nrows_v); + v_t = NULL; + t_t = NULL; + c_t = NULL; /* Check leading dimension(s) */ if( ldc < n ) { info = -14; diff --git a/lapacke/src/lapacke_zlarft.c b/lapacke/src/lapacke_zlarft.c index cd42e28..915ae45 100644 --- a/lapacke/src/lapacke_zlarft.c +++ b/lapacke/src/lapacke_zlarft.c @@ -40,15 +40,16 @@ lapack_int LAPACKE_zlarft( int matrix_order, char direct, char storev, const lapack_complex_double* tau, lapack_complex_double* t, lapack_int ldt ) { + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zlarft", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); if( LAPACKE_z_nancheck( k, tau, 1 ) ) { return -8; diff --git a/lapacke/src/lapacke_zlarft_work.c b/lapacke/src/lapacke_zlarft_work.c index 64469d3..1000736 100644 --- a/lapacke/src/lapacke_zlarft_work.c +++ b/lapacke/src/lapacke_zlarft_work.c @@ -41,6 +41,9 @@ lapack_int LAPACKE_zlarft_work( int matrix_order, char direct, char storev, lapack_complex_double* t, lapack_int ldt ) { lapack_int info = 0; + lapack_int nrows_v, ncols_v; + lapack_int ldt_t, ldv_t; + lapack_complex_double *v_t = NULL, *t_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_zlarft( &direct, &storev, &n, &k, v, &ldv, tau, t, &ldt ); @@ -48,14 +51,12 @@ lapack_int LAPACKE_zlarft_work( int matrix_order, char direct, char storev, info = info - 1; } } else if( matrix_order == LAPACK_ROW_MAJOR ) { - lapack_int nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : + nrows_v = LAPACKE_lsame( storev, 'c' ) ? n : ( LAPACKE_lsame( storev, 'r' ) ? k : 1); - lapack_int ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : + ncols_v = LAPACKE_lsame( storev, 'c' ) ? k : ( LAPACKE_lsame( storev, 'r' ) ? n : 1); lapack_int ldt_t = MAX(1,k); lapack_int ldv_t = MAX(1,nrows_v); - lapack_complex_double* v_t = NULL; - lapack_complex_double* t_t = NULL; /* Check leading dimension(s) */ if( ldt < k ) { info = -10; diff --git a/lapacke/src/lapacke_zunbdb.c b/lapacke/src/lapacke_zunbdb.c index 5fb9b55..1d425dd 100644 --- a/lapacke/src/lapacke_zunbdb.c +++ b/lapacke/src/lapacke_zunbdb.c @@ -50,16 +50,17 @@ lapack_int LAPACKE_zunbdb( int matrix_order, char trans, char signs, lapack_int lwork = -1; lapack_complex_double* work = NULL; lapack_complex_double work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunbdb", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_zge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -7; } diff --git a/lapacke/src/lapacke_zuncsd.c b/lapacke/src/lapacke_zuncsd.c index 9237031..09c3bc3 100644 --- a/lapacke/src/lapacke_zuncsd.c +++ b/lapacke/src/lapacke_zuncsd.c @@ -55,16 +55,17 @@ lapack_int LAPACKE_zuncsd( int matrix_order, char jobu1, char jobu2, lapack_complex_double* work = NULL; double rwork_query; lapack_complex_double work_query; + lapack_int nrows_x11, nrows_x12, nrows_x21, nrows_x22; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zuncsd", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); - lapack_int nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); - lapack_int nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); - lapack_int nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); + nrows_x11 = ( LAPACKE_lsame( trans, 'n' ) ? p : q); + nrows_x12 = ( LAPACKE_lsame( trans, 'n' ) ? p : m-q); + nrows_x21 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : q); + nrows_x22 = ( LAPACKE_lsame( trans, 'n' ) ? m-p : m-q); if( LAPACKE_zge_nancheck( matrix_order, nrows_x11, q, x11, ldx11 ) ) { return -11; } diff --git a/lapacke/src/lapacke_zunmbr.c b/lapacke/src/lapacke_zunmbr.c index 5312ece..a843e54 100644 --- a/lapacke/src/lapacke_zunmbr.c +++ b/lapacke/src/lapacke_zunmbr.c @@ -44,14 +44,15 @@ lapack_int LAPACKE_zunmbr( int matrix_order, char vect, char side, char trans, lapack_int lwork = -1; lapack_complex_double* work = NULL; lapack_complex_double work_query; + lapack_int nq, r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunmbr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int nq = LAPACKE_lsame( side, 'l' ) ? m : n; - lapack_int r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); + nq = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( vect, 'q' ) ? nq : MIN(nq,k); if( LAPACKE_zge_nancheck( matrix_order, r, MIN(nq,k), a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_zunmhr.c b/lapacke/src/lapacke_zunmhr.c index b4421fc..1b4d275 100644 --- a/lapacke/src/lapacke_zunmhr.c +++ b/lapacke/src/lapacke_zunmhr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_zunmhr( int matrix_order, char side, char trans, lapack_int lwork = -1; lapack_complex_double* work = NULL; lapack_complex_double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunmhr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_zge_nancheck( matrix_order, r, r, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_zunmql.c b/lapacke/src/lapacke_zunmql.c index b453cf1..e3bb91d 100644 --- a/lapacke/src/lapacke_zunmql.c +++ b/lapacke/src/lapacke_zunmql.c @@ -43,6 +43,7 @@ lapack_int LAPACKE_zunmql( int matrix_order, char side, char trans, lapack_int info = 0; lapack_int lwork = -1; lapack_complex_double* work = NULL; + lapack_int r; lapack_complex_double work_query; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunmql", -1 ); @@ -50,7 +51,7 @@ lapack_int LAPACKE_zunmql( int matrix_order, char side, char trans, } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_zge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_zunmqr.c b/lapacke/src/lapacke_zunmqr.c index 68c942f..99ffb34 100644 --- a/lapacke/src/lapacke_zunmqr.c +++ b/lapacke/src/lapacke_zunmqr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_zunmqr( int matrix_order, char side, char trans, lapack_int lwork = -1; lapack_complex_double* work = NULL; lapack_complex_double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunmqr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_zge_nancheck( matrix_order, r, k, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_zunmtr.c b/lapacke/src/lapacke_zunmtr.c index ae2b54b..bd2716a 100644 --- a/lapacke/src/lapacke_zunmtr.c +++ b/lapacke/src/lapacke_zunmtr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_zunmtr( int matrix_order, char side, char uplo, char trans, lapack_int lwork = -1; lapack_complex_double* work = NULL; lapack_complex_double work_query; + lapack_int r; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zunmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_zge_nancheck( matrix_order, r, r, a, lda ) ) { return -7; } diff --git a/lapacke/src/lapacke_zupmtr.c b/lapacke/src/lapacke_zupmtr.c index a690f7f..8d89669 100644 --- a/lapacke/src/lapacke_zupmtr.c +++ b/lapacke/src/lapacke_zupmtr.c @@ -44,13 +44,14 @@ lapack_int LAPACKE_zupmtr( int matrix_order, char side, char uplo, char trans, /* Additional scalars declarations for work arrays */ lapack_int lwork; lapack_complex_double* work = NULL; + lapack_int r ; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zupmtr", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int r = LAPACKE_lsame( side, 'l' ) ? m : n; + r = LAPACKE_lsame( side, 'l' ) ? m : n; if( LAPACKE_zpp_nancheck( r, ap ) ) { return -7; } -- 2.7.4