Mercurial > octave
view liboctave/util/oct-sparse.h @ 21140:e06e600f396a
eliminate use of USE_64_BIT_IDX_T
* common.mk (do_subst_config_vals, do_subst_cross_config_vals):
Don't substitute OCTAVE_CONF_USE_64_BIT_IDX_T.
* toplev.cc (octave_config_info): Set USE_64_BIT_IDX_T from
OCTAVE_CONF_ENABLE_64.
* oct-conf.in.h (OCTAVE_CONF_USE_64_BIT_IDX_T): Delete macro.
* oct-hdf5.h, amd.cc, ccolamd.cc, colamd.cc, dmperm.cc, symbfact.cc,
ov.cc, CSparse.cc, CSparse.h, MArray-i.cc, dSparse.cc, dSparse.h,
SparseCmplxQR.h, SparseQR.h, sparse-base-chol.cc,
lo-array-errwarn.cc, lo-array-gripes.cc, oct-sparse.h, acinclude.m4,
oct-conf-post.in.h, computer.m:
Use ENABLE_64 instead of USE_64_BIT_IDX_T.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 25 Jan 2016 19:16:31 -0500 |
| parents | f7084eae3318 |
| children | 8ad3907b8fad |
line wrap: on
line source
/* Copyright (C) 2005-2015 David Bateman This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if ! defined (octave_oct_sparse_h) #define octave_oct_sparse_h 1 #if defined (HAVE_SUITESPARSE_AMD_H) #include <suitesparse/amd.h> #elif defined (HAVE_UFSPARSE_AMD_H) #include <ufsparse/amd.h> #elif defined (HAVE_AMD_AMD_H) #include <amd/amd.h> #elif defined (HAVE_AMD_H) #include <amd.h> #endif #if defined (HAVE_SUITESPARSE_UMFPACK_H) #include <suitesparse/umfpack.h> #elif defined (HAVE_UFSPARSE_UMFPACK_H) #include <ufsparse/umfpack.h> #elif defined (HAVE_UMFPACK_UMFPACK_H) #include <umfpack/umfpack.h> #elif defined (HAVE_UMFPACK_H) #include <umfpack.h> #endif #if defined (HAVE_SUITESPARSE_COLAMD_H) #include <suitesparse/colamd.h> #elif defined (HAVE_UFSPARSE_COLAMD_H) #include <ufsparse/colamd.h> #elif defined (HAVE_COLAMD_COLAMD_H) #include <colamd/colamd.h> #elif defined (HAVE_COLAMD_H) #include <colamd.h> #endif #if defined (HAVE_SUITESPARSE_CCOLAMD_H) #include <suitesparse/ccolamd.h> #elif defined (HAVE_UFSPARSE_CCOLAMD_H) #include <ufsparse/ccolamd.h> #elif defined (HAVE_CCOLAMD_CCOLAMD_H) #include <ccolamd/ccolamd.h> #elif defined (HAVE_CCOLAMD_H) #include <ccolamd.h> #endif #if defined (HAVE_SUITESPARSE_CHOLMOD_H) #include <suitesparse/cholmod.h> #elif defined (HAVE_UFSPARSE_CHOLMOD_H) #include <ufsparse/cholmod.h> #elif defined (HAVE_CHOLMOD_CHOLMOD_H) #include <cholmod/cholmod.h> #elif defined (HAVE_CHOLMOD_H) #include <cholmod.h> #endif #if defined (HAVE_SUITESPARSE_CS_H) #include <suitesparse/cs.h> #elif defined (HAVE_UFSPARSE_CS_H) #include <ufsparse/cs.h> #elif defined (HAVE_CXSPARSE_CS_H) #include <cxsparse/cs.h> #elif defined (HAVE_CS_H) #include <cs.h> #endif #if (defined (HAVE_SUITESPARSE_CHOLMOD_H) \ || defined (HAVE_UFSPARSE_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_H)) #if defined (ENABLE_64) #define CHOLMOD_NAME(name) cholmod_l_ ## name #else #define CHOLMOD_NAME(name) cholmod_ ## name #endif #endif // Cope with new suitesparse versions // #if defined (SUITESPARSE_VERSION) # if SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3) # define SUITESPARSE_NAME(name) SuiteSparse_ ## name # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (SuiteSparse_config.f_name = f_assign) # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (SuiteSparse_config.f_name = SUITESPARSE_NAME (f_assign)) # else # define SUITESPARSE_ASSIGN_FPTR(f_name, f_var, f_assign) (f_var = f_assign) # define SUITESPARSE_ASSIGN_FPTR2(f_name, f_var, f_assign) (f_var = CHOLMOD_NAME (f_assign)) # endif #endif #endif