Skip to content
This repository has been archived by the owner on Oct 19, 2020. It is now read-only.

Commit

Permalink
Reduce diff with svn, step 4.
Browse files Browse the repository at this point in the history 
Merge changes in lapack.h, lapack_names.h.
  • Loading branch information
@inducer
inducer committed Aug 16, 2008
1 parent 6db271c commit 349ab24
Show file tree
Hide file tree
Showing 2 changed files with 85 additions and 84 deletions.
123 changes: 61 additions & 62 deletions boost/numeric/bindings/lapack/lapack.h
View file
Expand Up @@ -288,7 +288,6 @@ extern "C" {
int const* ipiv, fcomplex_t* work, int* info);
void LAPACK_ZSPTRI (char const* uplo, int const* n, dcomplex_t const* ap,
int const* ipiv, dcomplex_t* work, int* info);

void LAPACK_CHPTRS (char const* uplo, int const* n, int const* nrhs,
fcomplex_t const* ap, int const* ipiv,
fcomplex_t* b, int const* ldb, int* info);
Expand Down Expand Up @@ -369,6 +368,52 @@ extern "C" {
int* info );


/* divide and conqer drivers for eigenvalue problems */
void LAPACK_SSYEVD( const char* jobz, const char* uplo, const int* n,
float* a, const int* lda, float* w,
float* work, const int* lwork,
int* iwork, const int* liwork, int* info);

void LAPACK_DSYEVD( const char* jobz, const char* uplo, const int* n,
double* a, const int* lda, double* w,
double* work, const int* lwork,
int* iwork, const int* liwork, int* info);

void LAPACK_CHEEVD( const char* jobz, const char* uplo, const int* n,
fcomplex_t* a, const int* lda, float* w,
fcomplex_t* work, const int* lwork, float* rwork, const int* lrwork,
int* iwork, const int* liwork, int* info);

void LAPACK_ZHEEVD( const char* jobz, const char* uplo, const int* n,
dcomplex_t* a, const int* lda, double* w,
dcomplex_t* work, const int* lwork, double* rwork, const int* lrwork,
int* iwork, const int* liwork, int* info);

/* selective eignvector computation */
void LAPACK_SSYEVX( const char* jobz, const char* range, const char* uplo, const int* n,
float* a, const int* lda, const float* vl, const float* vu, const int* il, const int* iu,
const float* abstol, int* m, float* w, float* z, const int* ldz,
float* work, const int* lwork,
int* iwork, int* ifail, int* info);

void LAPACK_DSYEVX( const char* jobz, const char* range, const char* uplo, const int* n,
double* a, const int* lda, const double* vl, const double* vu, const int* il, const int* iu,
const double* abstol, int* m, double* w, double* z, const int* ldz,
double* work, const int* lwork,
int* iwork, int* ifail, int* info);

void LAPACK_CHEEVX( const char* jobz, const char* range, const char* uplo, const int* n,
fcomplex_t* a, const int* lda, const float* vl, const float* vu, const int* il, const int* iu,
const float* abstol, int* m, float* w, fcomplex_t* z, const int* ldz,
fcomplex_t* work, const int* lwork, float* rwork,
int* iwork, int* ifail, int* info);

void LAPACK_ZHEEVX( const char* jobz, const char* range, const char* uplo, const int* n,
dcomplex_t* a, const int* lda, const double* vl, const double* vu, const int* il, const int* iu,
const double* abstol, int* m, double* w, dcomplex_t* z, const int* ldz,
dcomplex_t* work, const int* lwork, double* rwork,
int* iwork, int* ifail, int* info);

void LAPACK_CTREVC( const char* side, const char* howmny, const logical_t* select, const int *n,
fcomplex_t* t, const int * ldt, fcomplex_t* vl, const int* ldvl,
fcomplex_t* vr, const int * ldvr, const int * nm, int* m, fcomplex_t* work,
Expand Down Expand Up @@ -409,22 +454,21 @@ extern "C" {

/* Hessenberg matrices */

void LAPACK_SHSEQR( const char* job, const char* compz, const int* n,
const int* ilo, const int* ihi, float* H,
const int* ldH, float* wr, float* wi, fcomplex_t* Z,
const int* ldz, float* work, const int* lwork, int* info);
void LAPACK_DHSEQR( const char* job, const char* compz, const int* n,
const int* ilo, const int* ihi, double* H,
const int* ldH, double* wr, double* wi, dcomplex_t* Z,
const int* ldz, double* work, const int* lwork, int* info);
void LAPACK_CHSEQR( const char* job, const char* compz, const int* n,
const int* ilo, const int* ihi, fcomplex_t* H, const int* ldH,
fcomplex_t* w, fcomplex_t* Z, const int* ldz,
fcomplex_t* work, const int* lwork, int* info);
void LAPACK_ZHSEQR( const char* job, const char* compz, const int* n,
const int* ilo, const int* ihi, dcomplex_t* H, const int* ldH,
dcomplex_t* w, dcomplex_t* Z, const int* ldz,
dcomplex_t* work, const int* lwork, int* info);
void LAPACK_SHSEQR( const char* JOB, const char* COMPZ, const int* N, const int* ILO, const int* IHI, float* H,
const int* LDH, float* WR, float* WI, float* Z, int const* LDZ,
float* WORK, const int* LWORK, int* INFO ) ;

void LAPACK_CHSEQR( const char* JOB, const char* COMPZ, const int* N, const int* ILO, const int* IHI, fcomplex_t* H,
const int* LDH, fcomplex_t* W, fcomplex_t* Z, int const* LDZ,
fcomplex_t* WORK, const int* LWORK, int* INFO ) ;

void LAPACK_DHSEQR( const char* JOB, const char* COMPZ, const int* N, const int* ILO, const int* IHI, double* H,
const int* LDH, double* WR, double* WI, double* Z, int const* LDZ,
double* WORK, const int* LWORK, int* INFO ) ;

void LAPACK_ZHSEQR( const char* JOB, const char* COMPZ, const int* N, const int* ILO, const int* IHI, dcomplex_t* H,
const int* LDH, dcomplex_t* W, dcomplex_t* Z, int const* LDZ,
dcomplex_t* WORK, const int* LWORK, int* INFO ) ;

/* Hermitian tridiagonal matrices */

Expand All @@ -451,51 +495,6 @@ extern "C" {
dcomplex_t* z, int const* ldz, dcomplex_t* work,
double* rwork, int* info );

/* divide and conqer drivers for eigenvalue problems */
void LAPACK_SSYEVD( const char* jobz, const char* uplo, const int* n,
float* a, const int* lda, float* w,
float* work, const int* lwork,
int* iwork, const int* liwork, int* info);

void LAPACK_DSYEVD( const char* jobz, const char* uplo, const int* n,
double* a, const int* lda, double* w,
double* work, const int* lwork,
int* iwork, const int* liwork, int* info);

void LAPACK_CHEEVD( const char* jobz, const char* uplo, const int* n,
fcomplex_t* a, const int* lda, float* w,
fcomplex_t* work, const int* lwork, float* rwork, const int* lrwork,
int* iwork, const int* liwork, int* info);

void LAPACK_ZHEEVD( const char* jobz, const char* uplo, const int* n,
dcomplex_t* a, const int* lda, double* w,
dcomplex_t* work, const int* lwork, double* rwork, const int* lrwork,
int* iwork, const int* liwork, int* info);

/* selective eignvector computation */
void LAPACK_SSYEVX( const char* jobz, const char* range, const char* uplo, const int* n,
float* a, const int* lda, const float* vl, const float* vu, const int* il, const int* iu,
const float* abstol, int* m, float* w, float* z, const int* ldz,
float* work, const int* lwork,
int* iwork, int* ifail, int* info);

void LAPACK_DSYEVX( const char* jobz, const char* range, const char* uplo, const int* n,
double* a, const int* lda, const double* vl, const double* vu, const int* il, const int* iu,
const double* abstol, int* m, double* w, double* z, const int* ldz,
double* work, const int* lwork,
int* iwork, int* ifail, int* info);

void LAPACK_CHEEVX( const char* jobz, const char* range, const char* uplo, const int* n,
fcomplex_t* a, const int* lda, const float* vl, const float* vu, const int* il, const int* iu,
const float* abstol, int* m, float* w, fcomplex_t* z, const int* ldz,
fcomplex_t* work, const int* lwork, float* rwork,
int* iwork, int* ifail, int* info);

void LAPACK_ZHEEVX( const char* jobz, const char* range, const char* uplo, const int* n,
dcomplex_t* a, const int* lda, const double* vl, const double* vu, const int* il, const int* iu,
const double* abstol, int* m, double* w, dcomplex_t* z, const int* ldz,
dcomplex_t* work, const int* lwork, double* rwork,
int* iwork, int* ifail, int* info);

void LAPACK_SSBEVX( char const* jobz, char const* range, char const* uplo, int const* n,
int const* kd, float* ab, int const* ldab, float* q, int const* ldq,
Expand Down
46 changes: 24 additions & 22 deletions boost/numeric/bindings/lapack/lapack_names.h
View file
Expand Up @@ -175,16 +175,6 @@
#define LAPACK_CHEEV FORTRAN_ID( cheev )
#define LAPACK_ZHEEV FORTRAN_ID( zheev )

#define LAPACK_STREVC FORTRAN_ID( strevc )
#define LAPACK_DTREVC FORTRAN_ID( dtrevc )
#define LAPACK_CTREVC FORTRAN_ID( ctrevc )
#define LAPACK_ZTREVC FORTRAN_ID( ztrevc )

#define LAPACK_STREXC FORTRAN_ID( strexc )
#define LAPACK_DTREXC FORTRAN_ID( dtrexc )
#define LAPACK_CTREXC FORTRAN_ID( ctrexc )
#define LAPACK_ZTREXC FORTRAN_ID( ztrexc )

// generalized eigenvalue/eigenvector
#define LAPACK_SSYGV FORTRAN_ID( ssygv )
#define LAPACK_DSYGV FORTRAN_ID( dsygv )
Expand All @@ -199,10 +189,15 @@
#define LAPACK_CHEEVX FORTRAN_ID( cheevx )
#define LAPACK_ZHEEVX FORTRAN_ID( zheevx )

#define LAPACK_SSBEVX FORTRAN_ID( ssbevx )
#define LAPACK_DSBEVX FORTRAN_ID( dsbevx )
#define LAPACK_CHBEVX FORTRAN_ID( chbevx )
#define LAPACK_ZHBEVX FORTRAN_ID( zhbevx )
#define LAPACK_STREVC FORTRAN_ID( strevc )
#define LAPACK_DTREVC FORTRAN_ID( dtrevc )
#define LAPACK_CTREVC FORTRAN_ID( ctrevc )
#define LAPACK_ZTREVC FORTRAN_ID( ztrevc )

#define LAPACK_STREXC FORTRAN_ID( strexc )
#define LAPACK_DTREXC FORTRAN_ID( dtrexc )
#define LAPACK_CTREXC FORTRAN_ID( ctrexc )
#define LAPACK_ZTREXC FORTRAN_ID( ztrexc )

/********************************************/
/* eigenproblems for Hessenberg matrices */
Expand All @@ -220,13 +215,24 @@
#define LAPACK_CHBEV FORTRAN_ID( chbev )
#define LAPACK_ZHBEV FORTRAN_ID( zhbev )

#define LAPACK_SSBEVX FORTRAN_ID( ssbevx )
#define LAPACK_DSBEVX FORTRAN_ID( dsbevx )
#define LAPACK_CHBEVX FORTRAN_ID( chbevx )
#define LAPACK_ZHBEVX FORTRAN_ID( zhbevx )

/********************************************/
/* eigenproblems for tridiagonal matrices */

#define LAPACK_SSTEQR FORTRAN_ID( ssteqr )
#define LAPACK_DSTEQR FORTRAN_ID( dsteqr )

/********************************************/
/* generalized eigenvalue/eigenvector */

#define LAPACK_SSYGV FORTRAN_ID( ssygv )
#define LAPACK_DSYGV FORTRAN_ID( dsygv )
#define LAPACK_CHEGV FORTRAN_ID( chegv )
#define LAPACK_ZHEGV FORTRAN_ID( zhegv )

/********************************************/
/* QR factorization */
Expand All @@ -243,17 +249,13 @@
#define LAPACK_CUNMQR FORTRAN_ID( cunmqr )
#define LAPACK_ZUNMQR FORTRAN_ID( zunmqr )

#define LAPACK_SSYTRD FORTRAN_ID( ssytrd )
#define LAPACK_DSYTRD FORTRAN_ID( dsytrd )

// generates an M-by-N real matrix Q with orthonormal columns,
// which is defined as the first N columns of a product of K elementary
// reflectors of order M
// Q = H(1) H(2) . . . H(k)

#define LAPACK_SORGQR FORTRAN_ID( sorgqr )
#define LAPACK_DORGQR FORTRAN_ID( dorgqr )
#define LAPACK_CUNGQR FORTRAN_ID( cungqr )
#define LAPACK_ZUNGQR FORTRAN_ID( zungqr )

#define LAPACK_SSYTRD FORTRAN_ID( ssytrd )
#define LAPACK_DSYTRD FORTRAN_ID( dsytrd )


/********************************************/
Expand Down

0 comments on commit 349ab24

Please sign in to comment.