octave: liboctave/util/oct-sparse.h annotate

annotate liboctave/util/oct-sparse.h @ 29274:fed765133d53

sparse-qr.cc: Use correct integer types (bug #57033). * liboctave/numeric/sparse-qr.cc (sparse_qr_rep): Use correct integer types for members. Use cholmod types with SuiteSparse_long for SPQR. Check when converting to narrower integer types. Do not static_cast pointer types. (ros2rcs, cos2ccs, rod2ccd, cod2ccd, rcs2ros, ccs2cos, ros2ccs): Move functions from oct-sparse.cc and use cholmod types with SuiteSparse_long. Check when converting to narrower integer types. Do not static_cast pointer types. Copy arrays to correct integer pointer type when necessary. * liboctave/util/oct-sparse.h (from_suitesparse_long, from_size_t): New functions. * liboctave/util/oct-sparse.cc (ros2rcs, cos2ccs, rod2ccd, cod2ccd, rcs2ros, ccs2cos, ros2ccs): Remove functions that were moved to sparse-qr.cc.

author	Markus Mützel <markus.muetzel@gmx.de>
date	Thu, 07 Jan 2021 00:19:21 +0100
parents	d4d56704978e
children	881bbfaddd25

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 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2005-2020 The Octave Project Developers
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 ////////////////////////////////////////////////////////////////////////
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	25
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19756 diff changeset	26 #if ! defined (octave_oct_sparse_h)
17822 ebb3ef964372 maint: Use common #define syntax "octave_filename_h" in h_files. Rik <rik@octave.org> parents: 17744 diff changeset	27 #define octave_oct_sparse_h 1
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	28
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	29 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 21229 diff changeset	30
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	31 #if defined (HAVE_CHOLMOD)
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	32 # include "dSparse.h"
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	33 # include "CSparse.h"
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	34 #endif
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	35
7619 56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	36 #if defined (HAVE_SUITESPARSE_AMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	37 # include <suitesparse/amd.h>
7619 56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	38 #elif defined (HAVE_UFSPARSE_AMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	39 # include <ufsparse/amd.h>
7619 56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	40 #elif defined (HAVE_AMD_AMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	41 # include <amd/amd.h>
7619 56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	42 #elif defined (HAVE_AMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	43 # include <amd.h>
7619 56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	44 #endif
56012914972a Add the amd function David Bateman <dbateman@free.fr> parents: 7036 diff changeset	45
6231 82021cf7e53a [project @ 2007-01-08 19:53:35 by dbateman] dbateman parents: 6186 diff changeset	46 #if defined (HAVE_SUITESPARSE_CCOLAMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	47 # include <suitesparse/ccolamd.h>
6186 237a7f535bbc [project @ 2006-11-28 20:13:39 by dbateman] dbateman parents: 5648 diff changeset	48 #elif defined (HAVE_UFSPARSE_CCOLAMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	49 # include <ufsparse/ccolamd.h>
5610 9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5518 diff changeset	50 #elif defined (HAVE_CCOLAMD_CCOLAMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	51 # include <ccolamd/ccolamd.h>
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	52 #elif defined (HAVE_CCOLAMD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	53 # include <ccolamd.h>
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	54 #endif
7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	55
6231 82021cf7e53a [project @ 2007-01-08 19:53:35 by dbateman] dbateman parents: 6186 diff changeset	56 #if defined (HAVE_SUITESPARSE_CHOLMOD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	57 # include <suitesparse/cholmod.h>
6186 237a7f535bbc [project @ 2006-11-28 20:13:39 by dbateman] dbateman parents: 5648 diff changeset	58 #elif defined (HAVE_UFSPARSE_CHOLMOD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	59 # include <ufsparse/cholmod.h>
6236 1bed9b2c26e0 [project @ 2007-01-10 18:20:18 by jwe] jwe parents: 6231 diff changeset	60 #elif defined (HAVE_CHOLMOD_CHOLMOD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	61 # include <cholmod/cholmod.h>
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	62 #elif defined (HAVE_CHOLMOD_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	63 # include <cholmod.h>
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	64 #endif
7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	65
23390 1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	66 #if defined (HAVE_SUITESPARSE_COLAMD_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	67 # include <suitesparse/colamd.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	68 #elif defined (HAVE_UFSPARSE_COLAMD_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	69 # include <ufsparse/colamd.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	70 #elif defined (HAVE_COLAMD_COLAMD_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	71 # include <colamd/colamd.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	72 #elif defined (HAVE_COLAMD_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	73 # include <colamd.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	74 #endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	75
6231 82021cf7e53a [project @ 2007-01-08 19:53:35 by dbateman] dbateman parents: 6186 diff changeset	76 #if defined (HAVE_SUITESPARSE_CS_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	77 # include <suitesparse/cs.h>
6186 237a7f535bbc [project @ 2006-11-28 20:13:39 by dbateman] dbateman parents: 5648 diff changeset	78 #elif defined (HAVE_UFSPARSE_CS_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	79 # include <ufsparse/cs.h>
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5610 diff changeset	80 #elif defined (HAVE_CXSPARSE_CS_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	81 # include <cxsparse/cs.h>
5648 69a4f320d95a [project @ 2006-03-08 20:17:37 by dbateman] dbateman parents: 5610 diff changeset	82 #elif defined (HAVE_CS_H)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	83 # include <cs.h>
5610 9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5518 diff changeset	84 #endif
9761b7d24e9e [project @ 2006-02-09 09:12:02 by dbateman] dbateman parents: 5518 diff changeset	85
23390 1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	86 #if defined (HAVE_SUITESPARSE_UMFPACK_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	87 # include <suitesparse/umfpack.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	88 #elif defined (HAVE_UFSPARSE_UMFPACK_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	89 # include <ufsparse/umfpack.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	90 #elif defined (HAVE_UMFPACK_UMFPACK_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	91 # include <umfpack/umfpack.h>
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	92 #elif defined (HAVE_UMFPACK_H)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	93 # include <umfpack.h>
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	94 #endif
7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	95
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	96 #if defined (HAVE_SUITESPARSE_SUITESPARSEQR_HPP)
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	97 # include <suitesparse/SuiteSparseQR.hpp>
29268 d4d56704978e build: Search SPQR header without sub-directory (bug #59828). Markus Mützel <markus.muetzel@gmx.de> parents: 29259 diff changeset	98 #elif defined (HAVE_SUITESPARSEQR_HPP)
d4d56704978e build: Search SPQR header without sub-directory (bug #59828). Markus Mützel <markus.muetzel@gmx.de> parents: 29259 diff changeset	99 # include <SuiteSparseQR.hpp>
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	100 #endif
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	101
21160 b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21152 diff changeset	102 // Cope with new SuiteSparse versions
b5b531ba93ce build: Use configure-time test to check CXSparse version. Rik <rik@octave.org> parents: 21152 diff changeset	103
19207 4d460b124be3 Fix compilation error when building without SuiteSparse Mike Miller <mtmiller@ieee.org> parents: 19139 diff changeset	104 #if defined (SUITESPARSE_VERSION)
21213 f7d1050b9b53 maint: Clean up various usages of #ifdef. Rik <rik@octave.org> parents: 21210 diff changeset	105 # if (SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3))
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	106 # define SUITESPARSE_NAME(name) SuiteSparse_ ## name
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	107 # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign)
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	108 # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign))
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	109 # else
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	110 # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign)
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	111 # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign))
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	112 # endif
5512 7c8767d0ffc0 [project @ 2005-10-27 02:20:17 by jwe] jwe parents: diff changeset	113 #endif
19139 afd6179d2616 allow building with new version of SuiteSparse (bug #43063) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	114
23390 1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	115 // Function names depend on integer type.
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	116
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	117 #if defined (HAVE_AMD)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	118 # if defined (OCTAVE_ENABLE_64)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	119 # define AMD_NAME(name) amd_l ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	120 # else
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	121 # define AMD_NAME(name) amd ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	122 # endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	123 #endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	124
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	125 #if defined (HAVE_CCOLAMD)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	126 # if defined (OCTAVE_ENABLE_64)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	127 # define CCOLAMD_NAME(name) ccolamd_l ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	128 # define CSYMAMD_NAME(name) csymamd_l ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	129 # else
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	130 # define CCOLAMD_NAME(name) ccolamd ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	131 # define CSYMAMD_NAME(name) csymamd ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	132 # endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	133 #endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	134
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	135 #if defined (HAVE_CHOLMOD)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	136 # if defined (OCTAVE_ENABLE_64)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	137 # define CHOLMOD_NAME(name) cholmod_l_ ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	138 # else
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	139 # define CHOLMOD_NAME(name) cholmod_ ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	140 # endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	141 #endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	142
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	143 #if defined (HAVE_COLAMD)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	144 # if defined (OCTAVE_ENABLE_64)
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	145 # define COLAMD_NAME(name) colamd_l ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	146 # define SYMAMD_NAME(name) symamd_l ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	147 # else
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	148 # define COLAMD_NAME(name) colamd ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	149 # define SYMAMD_NAME(name) symamd ## name
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	150 # endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	151 #endif
1ae9f4c1f48a define all suitesparse NAME macros in oct-sparse.h John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	152
21176 791dcb32b657 revamp sparse QR factorizatino classes John W. Eaton <jwe@octave.org> parents: 21160 diff changeset	153 #if defined (HAVE_CXSPARSE)
21229 a83e7a384ee0 create and install a subset of config.h in octave-config.h John W. Eaton <jwe@octave.org> parents: 21213 diff changeset	154 # if defined (OCTAVE_ENABLE_64)
21177 a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	155 # define CXSPARSE_DNAME(name) cs_dl ## name
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	156 # define CXSPARSE_ZNAME(name) cs_cl ## name
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	157 # else
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	158 # define CXSPARSE_DNAME(name) cs_di ## name
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	159 # define CXSPARSE_ZNAME(name) cs_ci ## name
a10f60e13243 style fixes in liboctave/numeric directory John W. Eaton <jwe@octave.org> parents: 21176 diff changeset	160 # endif
19139 afd6179d2616 allow building with new version of SuiteSparse (bug #43063) John W. Eaton <jwe@octave.org> parents: 17822 diff changeset	161 #endif
21176 791dcb32b657 revamp sparse QR factorizatino classes John W. Eaton <jwe@octave.org> parents: 21160 diff changeset	162
21210 4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	163 #if defined (HAVE_UMFPACK)
21229 a83e7a384ee0 create and install a subset of config.h in octave-config.h John W. Eaton <jwe@octave.org> parents: 21213 diff changeset	164 # if defined (OCTAVE_ENABLE_64)
21210 4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	165 # define UMFPACK_DNAME(name) umfpack_dl_ ## name
4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	166 # define UMFPACK_ZNAME(name) umfpack_zl_ ## name
4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	167 # else
4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	168 # define UMFPACK_DNAME(name) umfpack_di_ ## name
4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	169 # define UMFPACK_ZNAME(name) umfpack_zi_ ## name
4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	170 # endif
21176 791dcb32b657 revamp sparse QR factorizatino classes John W. Eaton <jwe@octave.org> parents: 21160 diff changeset	171 #endif
21210 4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	172
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	173 #if (defined (HAVE_AMD) \|\| defined (HAVE_CCOLAMD) \
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	174 \|\| defined (HAVE_CHOLMOD) \|\| defined (HAVE_COLAMD) \
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	175 \|\| defined (HAVE_CXSPARSE) \|\| defined (HAVE_SPQR) \
66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	176 \|\| defined (HAVE_UMFPACK))
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	177
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	178 namespace octave
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	179 {
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	180 # if defined (OCTAVE_ENABLE_64)
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	181 typedef SuiteSparse_long suitesparse_integer;
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	182 # else
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	183 typedef int suitesparse_integer;
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	184 # endif
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	185
29230 6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	186 extern OCTAVE_API suitesparse_integer *
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	187 to_suitesparse_intptr (octave_idx_type *i);
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	188
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	189 extern const OCTAVE_API suitesparse_integer *
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	190 to_suitesparse_intptr (const octave_idx_type *i);
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	191
29230 6b3faa844395 Set API tags in files in liboctave/util (patch #8919). Markus Mützel <markus.muetzel@gmx.de> parents: 27923 diff changeset	192 extern OCTAVE_API octave_idx_type*
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	193 to_octave_idx_type_ptr (suitesparse_integer *i);
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	194
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	195 extern const OCTAVE_API octave_idx_type*
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	196 to_octave_idx_type_ptr (const suitesparse_integer *i);
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	197
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	198 inline octave_idx_type
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	199 from_suitesparse_long (SuiteSparse_long x)
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	200 {
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	201 if (x < std::numeric_limits<octave_idx_type>::min ()
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	202 \|\| x > std::numeric_limits<octave_idx_type>::max ())
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	203 (*current_liboctave_error_handler)
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	204 ("integer dimension or index out of range for Octave's indexing type");
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	205
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	206 return static_cast<octave_idx_type> (x);
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	207 }
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	208
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	209 inline octave_idx_type
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	210 from_size_t (size_t x)
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	211 {
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	212 // size_t is guaranteed to be unsigned
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	213 if (x > std::numeric_limits<octave_idx_type>::max ())
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	214 (*current_liboctave_error_handler)
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	215 ("integer dimension or index out of range for Octave's index type");
29259 66f162b6fa03 Replacement of CXSPARSE by SPQR for QR factorization (bug #57033). Simon Hau <simon.hau79@gmail.com> parents: 29230 diff changeset	216
29274 fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	217 return static_cast<octave_idx_type> (x);
fed765133d53 sparse-qr.cc: Use correct integer types (bug #57033). Markus Mützel <markus.muetzel@gmx.de> parents: 29268 diff changeset	218 }
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	219 }
209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	220
21210 4f7d3989c462 move UMFPACK_DNAME and UMFPACK_ZNAME macros to oct-sparse.h John W. Eaton <jwe@octave.org> parents: 21177 diff changeset	221 #endif
23391 209e749363a2 safe cast between SuiteSparse_long and octave_idx_type pointers (bug #50510) John W. Eaton <jwe@octave.org> parents: 23390 diff changeset	222 #endif

Mercurial > octave

annotate liboctave/util/oct-sparse.h @ 29274:fed765133d53