From c5817e71841caf214d2053c332913abcb6569a03 Mon Sep 17 00:00:00 2001 From: julie Date: Tue, 23 Feb 2016 05:59:45 +0000 Subject: [PATCH] APPLYING INTEL PATCHES sent to Julie on Feb 19th 2016 by Dima from INTEL (dmitry.g.baksheev@intel.com) !!! NOT APPLYING PATCH [PATCH 36/42] !!! Fix lapacke_?syconv - parameter work is not part of hi-level interface See revision 1609 | langou | 2015-10-28 22:06:14 -0700 (Wed, 28 Oct 2015) "In ?syconv, replace the variable name WORK by the variable name E. E is the standard way to name the supdiagonal/subdiagonal of a symmetric tridiagonal matrix. Also, E (previously WORK) is of size N-1, not N. So correct this in the comment." Updated LAPACKE with new parameter name. --- LAPACKE/include/lapacke.h | 24 ++++++++++++------------ LAPACKE/src/lapacke_csyconv.c | 4 ++-- LAPACKE/src/lapacke_csyconv_work.c | 6 +++--- LAPACKE/src/lapacke_dsyconv.c | 4 ++-- LAPACKE/src/lapacke_dsyconv_work.c | 6 +++--- LAPACKE/src/lapacke_ssyconv.c | 4 ++-- LAPACKE/src/lapacke_ssyconv_work.c | 6 +++--- LAPACKE/src/lapacke_zsyconv.c | 4 ++-- LAPACKE/src/lapacke_zsyconv_work.c | 6 +++--- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/LAPACKE/include/lapacke.h b/LAPACKE/include/lapacke.h index e60d032..116009a 100644 --- a/LAPACKE/include/lapacke.h +++ b/LAPACKE/include/lapacke.h @@ -10502,11 +10502,11 @@ lapack_int LAPACKE_chetrs2_work( int matrix_layout, char uplo, lapack_int n, lapack_complex_float* work ); lapack_int LAPACKE_csyconv( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_float* a, lapack_int lda, - const lapack_int* ipiv, lapack_complex_float* work ); + const lapack_int* ipiv, lapack_complex_float* e ); lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_float* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_float* work ); + lapack_complex_float* e ); lapack_int LAPACKE_csyswapr( int matrix_layout, char uplo, lapack_int n, lapack_complex_float* a, lapack_int i1, lapack_int i2 ); @@ -10669,10 +10669,10 @@ lapack_int LAPACKE_dorcsd2by1_work( int matrix_layout, char jobu1, char jobu2, lapack_int ldu2, double* v1t, lapack_int ldv1t, double* work, lapack_int lwork, lapack_int* iwork ); lapack_int LAPACKE_dsyconv( int matrix_layout, char uplo, char way, lapack_int n, - double* a, lapack_int lda, const lapack_int* ipiv, double* work); + double* a, lapack_int lda, const lapack_int* ipiv, double* e); lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way, lapack_int n, double* a, lapack_int lda, - const lapack_int* ipiv, double* work ); + const lapack_int* ipiv, double* e ); lapack_int LAPACKE_dsyswapr( int matrix_layout, char uplo, lapack_int n, double* a, lapack_int i1, lapack_int i2 ); lapack_int LAPACKE_dsyswapr_work( int matrix_layout, char uplo, lapack_int n, @@ -10762,10 +10762,10 @@ lapack_int LAPACKE_sorcsd2by1_work( int matrix_layout, char jobu1, char jobu2, lapack_int ldu2, float* v1t, lapack_int ldv1t, float* work, lapack_int lwork, lapack_int* iwork ); lapack_int LAPACKE_ssyconv( int matrix_layout, char uplo, char way, lapack_int n, - float* a, lapack_int lda, const lapack_int* ipiv, float* work ); + float* a, lapack_int lda, const lapack_int* ipiv, float* e ); lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way, lapack_int n, float* a, lapack_int lda, - const lapack_int* ipiv, float* work ); + const lapack_int* ipiv, float* e ); lapack_int LAPACKE_ssyswapr( int matrix_layout, char uplo, lapack_int n, float* a, lapack_int i1, lapack_int i2 ); lapack_int LAPACKE_ssyswapr_work( int matrix_layout, char uplo, lapack_int n, @@ -10843,11 +10843,11 @@ lapack_int LAPACKE_zhetrs2_work( int matrix_layout, char uplo, lapack_int n, lapack_complex_double* work ); lapack_int LAPACKE_zsyconv( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_double* a, lapack_int lda, - const lapack_int* ipiv, lapack_complex_double* work ); + const lapack_int* ipiv, lapack_complex_double* e ); lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_double* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_double* work ); + lapack_complex_double* e ); lapack_int LAPACKE_zsyswapr( int matrix_layout, char uplo, lapack_int n, lapack_complex_double* a, lapack_int i1, lapack_int i2 ); @@ -17079,7 +17079,7 @@ void LAPACK_chetrs2( char* uplo, lapack_int* n, void LAPACK_csyconv( char* uplo, char* way, lapack_int* n, lapack_complex_float* a, lapack_int* lda, const lapack_int* ipiv, - lapack_complex_float* work , lapack_int *info ); + lapack_complex_float* e , lapack_int *info ); void LAPACK_csyswapr( char* uplo, lapack_int* n, lapack_complex_float* a, lapack_int* i1, lapack_int* i2 ); @@ -17173,7 +17173,7 @@ void LAPACK_dorcsd2by1( char* jobu1, char* jobu2, lapack_int* iwork , lapack_int *info ); void LAPACK_dsyconv( char* uplo, char* way, lapack_int* n, double* a, lapack_int* lda, - const lapack_int* ipiv, double* work , lapack_int *info ); + const lapack_int* ipiv, double* e , lapack_int *info ); void LAPACK_dsyswapr( char* uplo, lapack_int* n, double* a, lapack_int* i1, lapack_int* i2 ); void LAPACK_dsytri2( char* uplo, lapack_int* n, @@ -17227,7 +17227,7 @@ void LAPACK_sorcsd2by1( char* jobu1, char* jobu2, lapack_int* iwork , lapack_int *info ); void LAPACK_ssyconv( char* uplo, char* way, lapack_int* n, float* a, lapack_int* lda, - const lapack_int* ipiv, float* work , lapack_int *info ); + const lapack_int* ipiv, float* e , lapack_int *info ); void LAPACK_ssyswapr( char* uplo, lapack_int* n, float* a, lapack_int* i1, lapack_int* i2 ); void LAPACK_ssytri2( char* uplo, lapack_int* n, @@ -17274,7 +17274,7 @@ void LAPACK_zhetrs2( char* uplo, lapack_int* n, void LAPACK_zsyconv( char* uplo, char* way, lapack_int* n, lapack_complex_double* a, lapack_int* lda, const lapack_int* ipiv, - lapack_complex_double* work , lapack_int *info ); + lapack_complex_double* e , lapack_int *info ); void LAPACK_zsyswapr( char* uplo, lapack_int* n, lapack_complex_double* a, lapack_int* i1, lapack_int* i2 ); diff --git a/LAPACKE/src/lapacke_csyconv.c b/LAPACKE/src/lapacke_csyconv.c index 47633a2..b896766 100644 --- a/LAPACKE/src/lapacke_csyconv.c +++ b/LAPACKE/src/lapacke_csyconv.c @@ -36,7 +36,7 @@ lapack_int LAPACKE_csyconv( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_float* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_float* work ) + lapack_complex_float* e ) { lapack_int info = 0; if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) { @@ -51,7 +51,7 @@ lapack_int LAPACKE_csyconv( int matrix_layout, char uplo, char way, lapack_int n #endif /* Call middle-level interface */ info = LAPACKE_csyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, - work ); + e ); exit_level_0: if( info == LAPACK_WORK_MEMORY_ERROR ) { LAPACKE_xerbla( "LAPACKE_csyconv", info ); diff --git a/LAPACKE/src/lapacke_csyconv_work.c b/LAPACKE/src/lapacke_csyconv_work.c index 19e9abb..4874172 100644 --- a/LAPACKE/src/lapacke_csyconv_work.c +++ b/LAPACKE/src/lapacke_csyconv_work.c @@ -36,12 +36,12 @@ lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_float* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_float* work ) + lapack_complex_float* e ) { lapack_int info = 0; if( matrix_layout == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ - LAPACK_csyconv( &uplo, &way, &n, a, &lda, ipiv, work, &info ); + LAPACK_csyconv( &uplo, &way, &n, a, &lda, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } @@ -64,7 +64,7 @@ lapack_int LAPACKE_csyconv_work( int matrix_layout, char uplo, char way, /* Transpose input matrices */ LAPACKE_cge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t ); /* Call LAPACK function and adjust info */ - LAPACK_csyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, work, &info ); + LAPACK_csyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } diff --git a/LAPACKE/src/lapacke_dsyconv.c b/LAPACKE/src/lapacke_dsyconv.c index ba937a9..8c88f0a 100644 --- a/LAPACKE/src/lapacke_dsyconv.c +++ b/LAPACKE/src/lapacke_dsyconv.c @@ -34,7 +34,7 @@ #include "lapacke_utils.h" lapack_int LAPACKE_dsyconv( int matrix_layout, char uplo, char way, lapack_int n, - double* a, lapack_int lda, const lapack_int* ipiv, double* work ) + double* a, lapack_int lda, const lapack_int* ipiv, double* e ) { lapack_int info = 0; if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) { @@ -50,7 +50,7 @@ lapack_int LAPACKE_dsyconv( int matrix_layout, char uplo, char way, lapack_int n /* Call middle-level interface */ info = LAPACKE_dsyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, - work ); + e ); exit_level_0: if( info == LAPACK_WORK_MEMORY_ERROR ) { LAPACKE_xerbla( "LAPACKE_dsyconv", info ); diff --git a/LAPACKE/src/lapacke_dsyconv_work.c b/LAPACKE/src/lapacke_dsyconv_work.c index 3355dd3..cf6aeef 100644 --- a/LAPACKE/src/lapacke_dsyconv_work.c +++ b/LAPACKE/src/lapacke_dsyconv_work.c @@ -35,12 +35,12 @@ lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way, lapack_int n, double* a, lapack_int lda, - const lapack_int* ipiv, double* work ) + const lapack_int* ipiv, double* e ) { lapack_int info = 0; if( matrix_layout == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ - LAPACK_dsyconv( &uplo, &way, &n, a, &lda, ipiv, work, &info ); + LAPACK_dsyconv( &uplo, &way, &n, a, &lda, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } @@ -62,7 +62,7 @@ lapack_int LAPACKE_dsyconv_work( int matrix_layout, char uplo, char way, /* Transpose input matrices */ LAPACKE_dge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t ); /* Call LAPACK function and adjust info */ - LAPACK_dsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, work, &info ); + LAPACK_dsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } diff --git a/LAPACKE/src/lapacke_ssyconv.c b/LAPACKE/src/lapacke_ssyconv.c index 83ae6ff..2d9cbd4 100644 --- a/LAPACKE/src/lapacke_ssyconv.c +++ b/LAPACKE/src/lapacke_ssyconv.c @@ -34,7 +34,7 @@ #include "lapacke_utils.h" lapack_int LAPACKE_ssyconv( int matrix_layout, char uplo, char way, lapack_int n, - float* a, lapack_int lda, const lapack_int* ipiv, float* work ) + float* a, lapack_int lda, const lapack_int* ipiv, float* e ) { lapack_int info = 0; if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) { @@ -50,7 +50,7 @@ lapack_int LAPACKE_ssyconv( int matrix_layout, char uplo, char way, lapack_int n /* Call middle-level interface */ info = LAPACKE_ssyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, - work ); + e ); exit_level_0: if( info == LAPACK_WORK_MEMORY_ERROR ) { LAPACKE_xerbla( "LAPACKE_ssyconv", info ); diff --git a/LAPACKE/src/lapacke_ssyconv_work.c b/LAPACKE/src/lapacke_ssyconv_work.c index 117c095..5238a7d 100644 --- a/LAPACKE/src/lapacke_ssyconv_work.c +++ b/LAPACKE/src/lapacke_ssyconv_work.c @@ -35,12 +35,12 @@ lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way, lapack_int n, float* a, lapack_int lda, - const lapack_int* ipiv, float* work ) + const lapack_int* ipiv, float* e ) { lapack_int info = 0; if( matrix_layout == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ - LAPACK_ssyconv( &uplo, &way, &n, a, &lda, ipiv, work, &info ); + LAPACK_ssyconv( &uplo, &way, &n, a, &lda, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } @@ -62,7 +62,7 @@ lapack_int LAPACKE_ssyconv_work( int matrix_layout, char uplo, char way, /* Transpose input matrices */ LAPACKE_sge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t ); /* Call LAPACK function and adjust info */ - LAPACK_ssyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, work, &info ); + LAPACK_ssyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } diff --git a/LAPACKE/src/lapacke_zsyconv.c b/LAPACKE/src/lapacke_zsyconv.c index 9dbc067..007e7f3 100644 --- a/LAPACKE/src/lapacke_zsyconv.c +++ b/LAPACKE/src/lapacke_zsyconv.c @@ -36,7 +36,7 @@ lapack_int LAPACKE_zsyconv( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_double* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_double* work ) + lapack_complex_double* e ) { lapack_int info = 0; if( matrix_layout != LAPACK_COL_MAJOR && matrix_layout != LAPACK_ROW_MAJOR ) { @@ -51,7 +51,7 @@ lapack_int LAPACKE_zsyconv( int matrix_layout, char uplo, char way, lapack_int n #endif /* Call middle-level interface */ info = LAPACKE_zsyconv_work( matrix_layout, uplo, way, n, a, lda, ipiv, - work ); + e ); exit_level_0: if( info == LAPACK_WORK_MEMORY_ERROR ) { diff --git a/LAPACKE/src/lapacke_zsyconv_work.c b/LAPACKE/src/lapacke_zsyconv_work.c index 34f1294..36a6ea6 100644 --- a/LAPACKE/src/lapacke_zsyconv_work.c +++ b/LAPACKE/src/lapacke_zsyconv_work.c @@ -36,12 +36,12 @@ lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way, lapack_int n, lapack_complex_double* a, lapack_int lda, const lapack_int* ipiv, - lapack_complex_double* work ) + lapack_complex_double* e ) { lapack_int info = 0; if( matrix_layout == LAPACK_COL_MAJOR ) { /* Call LAPACK function and adjust info */ - LAPACK_zsyconv( &uplo, &way, &n, a, &lda, ipiv, work, &info ); + LAPACK_zsyconv( &uplo, &way, &n, a, &lda, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } @@ -64,7 +64,7 @@ lapack_int LAPACKE_zsyconv_work( int matrix_layout, char uplo, char way, /* Transpose input matrices */ LAPACKE_zge_trans( matrix_layout, lda, n, a, lda, a_t, lda_t ); /* Call LAPACK function and adjust info */ - LAPACK_zsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, work, &info ); + LAPACK_zsyconv( &uplo, &way, &n, a_t, &lda_t, ipiv, e, &info ); if( info < 0 ) { info = info - 1; } -- 2.7.4