Mercurial > hg > octave-max
changeset 7477:8b22207ef9ca
ilaenv --> xilaenv
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 12 Feb 2008 21:13:21 -0500 |
| parents | e9f10b4c05cf |
| children | d7c5b101bb0f |
| files | libcruft/ChangeLog libcruft/lapack-xtra/xilaenv.f liboctave/CMatrix.cc liboctave/ChangeLog liboctave/dMatrix.cc |
| diffstat | 5 files changed, 40 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libcruft/ChangeLog +++ b/libcruft/ChangeLog @@ -1,3 +1,7 @@ +2008-02-12 John W. Eaton <jwe@octave.org> + + * lapack-xtra/xilaenv.f: New wrapper for Fortran function ilaenv. + 2008-02-06 John W. Eaton <jwe@octave.org> * Makerules.in (%.def : %.f): Use mv instead of move-if-change.
new file mode 100644 --- /dev/null +++ b/libcruft/lapack-xtra/xilaenv.f @@ -0,0 +1,6 @@ + subroutine xilaenv (ispec, name, opts, n1, n2, n3, n4, retval) + character*(*) name, opts + integer ilaenv, ispec, n1, n2, n3, n4, retval + retval = ilaenv (ispec, name, opts, n1, n2, n3, n4) + return + end
--- a/liboctave/CMatrix.cc +++ b/liboctave/CMatrix.cc @@ -63,12 +63,13 @@ extern "C" { - octave_idx_type - F77_FUNC (ilaenv, ILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL, - F77_CONST_CHAR_ARG_DECL, - const octave_idx_type&, const octave_idx_type&, - const octave_idx_type&, const octave_idx_type& - F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); + F77_RET_T + F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL, + F77_CONST_CHAR_ARG_DECL, + const octave_idx_type&, const octave_idx_type&, + const octave_idx_type&, const octave_idx_type& + F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL, + octave_idx_type&); F77_RET_T F77_FUNC (zgebal, ZGEBAL) (F77_CONST_CHAR_ARG_DECL, @@ -2499,12 +2500,12 @@ Array<Complex> work (1); - const octave_idx_type smlsiz - = F77_FUNC (ilaenv, ILAENV) (9, F77_CONST_CHAR_ARG2 ("ZGELSD", 6), - F77_CONST_CHAR_ARG2 (" ", 1), - 0, 0, 0, 0 - F77_CHAR_ARG_LEN (6) - F77_CHAR_ARG_LEN (1)); + octave_idx_type smlsiz; + F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("ZGELSD", 6), + F77_CONST_CHAR_ARG2 (" ", 1), + 0, 0, 0, 0 + F77_CHAR_ARG_LEN (6) + F77_CHAR_ARG_LEN (1), smlsiz); // We compute the size of rwork and iwork because ZGELSD in // older versions of LAPACK does not return them on a query
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2008-02-12 John W. Eaton <jwe@octave.org> + + * CMatrix.cc: Declare xilaenv instead of ilaenv. + (ComplexMatrix::lssolve): Call xilaenv instead of ilaenv. + 2008-02-12 Jason Riedy <ejr@cs.berkeley.edu> * dMatrix.cc (ILAENV): Declare LAPACK Fortran function.
--- a/liboctave/dMatrix.cc +++ b/liboctave/dMatrix.cc @@ -60,11 +60,12 @@ extern "C" { octave_idx_type - F77_FUNC (ilaenv, ILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL, - F77_CONST_CHAR_ARG_DECL, - const octave_idx_type&, const octave_idx_type&, - const octave_idx_type&, const octave_idx_type& - F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL); + F77_FUNC (xilaenv, XILAENV) (const octave_idx_type&, F77_CONST_CHAR_ARG_DECL, + F77_CONST_CHAR_ARG_DECL, + const octave_idx_type&, const octave_idx_type&, + const octave_idx_type&, const octave_idx_type& + F77_CHAR_ARG_LEN_DECL F77_CHAR_ARG_LEN_DECL, + octave_idx_type&); F77_RET_T F77_FUNC (dgebal, DGEBAL) (F77_CONST_CHAR_ARG_DECL, @@ -2110,12 +2111,12 @@ Array<double> work (1); - const octave_idx_type smlsiz - = F77_FUNC (ilaenv, ILAENV) (9, F77_CONST_CHAR_ARG2 ("DGELSD", 6), - F77_CONST_CHAR_ARG2 (" ", 1), - 0, 0, 0, 0 - F77_CHAR_ARG_LEN (6) - F77_CHAR_ARG_LEN (1)); + octave_idx_type smlsiz; + F77_FUNC (xilaenv, XILAENV) (9, F77_CONST_CHAR_ARG2 ("DGELSD", 6), + F77_CONST_CHAR_ARG2 (" ", 1), + 0, 0, 0, 0 + F77_CHAR_ARG_LEN (6) + F77_CHAR_ARG_LEN (1), smlsiz); // We compute the size of iwork because DGELSD in older versions // of LAPACK does not return it on a query call.