Mercurial > octave-nkf
changeset 14398:e8bc9c02533a
maint: periodic merge of stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 23 Feb 2012 15:55:14 -0500 |
| parents | e41e538e9d03 (current diff) 670feb71afde (diff) |
| children | d931d9b458fc |
| files | configure.ac src/Makefile.am |
| diffstat | 11 files changed, 64 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Feb 23 12:25:23 2012 -0800 +++ b/configure.ac Thu Feb 23 15:55:14 2012 -0500 @@ -33,7 +33,7 @@ OCTAVE_VERSION="$PACKAGE_VERSION" OCTAVE_API_VERSION_NUMBER="48" OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" -OCTAVE_RELEASE_DATE="2012-02-07" +OCTAVE_RELEASE_DATE="2012-02-22" OCTAVE_COPYRIGHT="Copyright (C) 2012 John W. Eaton and others." AC_SUBST(OCTAVE_VERSION) AC_SUBST(OCTAVE_API_VERSION_NUMBER)
--- a/libcruft/Makefile.am Thu Feb 23 12:25:23 2012 -0800 +++ b/libcruft/Makefile.am Thu Feb 23 15:55:14 2012 -0500 @@ -20,7 +20,10 @@ include $(top_srcdir)/build-aux/common.mk -AM_CPPFLAGS = @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu +## Search local directories before those specified by the user. +AM_CPPFLAGS = \ + -I../libgnu -I$(top_srcdir)/libgnu \ + @CPPFLAGS@ AUTOMAKE_OPTIONS = subdir-objects
--- a/liboctave/CColVector.cc Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/CColVector.cc Thu Feb 23 15:55:14 2012 -0500 @@ -346,13 +346,19 @@ if (nr != 0) { - Complex *y = retval.fortran_vec (); + if (nc == 0) + retval.fill (0.0); + else + { + Complex *y = retval.fortran_vec (); - F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0, m.data (), nr, - a.data (), 1, 0.0, y, 1 - F77_CHAR_ARG_LEN (1))); + F77_XFCN (zgemv, ZGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), + nr, nc, 1.0, m.data (), nr, + a.data (), 1, 0.0, y, 1 + F77_CHAR_ARG_LEN (1))); + } } + } return retval;
--- a/liboctave/Makefile.am Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/Makefile.am Thu Feb 23 15:55:14 2012 -0500 @@ -20,9 +20,11 @@ include $(top_srcdir)/build-aux/common.mk +## Search local directories before those specified by the user. AM_CPPFLAGS = \ - @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \ - -I$(top_srcdir)/libcruft/misc + -I../libgnu -I$(top_srcdir)/libgnu \ + -I$(top_srcdir)/libcruft/misc \ + @CPPFLAGS@ EXTRA_DIST = \ config-ops.sh \
--- a/liboctave/config-ops.sh Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/config-ops.sh Thu Feb 23 15:55:14 2012 -0500 @@ -34,7 +34,7 @@ case "$src_type" in inc | all) VX_INC=$($AWK -f $mk_ops prefix=vx list_h_files=1 $liboctave_dir/vx-ops) - echo "VX_OP_INC = $(echo $VX_INC)" > $liboctave_dir/vx-op-inc.mk-t + echo "VX_OP_INC = $VX_INC" > $liboctave_dir/vx-op-inc.mk-t $move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk ;; esac @@ -46,7 +46,7 @@ case "$src_type" in src | all) VX_SRC=$($AWK -f $mk_ops prefix=vx list_cc_files=1 $liboctave_dir/vx-ops) - echo "VX_OP_SRC = $(echo $VX_SRC)" > $liboctave_dir/vx-op-src.mk-t + echo "VX_OP_SRC = $VX_SRC" > $liboctave_dir/vx-op-src.mk-t $move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk ;; esac @@ -58,7 +58,7 @@ case "$src_type" in inc | all) MX_INC=$($AWK -f $mk_ops prefix=mx list_h_files=1 $liboctave_dir/mx-ops) - echo "MX_OP_INC = $(echo $MX_INC)" > $liboctave_dir/mx-op-inc.mk-t + echo "MX_OP_INC = $MX_INC" > $liboctave_dir/mx-op-inc.mk-t $move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk ;; esac @@ -70,7 +70,7 @@ case "$src_type" in src | all) MX_SRC=$($AWK -f $mk_ops prefix=mx list_cc_files=1 $liboctave_dir/mx-ops) - echo "MX_OP_SRC = $(echo $MX_SRC)" > $liboctave_dir/mx-op-src.mk-t + echo "MX_OP_SRC = $MX_SRC" > $liboctave_dir/mx-op-src.mk-t $move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk ;; esac @@ -82,7 +82,7 @@ case "$src_type" in inc | all) SMX_INC=$($AWK -f $sparse_mk_ops prefix=smx list_h_files=1 $liboctave_dir/sparse-mx-ops) - echo "SMX_OP_INC = $(echo $SMX_INC)" > $liboctave_dir/smx-op-inc.mk-t + echo "SMX_OP_INC = $SMX_INC" > $liboctave_dir/smx-op-inc.mk-t $move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk ;; esac @@ -94,7 +94,7 @@ case "$src_type" in src | all) SMX_SRC=$($AWK -f $sparse_mk_ops prefix=smx list_cc_files=1 $liboctave_dir/sparse-mx-ops) - echo "SMX_OP_SRC = $(echo $SMX_SRC)" > $liboctave_dir/smx-op-src.mk-t + echo "SMX_OP_SRC = $SMX_SRC" > $liboctave_dir/smx-op-src.mk-t $move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk ;; esac
--- a/liboctave/dColVector.cc Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/dColVector.cc Thu Feb 23 15:55:14 2012 -0500 @@ -212,12 +212,17 @@ if (nr != 0) { - double *y = retval.fortran_vec (); + if (nc == 0) + retval.fill (0.0); + else + { + double *y = retval.fortran_vec (); - F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0, m.data (), nr, - a.data (), 1, 0.0, y, 1 - F77_CHAR_ARG_LEN (1))); + F77_XFCN (dgemv, DGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), + nr, nc, 1.0, m.data (), nr, + a.data (), 1, 0.0, y, 1 + F77_CHAR_ARG_LEN (1))); + } } }
--- a/liboctave/fCColVector.cc Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/fCColVector.cc Thu Feb 23 15:55:14 2012 -0500 @@ -346,12 +346,17 @@ if (nr != 0) { - FloatComplex *y = retval.fortran_vec (); + if (nc == 0) + retval.fill (0.0); + else + { + FloatComplex *y = retval.fortran_vec (); - F77_XFCN (cgemv, CGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0f, m.data (), nr, - a.data (), 1, 0.0f, y, 1 - F77_CHAR_ARG_LEN (1))); + F77_XFCN (cgemv, CGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), + nr, nc, 1.0f, m.data (), nr, + a.data (), 1, 0.0f, y, 1 + F77_CHAR_ARG_LEN (1))); + } } }
--- a/liboctave/fColVector.cc Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/fColVector.cc Thu Feb 23 15:55:14 2012 -0500 @@ -211,12 +211,17 @@ if (nr != 0) { - float *y = retval.fortran_vec (); + if (nc == 0) + retval.fill (0.0); + else + { + float *y = retval.fortran_vec (); - F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), - nr, nc, 1.0f, m.data (), nr, - a.data (), 1, 0.0f, y, 1 - F77_CHAR_ARG_LEN (1))); + F77_XFCN (sgemv, SGEMV, (F77_CONST_CHAR_ARG2 ("N", 1), + nr, nc, 1.0f, m.data (), nr, + a.data (), 1, 0.0f, y, 1 + F77_CHAR_ARG_LEN (1))); + } } }
--- a/liboctave/mk-ops.awk Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/mk-ops.awk Thu Feb 23 15:55:14 2012 -0500 @@ -93,13 +93,13 @@ if (list_cc_files) { - print cc_file; + printf (" %s", cc_file); next; } if (list_h_files) { - print h_file; + printf (" %s", h_file); next; }
--- a/liboctave/sparse-mk-ops.awk Thu Feb 23 12:25:23 2012 -0800 +++ b/liboctave/sparse-mk-ops.awk Thu Feb 23 15:55:14 2012 -0500 @@ -92,13 +92,13 @@ if (list_cc_files) { - print cc_file; + printf (" %s", cc_file); next; } if (list_h_files) { - print h_file; + printf (" %s", h_file); next; }
--- a/src/Makefile.am Thu Feb 23 12:25:23 2012 -0800 +++ b/src/Makefile.am Thu Feb 23 15:55:14 2012 -0500 @@ -20,11 +20,13 @@ include $(top_srcdir)/build-aux/common.mk +## Search local directories before those specified by the user. AM_CPPFLAGS = \ - @CPPFLAGS@ -I../libgnu -I$(top_srcdir)/libgnu \ + -I../libgnu -I$(top_srcdir)/libgnu \ -I$(top_srcdir)/libcruft/misc \ -I../liboctave -I$(top_srcdir)/liboctave \ - -I. -I$(srcdir) + -I. -I$(srcdir) \ + @CPPFLAGS@ AUTOMAKE_OPTIONS = subdir-objects