From cf33dba3872b0085cb33106c2e985a35c4fabc93 Mon Sep 17 00:00:00 2001 From: julie Date: Fri, 9 Dec 2011 03:15:06 +0000 Subject: [PATCH] Some more and fix previous mistakes ... --- lapacke/src/lapacke_chfrk.c | 5 +++-- lapacke/src/lapacke_chfrk_work.c | 4 +--- lapacke/src/lapacke_clarfb.c | 5 +++-- lapacke/src/lapacke_clarfb_work.c | 5 +---- lapacke/src/lapacke_dlarfb.c | 5 +++-- lapacke/src/lapacke_dlarfb_work.c | 5 +---- lapacke/src/lapacke_slarfb.c | 5 +++-- lapacke/src/lapacke_slarfb_work.c | 5 +---- lapacke/src/lapacke_zhfrk.c | 5 +++-- lapacke/src/lapacke_zhfrk_work.c | 4 +--- lapacke/src/lapacke_zlarfb.c | 5 +++-- lapacke/src/lapacke_zlarfb_work.c | 5 +---- 12 files changed, 24 insertions(+), 34 deletions(-) diff --git a/lapacke/src/lapacke_chfrk.c b/lapacke/src/lapacke_chfrk.c index 0a65c84..4d48ed2 100644 --- a/lapacke/src/lapacke_chfrk.c +++ b/lapacke/src/lapacke_chfrk.c @@ -39,14 +39,15 @@ lapack_int LAPACKE_chfrk( int matrix_order, char transr, char uplo, char trans, const lapack_complex_float* a, lapack_int lda, float beta, lapack_complex_float* c ) { + lapack_int ka, na; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_chfrk", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; if( LAPACKE_cge_nancheck( matrix_order, na, ka, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_chfrk_work.c b/lapacke/src/lapacke_chfrk_work.c index e6e077a..5e72c7e 100644 --- a/lapacke/src/lapacke_chfrk_work.c +++ b/lapacke/src/lapacke_chfrk_work.c @@ -42,7 +42,7 @@ lapack_int LAPACKE_chfrk_work( int matrix_order, char transr, char uplo, { lapack_int info = 0; lapack_int na, ka, lda_t; - lapack_complex_float* a_t,c_t; + lapack_complex_float *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_chfrk( &transr, &uplo, &trans, &n, &k, &alpha, a, &lda, &beta, @@ -54,8 +54,6 @@ lapack_int LAPACKE_chfrk_work( int matrix_order, char transr, char uplo, 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_clarfb.c b/lapacke/src/lapacke_clarfb.c index ac31a7d..09dbec2 100644 --- a/lapacke/src/lapacke_clarfb.c +++ b/lapacke/src/lapacke_clarfb.c @@ -44,18 +44,19 @@ lapack_int LAPACKE_clarfb( int matrix_order, char side, char trans, char direct, lapack_int info = 0; lapack_int ldwork = ( side=='l')?n:(( side=='r')?m:1); lapack_complex_float* work = NULL; + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_clarfb", -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' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - 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 : diff --git a/lapacke/src/lapacke_clarfb_work.c b/lapacke/src/lapacke_clarfb_work.c index e89bb3a..56cc784 100644 --- a/lapacke/src/lapacke_clarfb_work.c +++ b/lapacke/src/lapacke_clarfb_work.c @@ -45,7 +45,7 @@ lapack_int LAPACKE_clarfb_work( int matrix_order, char side, char trans, 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; + lapack_complex_float *v_t = NULL, *t_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_clarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -67,9 +67,6 @@ lapack_int LAPACKE_clarfb_work( int matrix_order, char side, char trans, 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_dlarfb.c b/lapacke/src/lapacke_dlarfb.c index 9a444c0..0cb2ceb 100644 --- a/lapacke/src/lapacke_dlarfb.c +++ b/lapacke/src/lapacke_dlarfb.c @@ -43,18 +43,19 @@ lapack_int LAPACKE_dlarfb( int matrix_order, char side, char trans, char direct, lapack_int info = 0; lapack_int ldwork = ( side=='l')?n:(( side=='r')?m:1); double* work = NULL; + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_dlarfb", -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' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - 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 : diff --git a/lapacke/src/lapacke_dlarfb_work.c b/lapacke/src/lapacke_dlarfb_work.c index d9211f5..e1f7ae8 100644 --- a/lapacke/src/lapacke_dlarfb_work.c +++ b/lapacke/src/lapacke_dlarfb_work.c @@ -44,7 +44,7 @@ lapack_int LAPACKE_dlarfb_work( int matrix_order, char side, char trans, 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; + double *v_t = NULL, *t_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_dlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -66,9 +66,6 @@ lapack_int LAPACKE_dlarfb_work( int matrix_order, char side, char trans, 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_slarfb.c b/lapacke/src/lapacke_slarfb.c index ee46e18..4d9ca8f 100644 --- a/lapacke/src/lapacke_slarfb.c +++ b/lapacke/src/lapacke_slarfb.c @@ -43,18 +43,19 @@ lapack_int LAPACKE_slarfb( int matrix_order, char side, char trans, char direct, lapack_int info = 0; lapack_int ldwork = ( side=='l')?n:(( side=='r')?m:1); float* work = NULL; + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_slarfb", -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' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - 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 : diff --git a/lapacke/src/lapacke_slarfb_work.c b/lapacke/src/lapacke_slarfb_work.c index d7c04e4..4491817 100644 --- a/lapacke/src/lapacke_slarfb_work.c +++ b/lapacke/src/lapacke_slarfb_work.c @@ -44,7 +44,7 @@ lapack_int LAPACKE_slarfb_work( int matrix_order, char side, char trans, 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; + float *v_t = NULL, *t_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_slarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -66,9 +66,6 @@ lapack_int LAPACKE_slarfb_work( int matrix_order, char side, char trans, 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_zhfrk.c b/lapacke/src/lapacke_zhfrk.c index 903b706..63c567f 100644 --- a/lapacke/src/lapacke_zhfrk.c +++ b/lapacke/src/lapacke_zhfrk.c @@ -39,14 +39,15 @@ lapack_int LAPACKE_zhfrk( int matrix_order, char transr, char uplo, char trans, const lapack_complex_double* a, lapack_int lda, double beta, lapack_complex_double* c ) { + lapack_int ka, na; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zhfrk", -1 ); return -1; } #ifndef LAPACK_DISABLE_NAN_CHECK /* Optionally check input matrices for NaNs */ - lapack_int ka = LAPACKE_lsame( trans, 'n' ) ? k : n; - lapack_int na = LAPACKE_lsame( trans, 'n' ) ? n : k; + ka = LAPACKE_lsame( trans, 'n' ) ? k : n; + na = LAPACKE_lsame( trans, 'n' ) ? n : k; if( LAPACKE_zge_nancheck( matrix_order, na, ka, a, lda ) ) { return -8; } diff --git a/lapacke/src/lapacke_zhfrk_work.c b/lapacke/src/lapacke_zhfrk_work.c index d6098c0..f12f1db 100644 --- a/lapacke/src/lapacke_zhfrk_work.c +++ b/lapacke/src/lapacke_zhfrk_work.c @@ -42,7 +42,7 @@ lapack_int LAPACKE_zhfrk_work( int matrix_order, char transr, char uplo, { lapack_int info = 0; lapack_int na, ka, lda_t; - lapack_complex_double* a_t,c_t; + lapack_complex_double *a_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_zhfrk( &transr, &uplo, &trans, &n, &k, &alpha, a, &lda, &beta, @@ -54,8 +54,6 @@ lapack_int LAPACKE_zhfrk_work( int matrix_order, char transr, char uplo, 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.c b/lapacke/src/lapacke_zlarfb.c index 386116d..5944aaa 100644 --- a/lapacke/src/lapacke_zlarfb.c +++ b/lapacke/src/lapacke_zlarfb.c @@ -44,18 +44,19 @@ lapack_int LAPACKE_zlarfb( int matrix_order, char side, char trans, char direct, lapack_int info = 0; lapack_int ldwork = ( side=='l')?n:(( side=='r')?m:1); lapack_complex_double* work = NULL; + lapack_int ncols_v, nrows_v; if( matrix_order != LAPACK_COL_MAJOR && matrix_order != LAPACK_ROW_MAJOR ) { LAPACKE_xerbla( "LAPACKE_zlarfb", -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' ) && LAPACKE_lsame( side, 'l' ) ) ? m : ( ( LAPACKE_lsame( storev, 'r' ) && LAPACKE_lsame( side, 'r' ) ) ? n : 1) ); - 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 : diff --git a/lapacke/src/lapacke_zlarfb_work.c b/lapacke/src/lapacke_zlarfb_work.c index e351411..ac14791 100644 --- a/lapacke/src/lapacke_zlarfb_work.c +++ b/lapacke/src/lapacke_zlarfb_work.c @@ -45,7 +45,7 @@ lapack_int LAPACKE_zlarfb_work( int matrix_order, char side, char trans, 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; + lapack_complex_double *v_t = NULL, *t_t = NULL, *c_t = NULL; if( matrix_order == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ LAPACK_zlarfb( &side, &trans, &direct, &storev, &m, &n, &k, v, &ldv, t, @@ -67,9 +67,6 @@ lapack_int LAPACKE_zlarfb_work( int matrix_order, char side, char trans, 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; -- 2.7.4