diff options
| author | Franz Zotter <fzotter@users.sourceforge.net> | 2009-01-15 11:13:32 +0000 |
|---|---|---|
| committer | Franz Zotter <fzotter@users.sourceforge.net> | 2009-01-15 11:13:32 +0000 |
| commit | 5af5a54db6b83c77a521d7602f454efb9d723bdc (patch) | |
| tree | 884185b78a70b29448ea3646f136aa4827658179 /src | |
| parent | 7e7712287e2206e1b70c58c1d3a5fba41bd9731f (diff) | |
corrected the dependency of [mtx_eig] on recent gsl versions
svn path=/trunk/externals/iem/iemmatrix/; revision=10557
Diffstat (limited to 'src')
| -rw-r--r-- | src/configure.ac | 1 | ||||
| -rw-r--r-- | src/mtx_eig.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/configure.ac b/src/configure.ac index 7128c61..9382701 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -76,6 +76,7 @@ dnl for gnu scientific library -lgsl: dnl AC_CHECK_LIB([m], [cos]) AC_CHECK_LIB([gslcblas], [cblas_dgemm]) AC_CHECK_LIB([gsl], [gsl_blas_dgemm]) +AC_CHECK_FUNCS([gsl], [gsl_eigen_nonsymm], ) if test "x$with_pd" != "x"; then diff --git a/src/mtx_eig.c b/src/mtx_eig.c index 04dc068..5878078 100644 --- a/src/mtx_eig.c +++ b/src/mtx_eig.c @@ -26,7 +26,7 @@ typedef struct _MTXEig_ MTXEig; struct _MTXEig_ { t_object x_obj; -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL_EIGEN_NONSYMM gsl_matrix *a; gsl_matrix_complex *q; gsl_vector_complex *l; @@ -45,7 +45,7 @@ struct _MTXEig_ enum WithEigenVectors withevs; }; -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL_EIGEN_NONSYMM static void allocMTXqlw (MTXEig *x) { x->a=(gsl_matrix*)gsl_matrix_alloc(x->size,x->size); @@ -103,7 +103,7 @@ static void deleteMTXqlw (MTXEig *x) static void deleteMTXEig (MTXEig *x) { -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL_EIGEN_NONSYMM deleteMTXqlw(x); #endif } @@ -124,7 +124,7 @@ static void *newMTXEig (t_symbol *s, int argc, t_atom *argv) x->list_l_im = 0; x->list_q_re = 0; x->list_q_im = 0; -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL_EIGEN_NONSYMM x->a=0; x->q=0; x->l=0; @@ -159,7 +159,7 @@ static void mTXEigMatrix (MTXEig *x, t_symbol *s, int n,m; float f; -#ifdef HAVE_LIBGSL +#ifdef HAVE_LIBGSL_EIGEN_NONSYMM gsl_complex c; /* size check */ if (!size) @@ -205,7 +205,7 @@ static void mTXEigMatrix (MTXEig *x, t_symbol *s, mTXEigBang(x); } #else - post("mtx_eig: implementation requires gsl"); + post("mtx_eig: implementation requires more recent gsl version to handle nonsymmetric matrices"); #endif } |