Mercurial > octave
changeset 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 | 538b57866b90 |
| children | 34368609f62b |
| files | build-aux/common.mk libinterp/corefcn/oct-hdf5.h libinterp/corefcn/toplev.cc libinterp/dldfcn/amd.cc libinterp/dldfcn/ccolamd.cc libinterp/dldfcn/colamd.cc libinterp/dldfcn/dmperm.cc libinterp/dldfcn/symbfact.cc libinterp/oct-conf.in.h libinterp/octave-value/ov.cc liboctave/array/CSparse.cc liboctave/array/CSparse.h liboctave/array/MArray-i.cc liboctave/array/dSparse.cc liboctave/array/dSparse.h liboctave/numeric/SparseCmplxQR.h liboctave/numeric/SparseQR.h liboctave/numeric/sparse-base-chol.cc liboctave/util/lo-array-errwarn.cc liboctave/util/lo-array-gripes.cc liboctave/util/oct-sparse.h m4/acinclude.m4 oct-conf-post.in.h scripts/miscellaneous/computer.m |
| diffstat | 24 files changed, 34 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk Sun Jan 24 13:50:04 2016 -0500 +++ b/build-aux/common.mk Mon Jan 25 19:16:31 2016 -0500 @@ -316,7 +316,6 @@ # Miscellaneous -USE_64_BIT_IDX_T = @USE_64_BIT_IDX_T@ OCTAVE_IDX_TYPE = @OCTAVE_IDX_TYPE@ if AMCOND_ADDRESS_SANITIZER_ENABLED @@ -666,7 +665,6 @@ -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_LIBS%|\"${UMFPACK_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \ -e "s|%OCTAVE_CONF_VERSION%|\"${version}\"|" \ -e "s|%OCTAVE_CONF_WARN_CFLAGS%|\"${WARN_CFLAGS}\"|" \ -e "s|%OCTAVE_CONF_WARN_CXXFLAGS%|\"${WARN_CXXFLAGS}\"|" \ @@ -841,7 +839,6 @@ -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_LIBS%|\"${UMFPACK_LIBS}\"|" \ - -e "s|%OCTAVE_CONF_USE_64_BIT_IDX_T%|\"${USE_64_BIT_IDX_T}\"|" \ -e "s|%OCTAVE_CONF_VERSION%|\"${version}\"|" \ -e "s|%OCTAVE_CONF_WARN_CFLAGS%|\"${WARN_CFLAGS}\"|" \ -e "s|%OCTAVE_CONF_WARN_CXXFLAGS%|\"${WARN_CXXFLAGS}\"|" \
--- a/libinterp/corefcn/oct-hdf5.h Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/corefcn/oct-hdf5.h Mon Jan 25 19:16:31 2016 -0500 @@ -31,7 +31,7 @@ #include "oct-hdf5-types.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define H5T_NATIVE_IDX H5T_NATIVE_INT64 #else #define H5T_NATIVE_IDX H5T_NATIVE_INT
--- a/libinterp/corefcn/toplev.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/corefcn/toplev.cc Mon Jan 25 19:16:31 2016 -0500 @@ -1390,7 +1390,7 @@ { false, "UMFPACK_CPPFLAGS", OCTAVE_CONF_UMFPACK_CPPFLAGS }, { false, "UMFPACK_LDFLAGS", OCTAVE_CONF_UMFPACK_LDFLAGS }, { false, "UMFPACK_LIBS", OCTAVE_CONF_UMFPACK_LIBS }, - { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_USE_64_BIT_IDX_T }, + { false, "USE_64_BIT_IDX_T", OCTAVE_CONF_ENABLE_64 }, { false, "WARN_CFLAGS", OCTAVE_CONF_WARN_CFLAGS }, { false, "WARN_CXXFLAGS", OCTAVE_CONF_WARN_CXXFLAGS }, { false, "X11_INCFLAGS", OCTAVE_CONF_X11_INCFLAGS },
--- a/libinterp/dldfcn/amd.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/dldfcn/amd.cc Mon Jan 25 19:16:31 2016 -0500 @@ -45,7 +45,7 @@ #include "oct-sparse.h" #include "oct-locbuf.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define AMD_NAME(name) amd_l ## name #else #define AMD_NAME(name) amd ## name
--- a/libinterp/dldfcn/ccolamd.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/dldfcn/ccolamd.cc Mon Jan 25 19:16:31 2016 -0500 @@ -44,7 +44,7 @@ #include "oct-sparse.h" #include "oct-locbuf.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) # define CCOLAMD_NAME(name) ccolamd_l ## name # define CSYMAMD_NAME(name) csymamd_l ## name #else
--- a/libinterp/dldfcn/colamd.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/dldfcn/colamd.cc Mon Jan 25 19:16:31 2016 -0500 @@ -45,7 +45,7 @@ #include "oct-sparse.h" #include "oct-locbuf.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) # define COLAMD_NAME(name) colamd_l ## name # define SYMAMD_NAME(name) symamd_l ## name #else
--- a/libinterp/dldfcn/dmperm.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/dldfcn/dmperm.cc Mon Jan 25 19:16:31 2016 -0500 @@ -37,7 +37,7 @@ #include "SparseQR.h" #include "SparseCmplxQR.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) # define CXSPARSE_NAME(name) cs_dl ## name #else # define CXSPARSE_NAME(name) cs_di ## name
--- a/libinterp/dldfcn/symbfact.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/dldfcn/symbfact.cc Mon Jan 25 19:16:31 2016 -0500 @@ -131,7 +131,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT;
--- a/libinterp/oct-conf.in.h Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/oct-conf.in.h Mon Jan 25 19:16:31 2016 -0500 @@ -606,10 +606,6 @@ #define OCTAVE_CONF_UMFPACK_LIBS %OCTAVE_CONF_UMFPACK_LIBS% #endif -#ifndef OCTAVE_CONF_USE_64_BIT_IDX_T -#define OCTAVE_CONF_USE_64_BIT_IDX_T %OCTAVE_CONF_USE_64_BIT_IDX_T% -#endif - #ifndef OCTAVE_CONF_WARN_CFLAGS #define OCTAVE_CONF_WARN_CFLAGS %OCTAVE_CONF_WARN_CFLAGS% #endif
--- a/libinterp/octave-value/ov.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/libinterp/octave-value/ov.cc Mon Jan 25 19:16:31 2016 -0500 @@ -1521,7 +1521,7 @@ octave_idx_type octave_value::idx_type_value (bool req_int, bool frc_str_conv) const { -#if defined (USE_64_BIT_IDX_T) +#if defined (ENABLE_64) return int64_value (req_int, frc_str_conv); #else return int_value (req_int, frc_str_conv);
--- a/liboctave/array/CSparse.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/array/CSparse.cc Mon Jan 25 19:16:31 2016 -0500 @@ -5601,7 +5601,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -5847,7 +5847,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -5871,7 +5871,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT; @@ -6141,7 +6141,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6366,7 +6366,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6390,7 +6390,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT;
--- a/liboctave/array/CSparse.h Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/array/CSparse.h Mon Jan 25 19:16:31 2016 -0500 @@ -546,7 +546,7 @@ SPARSE_FORWARD_DEFS (MSparse, SparseComplexMatrix, ComplexMatrix, Complex) -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define UMFPACK_ZNAME(name) umfpack_zl_ ## name #else #define UMFPACK_ZNAME(name) umfpack_zi_ ## name
--- a/liboctave/array/MArray-i.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/array/MArray-i.cc Mon Jan 25 19:16:31 2016 -0500 @@ -32,7 +32,7 @@ #include "MArray.cc" template class OCTAVE_API MArray<int>; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) template class OCTAVE_API MArray<int64_t>; #endif @@ -44,7 +44,7 @@ template long xmax<long> (long, long); INSTANTIATE_MARRAY_FRIENDS (int, OCTAVE_API) -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) INSTANTIATE_MARRAY_FRIENDS (int64_t, OCTAVE_API) #endif
--- a/liboctave/array/dSparse.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/array/dSparse.cc Mon Jan 25 19:16:31 2016 -0500 @@ -5794,7 +5794,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6014,7 +6014,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6038,7 +6038,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT; @@ -6279,7 +6279,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6516,7 +6516,7 @@ A->packed = true; A->sorted = true; A->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) A->itype = CHOLMOD_LONG; #else A->itype = CHOLMOD_INT; @@ -6540,7 +6540,7 @@ B->packed = true; B->sorted = true; B->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) B->itype = CHOLMOD_LONG; #else B->itype = CHOLMOD_INT;
--- a/liboctave/array/dSparse.h Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/array/dSparse.h Mon Jan 25 19:16:31 2016 -0500 @@ -503,7 +503,7 @@ SPARSE_FORWARD_DEFS (MSparse, SparseMatrix, Matrix, double) -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define UMFPACK_DNAME(name) umfpack_dl_ ## name #else #define UMFPACK_DNAME(name) umfpack_di_ ## name
--- a/liboctave/numeric/SparseCmplxQR.h Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/numeric/SparseCmplxQR.h Mon Jan 25 19:16:31 2016 -0500 @@ -31,7 +31,7 @@ #include "CSparse.h" #include "oct-sparse.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define CXSPARSE_ZNAME(name) cs_cl ## name #else #define CXSPARSE_ZNAME(name) cs_ci ## name
--- a/liboctave/numeric/SparseQR.h Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/numeric/SparseQR.h Mon Jan 25 19:16:31 2016 -0500 @@ -31,7 +31,7 @@ #include "CSparse.h" #include "oct-sparse.h" -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define CXSPARSE_DNAME(name) cs_dl ## name #else #define CXSPARSE_DNAME(name) cs_di ## name
--- a/liboctave/numeric/sparse-base-chol.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/numeric/sparse-base-chol.cc Mon Jan 25 19:16:31 2016 -0500 @@ -132,7 +132,7 @@ ac->packed = true; ac->sorted = true; ac->nz = 0; -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) ac->itype = CHOLMOD_LONG; #else ac->itype = CHOLMOD_INT;
--- a/liboctave/util/lo-array-errwarn.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/util/lo-array-errwarn.cc Mon Jan 25 19:16:31 2016 -0500 @@ -172,7 +172,7 @@ std::string details (void) const { -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) return "subscripts must be either integers 1 to (2^63)-1 or logicals"; #else return "subscripts must be either integers 1 to (2^31)-1 or logicals";
--- a/liboctave/util/lo-array-gripes.cc Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/util/lo-array-gripes.cc Mon Jan 25 19:16:31 2016 -0500 @@ -116,7 +116,7 @@ std::string details (void) const { -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) return "subscripts must be either integers 1 to (2^63)-1 or logicals"; #else return "subscripts must be either integers 1 to (2^31)-1 or logicals";
--- a/liboctave/util/oct-sparse.h Sun Jan 24 13:50:04 2016 -0500 +++ b/liboctave/util/oct-sparse.h Mon Jan 25 19:16:31 2016 -0500 @@ -87,7 +87,7 @@ || defined (HAVE_UFSPARSE_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_H)) -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define CHOLMOD_NAME(name) cholmod_l_ ## name #else #define CHOLMOD_NAME(name) cholmod_ ## name
--- a/m4/acinclude.m4 Sun Jan 24 13:50:04 2016 -0500 +++ b/m4/acinclude.m4 Mon Jan 25 19:16:31 2016 -0500 @@ -1230,7 +1230,7 @@ #include <assert.h> #include <stdint.h> ]], [[ - #ifdef USE_64_BIT_IDX_T + #ifdef ENABLE_64 typedef int64_t octave_idx_type; #else typedef int octave_idx_type; @@ -2407,7 +2407,7 @@ #elif defined (HAVE_UMFPACK_H) # include <umfpack.h> #endif - #ifdef USE_64_BIT_IDX_T + #ifdef ENABLE_64 typedef uint64_t idx_type; #define UMFPACK_NAME(name) umfpack_zl_ ## name #else
--- a/oct-conf-post.in.h Sun Jan 24 13:50:04 2016 -0500 +++ b/oct-conf-post.in.h Mon Jan 25 19:16:31 2016 -0500 @@ -107,7 +107,7 @@ #define F77_USES_VISUAL_FORTRAN_CALLING_CONVENTION #endif -#ifdef USE_64_BIT_IDX_T +#if defined (ENABLE_64) #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT64_T #else #define SIZEOF_OCTAVE_IDX_TYPE SIZEOF_INT
--- a/scripts/miscellaneous/computer.m Sun Jan 24 13:50:04 2016 -0500 +++ b/scripts/miscellaneous/computer.m Mon Jan 25 19:16:31 2016 -0500 @@ -71,7 +71,7 @@ else c = msg; if (isargout (2)) - if (strcmp (octave_config_info ("USE_64_BIT_IDX_T"), "true")) + if (strcmp (octave_config_info ("ENABLE_64"), "true")) maxsize = 2^63-1; else maxsize = 2^31-1;