octave: liboctave/numeric/oct-convn.cc annotate

annotate liboctave/numeric/oct-convn.cc @ 29876:89bdb44db76f

move liboctave convn functions inside octave namespace * oct-convn.h (convn, convn_type): Move inside octave namespace. Also preserve global convn_type enum. Provide deprecated wrappers for old names. Change uses where needed. (convert_enum): New function. * oct-convn.cc: Move templates and all functions inside octave namespace.

author	John W. Eaton <jwe@octave.org>
date	Wed, 14 Jul 2021 00:18:49 -0400
parents	9f7132a05682
children	7faff48840eb

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 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27923 diff changeset	3 // Copyright (C) 2010-2021 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
29876 89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	53 namespace octave
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	54 {
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 {
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	115 F77_INT ad0 = octave::to_f77_int (ad(0));
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	116 F77_INT ad1 = octave::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
29876 89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	118 F77_INT bd0 = octave::to_f77_int (bd(0));
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	119 F77_INT bd1 = octave::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 + maja, ad, acd, b + mbjb, 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
29876 89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	181 convolve_nd<T, R> (a.fortran_vec (), adims, adims.cumulative (),
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	182 b.fortran_vec (), bdims, bdims.cumulative (),
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.
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	189 Array<octave::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++)
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	192 sidx(i) = octave::idx_vector::make_range (bdims(i)/2, 1, adims(i));
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)
89bdb44db76f move liboctave convn functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29875 diff changeset	225 }

Mercurial > octave

annotate liboctave/numeric/oct-convn.cc @ 29876:89bdb44db76f