Mercurial > hg > octave-nkf
annotate libinterp/corefcn/dot.cc @ 18099:6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
* libinterp/corefcn/balance.cc, libinterp/corefcn/bsxfun.cc,
libinterp/corefcn/cellfun.cc, libinterp/corefcn/data.cc,
libinterp/corefcn/dlmread.cc, libinterp/corefcn/dot.cc,
libinterp/corefcn/eig.cc, libinterp/corefcn/find.cc, libinterp/corefcn/gcd.cc,
libinterp/corefcn/gl-render.cc, libinterp/corefcn/gl2ps-renderer.cc,
libinterp/corefcn/graphics.cc, libinterp/corefcn/kron.cc,
libinterp/corefcn/load-save.cc, libinterp/corefcn/lookup.cc,
libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/ls-mat5.cc,
libinterp/corefcn/lu.cc, libinterp/corefcn/max.cc,
libinterp/corefcn/oct-map.cc, libinterp/corefcn/oct-obj.cc,
libinterp/corefcn/oct-stream.cc, libinterp/corefcn/sparse.cc,
libinterp/corefcn/sqrtm.cc, libinterp/corefcn/str2double.cc,
libinterp/corefcn/strfind.cc, libinterp/corefcn/strfns.cc,
libinterp/corefcn/tril.cc, libinterp/corefcn/txt-eng-ft.cc,
libinterp/corefcn/variables.cc, libinterp/corefcn/xdiv.cc,
libinterp/dldfcn/__delaunayn__.cc, libinterp/dldfcn/qr.cc,
libinterp/dldfcn/symrcm.cc, libinterp/dldfcn/tsearch.cc,
libinterp/octave-value/ov-base-diag.cc, libinterp/octave-value/ov-base-int.cc,
libinterp/octave-value/ov-base-mat.cc, libinterp/octave-value/ov-bool-mat.cc,
libinterp/octave-value/ov-bool-sparse.cc, libinterp/octave-value/ov-bool.cc,
libinterp/octave-value/ov-cell.cc, libinterp/octave-value/ov-class.cc,
libinterp/octave-value/ov-complex.cc, libinterp/octave-value/ov-cx-diag.cc,
libinterp/octave-value/ov-cx-mat.cc, libinterp/octave-value/ov-cx-sparse.cc,
libinterp/octave-value/ov-fcn-handle.cc,
libinterp/octave-value/ov-fcn-inline.cc, libinterp/octave-value/ov-float.cc,
libinterp/octave-value/ov-flt-complex.cc,
libinterp/octave-value/ov-flt-cx-diag.cc,
libinterp/octave-value/ov-flt-cx-mat.cc,
libinterp/octave-value/ov-flt-re-diag.cc,
libinterp/octave-value/ov-flt-re-mat.cc, libinterp/octave-value/ov-java.cc,
libinterp/octave-value/ov-range.cc, libinterp/octave-value/ov-re-diag.cc,
libinterp/octave-value/ov-re-mat.cc, libinterp/octave-value/ov-re-sparse.cc,
libinterp/octave-value/ov-scalar.cc, libinterp/octave-value/ov-str-mat.cc,
libinterp/octave-value/ov-usr-fcn.cc, libinterp/parse-tree/pt-cbinop.cc,
libinterp/parse-tree/pt-eval.cc, libinterp/parse-tree/pt-mat.cc:
Follow coding convention of defining and initializing only 1 variable per line
in liboctinterp.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 05 Dec 2013 10:50:17 -0800 |
parents | 175b392e91fe |
children | 78fac67300e8 |
rev | line source |
---|---|
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
1 /* |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
2 |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
15239
diff
changeset
|
3 Copyright (C) 2009-2013 VZLU Prague |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
4 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
5 This file is part of Octave. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
6 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
7 Octave is free software; you can redistribute it and/or modify it |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
8 under the terms of the GNU General Public License as published by the |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
9 Free Software Foundation; either version 3 of the License, or (at your |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
10 option) any later version. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
11 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
12 Octave is distributed in the hope that it will be useful, but WITHOUT |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
15 for more details. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
16 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
18 along with Octave; see the file COPYING. If not, see |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
19 <http://www.gnu.org/licenses/>. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
20 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
21 */ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
22 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
23 #ifdef HAVE_CONFIG_H |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
24 #include <config.h> |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
25 #endif |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
26 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
27 #include "f77-fcn.h" |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
28 #include "mx-base.h" |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
29 #include "error.h" |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
30 #include "defun.h" |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
31 #include "parse.h" |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
32 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
33 extern "C" |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
34 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
35 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
36 F77_FUNC (ddot3, DDOT3) (const octave_idx_type&, const octave_idx_type&, |
11518 | 37 const octave_idx_type&, const double*, |
38 const double*, double*); | |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
39 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
40 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
41 F77_FUNC (sdot3, SDOT3) (const octave_idx_type&, const octave_idx_type&, |
11518 | 42 const octave_idx_type&, const float*, |
43 const float*, float*); | |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
44 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
45 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
46 F77_FUNC (zdotc3, ZDOTC3) (const octave_idx_type&, const octave_idx_type&, |
11518 | 47 const octave_idx_type&, const Complex*, |
48 const Complex*, Complex*); | |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
49 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
50 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
51 F77_FUNC (cdotc3, CDOTC3) (const octave_idx_type&, const octave_idx_type&, |
11518 | 52 const octave_idx_type&, const FloatComplex*, |
53 const FloatComplex*, FloatComplex*); | |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
54 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
55 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
56 F77_FUNC (dmatm3, DMATM3) (const octave_idx_type&, const octave_idx_type&, |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
57 const octave_idx_type&, const octave_idx_type&, |
11518 | 58 const double*, const double*, double*); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
59 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
60 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
61 F77_FUNC (smatm3, SMATM3) (const octave_idx_type&, const octave_idx_type&, |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
62 const octave_idx_type&, const octave_idx_type&, |
11518 | 63 const float*, const float*, float*); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
64 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
65 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
66 F77_FUNC (zmatm3, ZMATM3) (const octave_idx_type&, const octave_idx_type&, |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
67 const octave_idx_type&, const octave_idx_type&, |
11518 | 68 const Complex*, const Complex*, Complex*); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
69 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
70 F77_RET_T |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
71 F77_FUNC (cmatm3, CMATM3) (const octave_idx_type&, const octave_idx_type&, |
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
72 const octave_idx_type&, const octave_idx_type&, |
11518 | 73 const FloatComplex*, const FloatComplex*, |
74 FloatComplex*); | |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
75 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
76 |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
77 static void |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
78 get_red_dims (const dim_vector& x, const dim_vector& y, int dim, |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
79 dim_vector& z, octave_idx_type& m, octave_idx_type& n, |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
80 octave_idx_type& k) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
81 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
82 int nd = x.length (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
83 assert (nd == y.length ()); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
84 z = dim_vector::alloc (nd); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
85 m = 1, n = 1, k = 1; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
86 for (int i = 0; i < nd; i++) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
87 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
88 if (i < dim) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
89 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
90 z(i) = x(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
91 m *= x(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
92 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
93 else if (i > dim) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
94 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
95 z(i) = x(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
96 n *= x(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
97 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
98 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
99 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
100 k = x(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
101 z(i) = 1; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
102 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
103 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
104 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
105 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
106 DEFUN (dot, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
107 "-*- texinfo -*-\n\ |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
108 @deftypefn {Built-in Function} {} dot (@var{x}, @var{y}, @var{dim})\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
109 Compute the dot product of two vectors. If @var{x} and @var{y}\n\ |
12642
f96b9b9f141b
doc: Periodic grammarcheck and spellcheck of documentation.
Rik <octave@nomad.inbox5.com>
parents:
12572
diff
changeset
|
110 are matrices, calculate the dot products along the first\n\ |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
111 non-singleton dimension. If the optional argument @var{dim} is\n\ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
112 given, calculate the dot products along this dimension.\n\ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
113 \n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
114 This is equivalent to\n\ |
10846
a4f482e66b65
Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents:
10840
diff
changeset
|
115 @code{sum (conj (@var{X}) .* @var{Y}, @var{dim})},\n\ |
a4f482e66b65
Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents:
10840
diff
changeset
|
116 but avoids forming a temporary array and is faster. When @var{X} and\n\ |
a4f482e66b65
Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents:
10840
diff
changeset
|
117 @var{Y} are column vectors, the result is equivalent to\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
118 @code{@var{X}' * @var{Y}}.\n\ |
12520
ad05e1547398
Add function chop to documentation.
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
119 @seealso{cross, divergence}\n\ |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
120 @end deftypefn") |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
121 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
122 octave_value retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
123 int nargin = args.length (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
124 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
125 if (nargin < 2 || nargin > 3) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
126 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
127 print_usage (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
128 return retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
129 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
130 |
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
131 octave_value argx = args(0); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
132 octave_value argy = args(1); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
133 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
134 if (argx.is_numeric_type () && argy.is_numeric_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
135 { |
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
136 dim_vector dimx = argx.dims (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
137 dim_vector dimy = argy.dims (); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
138 bool match = dimx == dimy; |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11553
diff
changeset
|
139 if (! match && nargin == 2 |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
140 && dimx.is_vector () && dimy.is_vector ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
141 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
142 // Change to column vectors. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
143 dimx = dimx.redim (1); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
144 argx = argx.reshape (dimx); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
145 dimy = dimy.redim (1); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
146 argy = argy.reshape (dimy); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
147 match = ! error_state; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
148 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
149 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
150 if (match) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
151 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
152 int dim; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
153 if (nargin == 2) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
154 dim = dimx.first_non_singleton (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
155 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
156 dim = args(2).int_value (true) - 1; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
157 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
158 if (error_state) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
159 ; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
160 else if (dim < 0) |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
161 error ("dot: DIM must be a valid dimension"); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
162 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
163 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
164 octave_idx_type m, n, k; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
165 dim_vector dimz; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
166 if (argx.is_complex_type () || argy.is_complex_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
167 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
168 if (argx.is_single_type () || argy.is_single_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
169 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
170 FloatComplexNDArray x = argx.float_complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
171 FloatComplexNDArray y = argy.float_complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
172 get_red_dims (dimx, dimy, dim, dimz, m, n, k); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
173 FloatComplexNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
174 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
175 F77_XFCN (cdotc3, CDOTC3, (m, n, k, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
176 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
177 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
178 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
179 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
180 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
181 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
182 ComplexNDArray x = argx.complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
183 ComplexNDArray y = argy.complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
184 get_red_dims (dimx, dimy, dim, dimz, m, n, k); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
185 ComplexNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
186 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
187 F77_XFCN (zdotc3, ZDOTC3, (m, n, k, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
188 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
189 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
190 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
191 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
192 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
193 else if (argx.is_float_type () && argy.is_float_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
194 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
195 if (argx.is_single_type () || argy.is_single_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
196 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
197 FloatNDArray x = argx.float_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
198 FloatNDArray y = argy.float_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
199 get_red_dims (dimx, dimy, dim, dimz, m, n, k); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
200 FloatNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
201 if (! error_state) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
202 F77_XFCN (sdot3, SDOT3, (m, n, k, x.data (), y.data (), |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
203 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
204 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
205 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
206 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
207 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
208 NDArray x = argx.array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
209 NDArray y = argy.array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
210 get_red_dims (dimx, dimy, dim, dimz, m, n, k); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
211 NDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
212 if (! error_state) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
213 F77_XFCN (ddot3, DDOT3, (m, n, k, x.data (), y.data (), |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
214 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
215 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
216 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
217 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
218 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
219 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
220 // Non-optimized evaluation. |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
221 octave_value_list tmp; |
15239
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
222 tmp(1) = dim + 1; |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
223 tmp(0) = do_binary_op (octave_value::op_el_mul, argx, argy); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
224 if (! error_state) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
225 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
226 tmp = feval ("sum", tmp, 1); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
227 if (! tmp.empty ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
228 retval = tmp(0); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
229 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
230 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
231 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
232 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
233 else |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
234 error ("dot: sizes of X and Y must match"); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
235 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
236 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
237 else |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
238 error ("dot: X and Y must be numeric"); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
239 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
240 return retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
241 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
242 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
243 /* |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
244 %!assert (dot ([1, 2], [2, 3]), 8) |
12788
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
245 |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
246 %!test |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
247 %! x = [2, 1; 2, 1]; |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
248 %! y = [-0.5, 2; 0.5, -2]; |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
249 %! assert (dot (x, y), [0 0]); |
12788
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
250 |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
251 %!test |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
252 %! x = [1+i, 3-i; 1-i, 3-i]; |
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
253 %! assert (dot (x, x), [4, 20]); |
15239
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
254 |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
255 %!test |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
256 %! x = int8 ([1 2]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
257 %! y = int8 ([2 3]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
258 %! assert (dot (x, y), 8); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
259 |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
260 %!test |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
261 %! x = int8 ([1 2; 3 4]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
262 %! y = int8 ([5 6; 7 8]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
263 %! assert (dot (x, y), [26 44]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
264 %! assert (dot (x, y, 2), [17; 53]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
265 %! assert (dot (x, y, 3), [5 12; 21 32]); |
a38d5ed5b3d8
dot.cc: Segfault with integers (bug #37199)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
266 |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
267 */ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
268 |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
269 DEFUN (blkmm, args, , |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
270 "-*- texinfo -*-\n\ |
15039
e753177cde93
maint: Move non-dynamically linked functions from DLD-FUNCTIONS/ to corefcn/ directory
Rik <rik@octave.org>
parents:
14501
diff
changeset
|
271 @deftypefn {Built-in Function} {} blkmm (@var{A}, @var{B})\n\ |
11553
01f703952eff
Improve docstrings for functions in DLD-FUNCTIONS directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
272 Compute products of matrix blocks. The blocks are given as\n\ |
12572
dffd30f12752
Add blkmm function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12520
diff
changeset
|
273 2-dimensional subarrays of the arrays @var{A}, @var{B}.\n\ |
dffd30f12752
Add blkmm function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12520
diff
changeset
|
274 The size of @var{A} must have the form @code{[m,k,@dots{}]} and\n\ |
dffd30f12752
Add blkmm function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12520
diff
changeset
|
275 size of @var{B} must be @code{[k,n,@dots{}]}. The result is\n\ |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
276 then of size @code{[m,n,@dots{}]} and is computed as follows:\n\ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
277 \n\ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
278 @example\n\ |
10711
fbd7843974fa
Periodic grammar check of documentation files to ensure common format.
Rik <octave@nomad.inbox5.com>
parents:
10155
diff
changeset
|
279 @group\n\ |
14360
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
280 for i = 1:prod (size (@var{A})(3:end))\n\ |
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
281 @var{C}(:,:,i) = @var{A}(:,:,i) * @var{B}(:,:,i)\n\ |
97883071e8e4
doc: Correct off-by-1 spacings in all .cc docstrings
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
282 endfor\n\ |
10711
fbd7843974fa
Periodic grammar check of documentation files to ensure common format.
Rik <octave@nomad.inbox5.com>
parents:
10155
diff
changeset
|
283 @end group\n\ |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
284 @end example\n\ |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
285 @end deftypefn") |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
286 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
287 octave_value retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
288 int nargin = args.length (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
289 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
290 if (nargin != 2) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
291 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
292 print_usage (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
293 return retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
294 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
295 |
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
296 octave_value argx = args(0); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
297 octave_value argy = args(1); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
298 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
299 if (argx.is_numeric_type () && argy.is_numeric_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
300 { |
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
301 const dim_vector dimx = argx.dims (); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
302 const dim_vector dimy = argy.dims (); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
303 int nd = dimx.length (); |
18099
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
304 octave_idx_type m = dimx(0); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
305 octave_idx_type k = dimx(1); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
306 octave_idx_type n = dimy(1); |
6a71e5030df5
Follow coding convention of defining and initializing only 1 variable per line in liboctinterp.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
307 octave_idx_type np = 1; |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
308 bool match = dimy(0) == k && nd == dimy.length (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
309 dim_vector dimz = dim_vector::alloc (nd); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
310 dimz(0) = m; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
311 dimz(1) = n; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
312 for (int i = 2; match && i < nd; i++) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
313 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
314 match = match && dimx(i) == dimy(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
315 dimz(i) = dimx(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
316 np *= dimz(i); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
317 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
318 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
319 if (match) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
320 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
321 if (argx.is_complex_type () || argy.is_complex_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
322 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
323 if (argx.is_single_type () || argy.is_single_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
324 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
325 FloatComplexNDArray x = argx.float_complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
326 FloatComplexNDArray y = argy.float_complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
327 FloatComplexNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
328 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
329 F77_XFCN (cmatm3, CMATM3, (m, n, k, np, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
330 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
331 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
332 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
333 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
334 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
335 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
336 ComplexNDArray x = argx.complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
337 ComplexNDArray y = argy.complex_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
338 ComplexNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
339 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
340 F77_XFCN (zmatm3, ZMATM3, (m, n, k, np, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
341 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
342 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
343 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
344 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
345 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
346 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
347 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
348 if (argx.is_single_type () || argy.is_single_type ()) |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
349 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
350 FloatNDArray x = argx.float_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
351 FloatNDArray y = argy.float_array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
352 FloatNDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
353 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
354 F77_XFCN (smatm3, SMATM3, (m, n, k, np, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
355 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
356 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
357 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
358 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
359 else |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
360 { |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
361 NDArray x = argx.array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
362 NDArray y = argy.array_value (); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
363 NDArray z(dimz); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
364 if (! error_state) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
365 F77_XFCN (dmatm3, DMATM3, (m, n, k, np, |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
366 x.data (), y.data (), |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
367 z.fortran_vec ())); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
368 retval = z; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
369 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
370 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
371 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
372 else |
12572
dffd30f12752
Add blkmm function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12520
diff
changeset
|
373 error ("blkmm: A and B dimensions don't match: (%s) and (%s)", |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
374 dimx.str ().c_str (), dimy.str ().c_str ()); |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
375 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
376 } |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
377 else |
12572
dffd30f12752
Add blkmm function to documentation.
Rik <octave@nomad.inbox5.com>
parents:
12520
diff
changeset
|
378 error ("blkmm: A and B must be numeric"); |
9874
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
379 |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
380 return retval; |
90bc0cc4518f
implement compiled dot and blkmm
Jaroslav Hajek <highegg@gmail.com>
parents:
diff
changeset
|
381 } |
12788
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
382 |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
383 /* |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
384 %!test |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
385 %! x(:,:,1) = [1 2; 3 4]; |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
386 %! x(:,:,2) = [1 1; 1 1]; |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
387 %! z(:,:,1) = [7 10; 15 22]; |
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
388 %! z(:,:,2) = [2 2; 2 2]; |
14501
60e5cf354d80
Update %!tests in DLD-FUNCTIONS/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents:
14360
diff
changeset
|
389 %! assert (blkmm (x,x), z); |
12788
9f4b48b93f6d
codesprint: Write test for dot.cc
Jordi Gutiérrez Hermoso <jordigh@gmail.com>
parents:
12642
diff
changeset
|
390 */ |