Mercurial > octave

annotate liboctave/numeric/oct-convn.cc @ 31605:e88a07dec498 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-vm-eval.cc, pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h : Use new macros to begin/end C++ namespaces.
author Rik <rik@octave.org>
date Thu, 01 Dec 2022 14:23:45 -0800
parents 796f54d4ddbf
children aac27ad79be6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 29950
diff changeset
3 // Copyright (C) 2010-2022 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21301
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21202
diff changeset
27 # include "config.h"
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
28 #endif
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
29
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
30 #include <algorithm>
10388
5af0b4bb384d rewrite convn optimizations based on xAXPY
Jaroslav Hajek <highegg@gmail.com>
parents: 10385
diff changeset
31
23475
d691ed308237 maint: Clean up #includes in liboctave/numeric directory.
Rik <rik@octave.org>
parents: 23220
diff changeset
32 #include "Array.h"
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
33 #include "CColVector.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
34 #include "CMatrix.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
35 #include "CNDArray.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
36 #include "CRowVector.h"
23475
d691ed308237 maint: Clean up #includes in liboctave/numeric directory.
Rik <rik@octave.org>
parents: 23220
diff changeset
37 #include "MArray.h"
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
38 #include "dColVector.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
39 #include "dMatrix.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
40 #include "dNDArray.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
41 #include "dRowVector.h"
10388
5af0b4bb384d rewrite convn optimizations based on xAXPY
Jaroslav Hajek <highegg@gmail.com>
parents: 10385
diff changeset
42 #include "f77-fcn.h"
29875
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
43 #include "fCColVector.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
44 #include "fCMatrix.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
45 #include "fCNDArray.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
46 #include "fCRowVector.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
47 #include "fColVector.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
48 #include "fMatrix.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
49 #include "fNDArray.h"
9f7132a05682 eliminate macros and unnecessary include statements in oct-convn.h
John W. Eaton <jwe@octave.org>
parents: 29569
diff changeset
50 #include "fRowVector.h"
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
51 #include "oct-convn.h"
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
52
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
53 OCTAVE_BEGIN_NAMESPACE(octave)
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
54
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
55 // 2d convolution with a matrix kernel.
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
56 template <typename T, typename R>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
57 static void
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
58 convolve_2d (const T *a, F77_INT ma, F77_INT na,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
59 const R *b, F77_INT mb, F77_INT nb,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
60 T *c, bool inner);
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
61
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
62 // Forward instances to our Fortran implementations.
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
63 #define FORWARD_IMPL(T_CXX, R_CXX, T, R, T_CAST, T_CONST_CAST, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
64 R_CONST_CAST, f, F) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
65 extern "C" \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
66 F77_RET_T \
22948
7e447335b839 use F77_INT instead of octave_idx_type for liboctave convolution functions
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
67 F77_FUNC (f##conv2o, F##CONV2O) (const F77_INT&, const F77_INT&, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
68 const T*, const F77_INT&, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
69 const F77_INT&, const R*, T *); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
70 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
71 extern "C" \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
72 F77_RET_T \
22948
7e447335b839 use F77_INT instead of octave_idx_type for liboctave convolution functions
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
73 F77_FUNC (f##conv2i, F##CONV2I) (const F77_INT&, const F77_INT&, \
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
74 const T*, const F77_INT&, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
75 const F77_INT&, const R*, T *); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
76 \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
77 template <> void \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
78 convolve_2d<T_CXX, R_CXX> (const T_CXX *a, F77_INT ma, F77_INT na, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
79 const R_CXX *b, F77_INT mb, F77_INT nb, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
80 T_CXX *c, bool inner) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
81 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
82 if (inner) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
83 F77_XFCN (f##conv2i, F##CONV2I, (ma, na, T_CONST_CAST (a), \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
84 mb, nb, R_CONST_CAST (b), \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
85 T_CAST (c))); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
86 else \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
87 F77_XFCN (f##conv2o, F##CONV2O, (ma, na, T_CONST_CAST (a), \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
88 mb, nb, R_CONST_CAST (b), \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
89 T_CAST (c))); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
90 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
91
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
92 FORWARD_IMPL (double, double, F77_DBLE, F77_DBLE, , , , d, D)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
93 FORWARD_IMPL (float, float, F77_REAL, F77_REAL, , , , s, S)
22135
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531)
John W. Eaton <jwe@octave.org>
parents: 22133
diff changeset
94
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
95 FORWARD_IMPL (std::complex<double>, std::complex<double>,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
96 F77_DBLE_CMPLX, F77_DBLE_CMPLX, F77_DBLE_CMPLX_ARG,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
97 F77_CONST_DBLE_CMPLX_ARG, F77_CONST_DBLE_CMPLX_ARG, z, Z)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
98 FORWARD_IMPL (std::complex<float>, std::complex<float>,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
99 F77_CMPLX, F77_CMPLX, F77_CMPLX_ARG,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
100 F77_CONST_CMPLX_ARG, F77_CONST_CMPLX_ARG, c, C)
22135
407c66ae1e20 reduce warnings from GCC's link-time optimization feature (bug #48531)
John W. Eaton <jwe@octave.org>
parents: 22133
diff changeset
101
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
102 FORWARD_IMPL (std::complex<double>, double,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
103 F77_DBLE_CMPLX, F77_DBLE, F77_DBLE_CMPLX_ARG,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
104 F77_CONST_DBLE_CMPLX_ARG, , zd, ZD)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
105 FORWARD_IMPL (std::complex<float>, float, F77_CMPLX, F77_REAL, F77_CMPLX_ARG,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
106 F77_CONST_CMPLX_ARG, , cs, CS)
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
107
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
108 template <typename T, typename R>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
109 void convolve_nd (const T *a, const dim_vector& ad, const dim_vector& acd,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
110 const R *b, const dim_vector& bd, const dim_vector& bcd,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
111 T *c, const dim_vector& ccd, int nd, bool inner)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
112 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
113 if (nd == 2)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
114 {
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
115 F77_INT ad0 = to_f77_int (ad(0));
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
116 F77_INT ad1 = to_f77_int (ad(1));
22948
7e447335b839 use F77_INT instead of octave_idx_type for liboctave convolution functions
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
117
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
118 F77_INT bd0 = to_f77_int (bd(0));
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
119 F77_INT bd1 = to_f77_int (bd(1));
22948
7e447335b839 use F77_INT instead of octave_idx_type for liboctave convolution functions
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
120
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
121 convolve_2d<T, R> (a, ad0, ad1, b, bd0, bd1, c, inner);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
122 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
123 else
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
124 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
125 octave_idx_type ma = acd(nd-2);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
126 octave_idx_type na = ad(nd-1);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
127 octave_idx_type mb = bcd(nd-2);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
128 octave_idx_type nb = bd(nd-1);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
129 octave_idx_type ldc = ccd(nd-2);
22948
7e447335b839 use F77_INT instead of octave_idx_type for liboctave convolution functions
John W. Eaton <jwe@octave.org>
parents: 22755
diff changeset
130
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
131 if (inner)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
132 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
133 for (octave_idx_type ja = 0; ja < na - nb + 1; ja++)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
134 for (octave_idx_type jb = 0; jb < nb; jb++)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
135 convolve_nd<T, R> (a + ma*(ja+jb), ad, acd,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
136 b + mb*(nb-jb-1), bd, bcd,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
137 c + ldc*ja, ccd, nd-1, inner);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
138 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
139 else
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
140 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
141 for (octave_idx_type ja = 0; ja < na; ja++)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
142 for (octave_idx_type jb = 0; jb < nb; jb++)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
143 convolve_nd<T, R> (a + ma*ja, ad, acd, b + mb*jb, bd, bcd,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
144 c + ldc*(ja+jb), ccd, nd-1, inner);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
145 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
146 }
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
147 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
148
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
149 // Arbitrary convolutor.
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
150 // The 2nd array is assumed to be the smaller one.
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
151 template <typename T, typename R>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
152 static MArray<T>
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
153 convolve (const MArray<T>& a, const MArray<R>& b,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
154 convn_type ct)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
155 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
156 if (a.isempty () || b.isempty ())
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
157 return MArray<T> ();
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
158
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
159 int nd = std::max (a.ndims (), b.ndims ());
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
160 const dim_vector adims = a.dims ().redim (nd);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
161 const dim_vector bdims = b.dims ().redim (nd);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
162 dim_vector cdims = dim_vector::alloc (nd);
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
163
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
164 for (int i = 0; i < nd; i++)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
165 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
166 if (ct == convn_valid)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
167 cdims(i) = std::max (adims(i) - bdims(i) + 1,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
168 static_cast<octave_idx_type> (0));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
169 else
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
170 cdims(i) = std::max (adims(i) + bdims(i) - 1,
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
171 static_cast<octave_idx_type> (0));
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
172 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
173
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
174 MArray<T> c (cdims, T ());
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
175
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
176 // "valid" shape can sometimes result in empty matrices which must avoid
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
177 // calling Fortran code which does not expect this (bug #52067)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
178 if (c.isempty ())
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
179 return c;
24087
88a593fa1388 Stop out-of-bounds memory access during convolution (bug #52067).
Rik <rik@octave.org>
parents: 23577
diff changeset
180
29931
7faff48840eb prefer data over fortran_vec for read-only access to data
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
181 convolve_nd<T, R> (a.data (), adims, adims.cumulative (),
7faff48840eb prefer data over fortran_vec for read-only access to data
John W. Eaton <jwe@octave.org>
parents: 29876
diff changeset
182 b.data (), bdims, bdims.cumulative (),
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
183 c.fortran_vec (), cdims.cumulative (),
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
184 nd, ct == convn_valid);
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
185
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
186 if (ct == convn_same)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
187 {
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
188 // Pick the relevant part.
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
189 Array<idx_vector> sidx (dim_vector (nd, 1));
10388
5af0b4bb384d rewrite convn optimizations based on xAXPY
Jaroslav Hajek <highegg@gmail.com>
parents: 10385
diff changeset
190
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
191 for (int i = 0; i < nd; i++)
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29931
diff changeset
192 sidx(i) = idx_vector::make_range (bdims(i)/2, 1, adims(i));
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
193 c = c.index (sidx);
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
194 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
195
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
196 return c;
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
197 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
198
22197
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
199 #define CONV_DEFS(TPREF, RPREF) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
200 TPREF ## NDArray \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
201 convn (const TPREF ## NDArray& a, const RPREF ## NDArray& b, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
202 convn_type ct) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
203 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
204 return convolve (a, b, ct); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
205 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
206 TPREF ## Matrix \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
207 convn (const TPREF ## Matrix& a, const RPREF ## Matrix& b, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
208 convn_type ct) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
209 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
210 return convolve (a, b, ct); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
211 } \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
212 TPREF ## Matrix \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
213 convn (const TPREF ## Matrix& a, const RPREF ## ColumnVector& c, \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
214 const RPREF ## RowVector& r, convn_type ct) \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
215 { \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
216 return convolve (a, c * r, ct); \
e43d83253e28 refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents: 22135
diff changeset
217 }
10385
56116dceb1e0 add omitted source from the last change
Jaroslav Hajek <highegg@gmail.com>
parents:
diff changeset
218
29876
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
219 CONV_DEFS ( , )
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
220 CONV_DEFS (Complex, )
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
221 CONV_DEFS (Complex, Complex)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
222 CONV_DEFS (Float, Float)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
223 CONV_DEFS (FloatComplex, Float)
89bdb44db76f move liboctave convn functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29875
diff changeset
224 CONV_DEFS (FloatComplex, FloatComplex)
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
225
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30564
diff changeset
226 OCTAVE_END_NAMESPACE(octave)