GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Umfpack: UF_long has been removed in recent versions of suitesparse, and fix a few long-to-int conversions issues.

Browse Source
This commit is contained in:
Gael Guennebaud 2018-04-11 09:59:59 +02:00
parent 0050709ea7
commit c91906b065
2 changed files with 59 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Eigen/src/UmfPackSupport/UmfPackSupport.h
View File

@ -10,6 +10,16 @@
#ifndef EIGEN_UMFPACKSUPPORT_H #ifndef EIGEN_UMFPACKSUPPORT_H
#define EIGEN_UMFPACKSUPPORT_H #define EIGEN_UMFPACKSUPPORT_H
// for compatibility with super old version of umfpack,
// not sure this is really needed, but this is harmless.
#ifndef SuiteSparse_long
#ifdef UF_long
#define SuiteSparse_long UF_long
#else
#error neither SuiteSparse_long nor UF_long are defined
#endif
#endif
namespace Eigen { namespace Eigen {
/* TODO extract L, extract U, compute det, etc... */ /* TODO extract L, extract U, compute det, etc... */
@ -24,10 +34,10 @@ inline void umfpack_defaults(double control[UMFPACK_CONTROL], double, int)
inline void umfpack_defaults(double control[UMFPACK_CONTROL], std::complex<double>, int) inline void umfpack_defaults(double control[UMFPACK_CONTROL], std::complex<double>, int)
{ umfpack_zi_defaults(control); } { umfpack_zi_defaults(control); }
inline void umfpack_defaults(double control[UMFPACK_CONTROL], double, UF_long) inline void umfpack_defaults(double control[UMFPACK_CONTROL], double, SuiteSparse_long)
{ umfpack_dl_defaults(control); } { umfpack_dl_defaults(control); }
inline void umfpack_defaults(double control[UMFPACK_CONTROL], std::complex<double>, UF_long) inline void umfpack_defaults(double control[UMFPACK_CONTROL], std::complex<double>, SuiteSparse_long)
{ umfpack_zl_defaults(control); } { umfpack_zl_defaults(control); }
// Report info // Report info
@ -37,10 +47,10 @@ inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMF
inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], std::complex<double>, int) inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], std::complex<double>, int)
{ umfpack_zi_report_info(control, info);} { umfpack_zi_report_info(control, info);}
inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], double, UF_long) inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], double, SuiteSparse_long)
{ umfpack_dl_report_info(control, info);} { umfpack_dl_report_info(control, info);}
inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], std::complex<double>, UF_long) inline void umfpack_report_info(double control[UMFPACK_CONTROL], double info[UMFPACK_INFO], std::complex<double>, SuiteSparse_long)
{ umfpack_zl_report_info(control, info);} { umfpack_zl_report_info(control, info);}
// Report status // Report status
@ -50,10 +60,10 @@ inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, d
inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, std::complex<double>, int) inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, std::complex<double>, int)
{ umfpack_zi_report_status(control, status);} { umfpack_zi_report_status(control, status);}
inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, double, UF_long) inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, double, SuiteSparse_long)
{ umfpack_dl_report_status(control, status);} { umfpack_dl_report_status(control, status);}
inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, std::complex<double>, UF_long) inline void umfpack_report_status(double control[UMFPACK_CONTROL], int status, std::complex<double>, SuiteSparse_long)
{ umfpack_zl_report_status(control, status);} { umfpack_zl_report_status(control, status);}
// report control // report control
@ -63,10 +73,10 @@ inline void umfpack_report_control(double control[UMFPACK_CONTROL], double, int)
inline void umfpack_report_control(double control[UMFPACK_CONTROL], std::complex<double>, int) inline void umfpack_report_control(double control[UMFPACK_CONTROL], std::complex<double>, int)
{ umfpack_zi_report_control(control);} { umfpack_zi_report_control(control);}
inline void umfpack_report_control(double control[UMFPACK_CONTROL], double, UF_long) inline void umfpack_report_control(double control[UMFPACK_CONTROL], double, SuiteSparse_long)
{ umfpack_dl_report_control(control);} { umfpack_dl_report_control(control);}
inline void umfpack_report_control(double control[UMFPACK_CONTROL], std::complex<double>, UF_long) inline void umfpack_report_control(double control[UMFPACK_CONTROL], std::complex<double>, SuiteSparse_long)
{ umfpack_zl_report_control(control);} { umfpack_zl_report_control(control);}
// Free numeric // Free numeric
@ -76,10 +86,10 @@ inline void umfpack_free_numeric(void **Numeric, double, int)
inline void umfpack_free_numeric(void **Numeric, std::complex<double>, int) inline void umfpack_free_numeric(void **Numeric, std::complex<double>, int)
{ umfpack_zi_free_numeric(Numeric); *Numeric = 0; } { umfpack_zi_free_numeric(Numeric); *Numeric = 0; }
inline void umfpack_free_numeric(void **Numeric, double, UF_long) inline void umfpack_free_numeric(void **Numeric, double, SuiteSparse_long)
{ umfpack_dl_free_numeric(Numeric); *Numeric = 0; } { umfpack_dl_free_numeric(Numeric); *Numeric = 0; }
inline void umfpack_free_numeric(void **Numeric, std::complex<double>, UF_long) inline void umfpack_free_numeric(void **Numeric, std::complex<double>, SuiteSparse_long)
{ umfpack_zl_free_numeric(Numeric); *Numeric = 0; } { umfpack_zl_free_numeric(Numeric); *Numeric = 0; }
// Free symbolic // Free symbolic
@ -89,10 +99,10 @@ inline void umfpack_free_symbolic(void **Symbolic, double, int)
inline void umfpack_free_symbolic(void **Symbolic, std::complex<double>, int) inline void umfpack_free_symbolic(void **Symbolic, std::complex<double>, int)
{ umfpack_zi_free_symbolic(Symbolic); *Symbolic = 0; } { umfpack_zi_free_symbolic(Symbolic); *Symbolic = 0; }
inline void umfpack_free_symbolic(void **Symbolic, double, UF_long) inline void umfpack_free_symbolic(void **Symbolic, double, SuiteSparse_long)
{ umfpack_dl_free_symbolic(Symbolic); *Symbolic = 0; } { umfpack_dl_free_symbolic(Symbolic); *Symbolic = 0; }
inline void umfpack_free_symbolic(void **Symbolic, std::complex<double>, UF_long) inline void umfpack_free_symbolic(void **Symbolic, std::complex<double>, SuiteSparse_long)
{ umfpack_zl_free_symbolic(Symbolic); *Symbolic = 0; } { umfpack_zl_free_symbolic(Symbolic); *Symbolic = 0; }
// Symbolic // Symbolic
@ -109,15 +119,15 @@ inline int umfpack_symbolic(int n_row,int n_col,
{ {
return umfpack_zi_symbolic(n_row,n_col,Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Control,Info); return umfpack_zi_symbolic(n_row,n_col,Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Control,Info);
} }
inline int umfpack_symbolic(UF_long n_row,UF_long n_col, inline SuiteSparse_long umfpack_symbolic( SuiteSparse_long n_row,SuiteSparse_long n_col,
const UF_long Ap[], const UF_long Ai[], const double Ax[], void **Symbolic, const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const double Ax[], void **Symbolic,
const double Control [UMFPACK_CONTROL], double Info [UMFPACK_INFO]) const double Control [UMFPACK_CONTROL], double Info [UMFPACK_INFO])
{ {
return umfpack_dl_symbolic(n_row,n_col,Ap,Ai,Ax,Symbolic,Control,Info); return umfpack_dl_symbolic(n_row,n_col,Ap,Ai,Ax,Symbolic,Control,Info);
} }
inline int umfpack_symbolic(UF_long n_row,UF_long n_col, inline SuiteSparse_long umfpack_symbolic( SuiteSparse_long n_row,SuiteSparse_long n_col,
const UF_long Ap[], const UF_long Ai[], const std::complex<double> Ax[], void **Symbolic, const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const std::complex<double> Ax[], void **Symbolic,
const double Control [UMFPACK_CONTROL], double Info [UMFPACK_INFO]) const double Control [UMFPACK_CONTROL], double Info [UMFPACK_INFO])
{ {
return umfpack_zl_symbolic(n_row,n_col,Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Control,Info); return umfpack_zl_symbolic(n_row,n_col,Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Control,Info);
@ -137,14 +147,14 @@ inline int umfpack_numeric( const int Ap[], const int Ai[], const std::complex<d
{ {
return umfpack_zi_numeric(Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Numeric,Control,Info); return umfpack_zi_numeric(Ap,Ai,&numext::real_ref(Ax[0]),0,Symbolic,Numeric,Control,Info);
} }
inline int umfpack_numeric( const UF_long Ap[], const UF_long Ai[], const double Ax[], inline SuiteSparse_long umfpack_numeric(const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const double Ax[],
void *Symbolic, void **Numeric, void *Symbolic, void **Numeric,
const double Control[UMFPACK_CONTROL],double Info [UMFPACK_INFO]) const double Control[UMFPACK_CONTROL],double Info [UMFPACK_INFO])
{ {
return umfpack_dl_numeric(Ap,Ai,Ax,Symbolic,Numeric,Control,Info); return umfpack_dl_numeric(Ap,Ai,Ax,Symbolic,Numeric,Control,Info);
} }
inline int umfpack_numeric( const UF_long Ap[], const UF_long Ai[], const std::complex<double> Ax[], inline SuiteSparse_long umfpack_numeric(const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const std::complex<double> Ax[],
void *Symbolic, void **Numeric, void *Symbolic, void **Numeric,
const double Control[UMFPACK_CONTROL],double Info [UMFPACK_INFO]) const double Control[UMFPACK_CONTROL],double Info [UMFPACK_INFO])
{ {
@ -166,14 +176,14 @@ inline int umfpack_solve( int sys, const int Ap[], const int Ai[], const std::co
return umfpack_zi_solve(sys,Ap,Ai,&numext::real_ref(Ax[0]),0,&numext::real_ref(X[0]),0,&numext::real_ref(B[0]),0,Numeric,Control,Info); return umfpack_zi_solve(sys,Ap,Ai,&numext::real_ref(Ax[0]),0,&numext::real_ref(X[0]),0,&numext::real_ref(B[0]),0,Numeric,Control,Info);
} }
inline int umfpack_solve( int sys, const UF_long Ap[], const UF_long Ai[], const double Ax[], inline SuiteSparse_long umfpack_solve(int sys, const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const double Ax[],
double X[], const double B[], void *Numeric, double X[], const double B[], void *Numeric,
const double Control[UMFPACK_CONTROL], double Info[UMFPACK_INFO]) const double Control[UMFPACK_CONTROL], double Info[UMFPACK_INFO])
{ {
return umfpack_dl_solve(sys,Ap,Ai,Ax,X,B,Numeric,Control,Info); return umfpack_dl_solve(sys,Ap,Ai,Ax,X,B,Numeric,Control,Info);
} }
inline int umfpack_solve( int sys, const UF_long Ap[], const UF_long Ai[], const std::complex<double> Ax[], inline SuiteSparse_long umfpack_solve(int sys, const SuiteSparse_long Ap[], const SuiteSparse_long Ai[], const std::complex<double> Ax[],
std::complex<double> X[], const std::complex<double> B[], void *Numeric, std::complex<double> X[], const std::complex<double> B[], void *Numeric,
const double Control[UMFPACK_CONTROL], double Info[UMFPACK_INFO]) const double Control[UMFPACK_CONTROL], double Info[UMFPACK_INFO])
{ {
@ -191,12 +201,14 @@ inline int umfpack_get_lunz(int *lnz, int *unz, int *n_row, int *n_col, int *nz_
return umfpack_zi_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric); return umfpack_zi_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric);
} }
inline int umfpack_get_lunz(UF_long *lnz, UF_long *unz, UF_long *n_row, UF_long *n_col, UF_long *nz_udiag, void *Numeric, double) inline SuiteSparse_long umfpack_get_lunz( SuiteSparse_long *lnz, SuiteSparse_long *unz, SuiteSparse_long *n_row, SuiteSparse_long *n_col,
SuiteSparse_long *nz_udiag, void *Numeric, double)
{ {
return umfpack_dl_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric); return umfpack_dl_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric);
} }
inline int umfpack_get_lunz(UF_long *lnz, UF_long *unz, UF_long *n_row, UF_long *n_col, UF_long *nz_udiag, void *Numeric, std::complex<double>) inline SuiteSparse_long umfpack_get_lunz( SuiteSparse_long *lnz, SuiteSparse_long *unz, SuiteSparse_long *n_row, SuiteSparse_long *n_col,
SuiteSparse_long *nz_udiag, void *Numeric, std::complex<double>)
{ {
return umfpack_zl_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric); return umfpack_zl_get_lunz(lnz,unz,n_row,n_col,nz_udiag,Numeric);
} }
@ -217,14 +229,14 @@ inline int umfpack_get_numeric(int Lp[], int Lj[], std::complex<double> Lx[], in
return umfpack_zi_get_numeric(Lp,Lj,Lx?&lx0_real:0,0,Up,Ui,Ux?&ux0_real:0,0,P,Q, return umfpack_zi_get_numeric(Lp,Lj,Lx?&lx0_real:0,0,Up,Ui,Ux?&ux0_real:0,0,P,Q,
Dx?&dx0_real:0,0,do_recip,Rs,Numeric); Dx?&dx0_real:0,0,do_recip,Rs,Numeric);
} }
inline int umfpack_get_numeric(UF_long Lp[], UF_long Lj[], double Lx[], UF_long Up[], UF_long Ui[], double Ux[], inline SuiteSparse_long umfpack_get_numeric(SuiteSparse_long Lp[], SuiteSparse_long Lj[], double Lx[], SuiteSparse_long Up[], SuiteSparse_long Ui[], double Ux[],
UF_long P[], UF_long Q[], double Dx[], UF_long *do_recip, double Rs[], void *Numeric) SuiteSparse_long P[], SuiteSparse_long Q[], double Dx[], SuiteSparse_long *do_recip, double Rs[], void *Numeric)
{ {
return umfpack_dl_get_numeric(Lp,Lj,Lx,Up,Ui,Ux,P,Q,Dx,do_recip,Rs,Numeric); return umfpack_dl_get_numeric(Lp,Lj,Lx,Up,Ui,Ux,P,Q,Dx,do_recip,Rs,Numeric);
} }
inline int umfpack_get_numeric(UF_long Lp[], UF_long Lj[], std::complex<double> Lx[], UF_long Up[], UF_long Ui[], std::complex<double> Ux[], inline SuiteSparse_long umfpack_get_numeric(SuiteSparse_long Lp[], SuiteSparse_long Lj[], std::complex<double> Lx[], SuiteSparse_long Up[], SuiteSparse_long Ui[], std::complex<double> Ux[],
UF_long P[], UF_long Q[], std::complex<double> Dx[], UF_long *do_recip, double Rs[], void *Numeric) SuiteSparse_long P[], SuiteSparse_long Q[], std::complex<double> Dx[], SuiteSparse_long *do_recip, double Rs[], void *Numeric)
{ {
double& lx0_real = numext::real_ref(Lx[0]); double& lx0_real = numext::real_ref(Lx[0]);
double& ux0_real = numext::real_ref(Ux[0]); double& ux0_real = numext::real_ref(Ux[0]);
@ -245,12 +257,12 @@ inline int umfpack_get_determinant(std::complex<double> *Mx, double *Ex, void *N
return umfpack_zi_get_determinant(&mx_real,0,Ex,NumericHandle,User_Info); return umfpack_zi_get_determinant(&mx_real,0,Ex,NumericHandle,User_Info);
} }
inline int umfpack_get_determinant(double *Mx, double *Ex, void *NumericHandle, double User_Info [UMFPACK_INFO], UF_long) inline SuiteSparse_long umfpack_get_determinant(double *Mx, double *Ex, void *NumericHandle, double User_Info [UMFPACK_INFO], SuiteSparse_long)
{ {
return umfpack_dl_get_determinant(Mx,Ex,NumericHandle,User_Info); return umfpack_dl_get_determinant(Mx,Ex,NumericHandle,User_Info);
} }
inline int umfpack_get_determinant(std::complex<double> *Mx, double *Ex, void *NumericHandle, double User_Info [UMFPACK_INFO], UF_long) inline SuiteSparse_long umfpack_get_determinant(std::complex<double> *Mx, double *Ex, void *NumericHandle, double User_Info [UMFPACK_INFO], SuiteSparse_long)
{ {
double& mx_real = numext::real_ref(*Mx); double& mx_real = numext::real_ref(*Mx);
return umfpack_zl_get_determinant(&mx_real,0,Ex,NumericHandle,User_Info); return umfpack_zl_get_determinant(&mx_real,0,Ex,NumericHandle,User_Info);
@ -532,7 +544,7 @@ class UmfPackLU : public SparseSolverBase<UmfPackLU<_MatrixType> >
// cached data to reduce reallocation, etc. // cached data to reduce reallocation, etc.
mutable LUMatrixType m_l; mutable LUMatrixType m_l;
int m_fact_errorCode; StorageIndex m_fact_errorCode;
UmfpackControl m_control; UmfpackControl m_control;
mutable UmfpackInfo m_umfpackInfo; mutable UmfpackInfo m_umfpackInfo;
@ -601,7 +613,7 @@ bool UmfPackLU<MatrixType>::_solve_impl(const MatrixBase<BDerived> &b, MatrixBas
eigen_assert((XDerived::Flags&RowMajorBit)==0 && "UmfPackLU backend does not support non col-major result yet"); eigen_assert((XDerived::Flags&RowMajorBit)==0 && "UmfPackLU backend does not support non col-major result yet");
eigen_assert(b.derived().data() != x.derived().data() && " Umfpack does not support inplace solve"); eigen_assert(b.derived().data() != x.derived().data() && " Umfpack does not support inplace solve");
int errorCode; StorageIndex errorCode;
Scalar* x_ptr = 0; Scalar* x_ptr = 0;
Matrix<Scalar,Dynamic,1> x_tmp; Matrix<Scalar,Dynamic,1> x_tmp;
if(x.innerStride()!=1) if(x.innerStride()!=1)
@ -615,7 +627,8 @@ bool UmfPackLU<MatrixType>::_solve_impl(const MatrixBase<BDerived> &b, MatrixBas
x_ptr = &x.col(j).coeffRef(0); x_ptr = &x.col(j).coeffRef(0);
errorCode = umfpack_solve(UMFPACK_A, errorCode = umfpack_solve(UMFPACK_A,
mp_matrix.outerIndexPtr(), mp_matrix.innerIndexPtr(), mp_matrix.valuePtr(), mp_matrix.outerIndexPtr(), mp_matrix.innerIndexPtr(), mp_matrix.valuePtr(),
x_ptr, &b.const_cast_derived().col(j).coeffRef(0), m_numeric, m_control.data(), m_umfpackInfo.data()); x_ptr, &b.const_cast_derived().col(j).coeffRef(0),
m_numeric, m_control.data(), m_umfpackInfo.data());
if(x.innerStride()!=1) if(x.innerStride()!=1)
x.col(j) = x_tmp; x.col(j) = x_tmp;
if (errorCode!=0) if (errorCode!=0)

6
test/umfpack_support.cpp
View File

@ -27,8 +27,8 @@ template<typename T1, typename T2> void test_umfpack_support_T()
void test_umfpack_support() void test_umfpack_support()
{ {
CALL_SUBTEST_1((test_umfpack_support_T<double, int>())); CALL_SUBTEST_1((test_umfpack_support_T<double, int>()));
CALL_SUBTEST_2((test_umfpack_support_T<std::complex<double>, int >())); CALL_SUBTEST_2((test_umfpack_support_T<std::complex<double>, int>()));
CALL_SUBTEST_3((test_umfpack_support_T<double, UF_long >())); CALL_SUBTEST_3((test_umfpack_support_T<double, long >()));
CALL_SUBTEST_4((test_umfpack_support_T<std::complex<double>, UF_long >())); CALL_SUBTEST_4((test_umfpack_support_T<std::complex<double>, long>()));
} }