Mercurial > jwe > octave

comparison liboctave/array/CSparse.cc @ 21140:e06e600f396a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7cac4e7458f2
children 307096fb67e1
comparison
equal deleted inserted replaced
21139:538b57866b90 21140:e06e600f396a
5599 A->i = ridx (); 5599 A->i = ridx ();
5600 A->nzmax = nnz (); 5600 A->nzmax = nnz ();
5601 A->packed = true; 5601 A->packed = true;
5602 A->sorted = true; 5602 A->sorted = true;
5603 A->nz = 0; 5603 A->nz = 0;
5604 #ifdef USE_64_BIT_IDX_T 5604 #if defined (ENABLE_64)
5605 A->itype = CHOLMOD_LONG; 5605 A->itype = CHOLMOD_LONG;
5606 #else 5606 #else
5607 A->itype = CHOLMOD_INT; 5607 A->itype = CHOLMOD_INT;
5608 #endif 5608 #endif
5609 A->dtype = CHOLMOD_DOUBLE; 5609 A->dtype = CHOLMOD_DOUBLE;
5845 A->i = ridx (); 5845 A->i = ridx ();
5846 A->nzmax = nnz (); 5846 A->nzmax = nnz ();
5847 A->packed = true; 5847 A->packed = true;
5848 A->sorted = true; 5848 A->sorted = true;
5849 A->nz = 0; 5849 A->nz = 0;
5850 #ifdef USE_64_BIT_IDX_T 5850 #if defined (ENABLE_64)
5851 A->itype = CHOLMOD_LONG; 5851 A->itype = CHOLMOD_LONG;
5852 #else 5852 #else
5853 A->itype = CHOLMOD_INT; 5853 A->itype = CHOLMOD_INT;
5854 #endif 5854 #endif
5855 A->dtype = CHOLMOD_DOUBLE; 5855 A->dtype = CHOLMOD_DOUBLE;
5869 B->i = b.ridx (); 5869 B->i = b.ridx ();
5870 B->nzmax = b.nnz (); 5870 B->nzmax = b.nnz ();
5871 B->packed = true; 5871 B->packed = true;
5872 B->sorted = true; 5872 B->sorted = true;
5873 B->nz = 0; 5873 B->nz = 0;
5874 #ifdef USE_64_BIT_IDX_T 5874 #if defined (ENABLE_64)
5875 B->itype = CHOLMOD_LONG; 5875 B->itype = CHOLMOD_LONG;
5876 #else 5876 #else
5877 B->itype = CHOLMOD_INT; 5877 B->itype = CHOLMOD_INT;
5878 #endif 5878 #endif
5879 B->dtype = CHOLMOD_DOUBLE; 5879 B->dtype = CHOLMOD_DOUBLE;
6139 A->i = ridx (); 6139 A->i = ridx ();
6140 A->nzmax = nnz (); 6140 A->nzmax = nnz ();
6141 A->packed = true; 6141 A->packed = true;
6142 A->sorted = true; 6142 A->sorted = true;
6143 A->nz = 0; 6143 A->nz = 0;
6144 #ifdef USE_64_BIT_IDX_T 6144 #if defined (ENABLE_64)
6145 A->itype = CHOLMOD_LONG; 6145 A->itype = CHOLMOD_LONG;
6146 #else 6146 #else
6147 A->itype = CHOLMOD_INT; 6147 A->itype = CHOLMOD_INT;
6148 #endif 6148 #endif
6149 A->dtype = CHOLMOD_DOUBLE; 6149 A->dtype = CHOLMOD_DOUBLE;
6364 A->i = ridx (); 6364 A->i = ridx ();
6365 A->nzmax = nnz (); 6365 A->nzmax = nnz ();
6366 A->packed = true; 6366 A->packed = true;
6367 A->sorted = true; 6367 A->sorted = true;
6368 A->nz = 0; 6368 A->nz = 0;
6369 #ifdef USE_64_BIT_IDX_T 6369 #if defined (ENABLE_64)
6370 A->itype = CHOLMOD_LONG; 6370 A->itype = CHOLMOD_LONG;
6371 #else 6371 #else
6372 A->itype = CHOLMOD_INT; 6372 A->itype = CHOLMOD_INT;
6373 #endif 6373 #endif
6374 A->dtype = CHOLMOD_DOUBLE; 6374 A->dtype = CHOLMOD_DOUBLE;
6388 B->i = b.ridx (); 6388 B->i = b.ridx ();
6389 B->nzmax = b.nnz (); 6389 B->nzmax = b.nnz ();
6390 B->packed = true; 6390 B->packed = true;
6391 B->sorted = true; 6391 B->sorted = true;
6392 B->nz = 0; 6392 B->nz = 0;
6393 #ifdef USE_64_BIT_IDX_T 6393 #if defined (ENABLE_64)
6394 B->itype = CHOLMOD_LONG; 6394 B->itype = CHOLMOD_LONG;
6395 #else 6395 #else
6396 B->itype = CHOLMOD_INT; 6396 B->itype = CHOLMOD_INT;
6397 #endif 6397 #endif
6398 B->dtype = CHOLMOD_DOUBLE; 6398 B->dtype = CHOLMOD_DOUBLE;