From dec94b1f47a9888359481a6022a8d81b5e060327 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Tue, 4 Jan 2011 13:40:40 +0000 Subject: [PATCH] mld2p4-2: mlprec/Makefile mlprec/mld_d_prec_type.f90 mlprec/mld_d_umf_solver.f90 mlprec/mld_dmlprec_bld.f90 mlprec/mld_dprecbld.f90 mlprec/mld_dumf_interface.c Added D_UMF_SOLVER. The configry stuff for UMFPACK should be upgraded, but this is complicated by the UMFPACK 5 install features. --- mlprec/Makefile | 3 +- mlprec/mld_d_prec_type.f90 | 9 +- mlprec/mld_d_umf_solver.f90 | 471 ++++++++++++++++++++++++++++++++++++ mlprec/mld_dmlprec_bld.f90 | 3 + mlprec/mld_dprecbld.f90 | 3 + mlprec/mld_dumf_interface.c | 152 ++++-------- 6 files changed, 534 insertions(+), 107 deletions(-) create mode 100644 mlprec/mld_d_umf_solver.f90 diff --git a/mlprec/Makefile b/mlprec/Makefile index 7d3467e1..dcacf1bb 100644 --- a/mlprec/Makefile +++ b/mlprec/Makefile @@ -13,7 +13,8 @@ MODOBJS=mld_base_prec_type.o \ mld_d_ilu_solver.o mld_d_diag_solver.o mld_d_jac_smoother.o mld_d_as_smoother.o \ mld_s_ilu_solver.o mld_s_diag_solver.o mld_s_jac_smoother.o mld_s_as_smoother.o \ mld_c_ilu_solver.o mld_c_diag_solver.o mld_c_jac_smoother.o mld_c_as_smoother.o \ - mld_z_ilu_solver.o mld_z_diag_solver.o mld_z_jac_smoother.o mld_z_as_smoother.o + mld_z_ilu_solver.o mld_z_diag_solver.o mld_z_jac_smoother.o mld_z_as_smoother.o \ + mld_d_umf_solver.o MPFOBJS=mld_daggrmat_nosmth_asb.o mld_daggrmat_smth_asb.o mld_daggrmat_minnrg_asb.o \ mld_saggrmat_nosmth_asb.o mld_saggrmat_smth_asb.o \ mld_caggrmat_nosmth_asb.o mld_caggrmat_smth_asb.o \ diff --git a/mlprec/mld_d_prec_type.f90 b/mlprec/mld_d_prec_type.f90 index b366e53a..f3fd2f27 100644 --- a/mlprec/mld_d_prec_type.f90 +++ b/mlprec/mld_d_prec_type.f90 @@ -570,10 +570,10 @@ contains if (p%iprcparm(mld_sub_solve_) == mld_sludist_) then call mld_dsludist_free(p%iprcparm(mld_slud_ptr_),info) end if - if (p%iprcparm(mld_sub_solve_) == mld_umf_) then - call mld_dumf_free(p%iprcparm(mld_umf_symptr_),& - & p%iprcparm(mld_umf_numptr_),info) - end if +!!$ if (p%iprcparm(mld_sub_solve_) == mld_umf_) then +!!$ call mld_dumf_free(p%iprcparm(mld_umf_symptr_),& +!!$ & p%iprcparm(mld_umf_numptr_),info) +!!$ end if end if deallocate(p%iprcparm,stat=info) end if @@ -593,6 +593,7 @@ contains ! Actually we might just deallocate the top level array, except ! for the inner UMFPACK or SLU stuff + call p%sm%free(info) call mld_precfree(p%prec,info) call p%ac%free() diff --git a/mlprec/mld_d_umf_solver.f90 b/mlprec/mld_d_umf_solver.f90 new file mode 100644 index 00000000..772942bb --- /dev/null +++ b/mlprec/mld_d_umf_solver.f90 @@ -0,0 +1,471 @@ +!!$ +!!$ +!!$ MLD2P4 version 2.0 +!!$ MultiLevel Domain Decomposition Parallel Preconditioners Package +!!$ based on PSBLAS (Parallel Sparse BLAS version 3.0) +!!$ +!!$ (C) Copyright 2008,2009,2010, 2010 +!!$ +!!$ Salvatore Filippone University of Rome Tor Vergata +!!$ Alfredo Buttari CNRS-IRIT, Toulouse +!!$ Pasqua D'Ambra ICAR-CNR, Naples +!!$ Daniela di Serafino Second University of Naples +!!$ +!!$ Redistribution and use in source and binary forms, with or without +!!$ modification, are permitted provided that the following conditions +!!$ are met: +!!$ 1. Redistributions of source code must retain the above copyright +!!$ notice, this list of conditions and the following disclaimer. +!!$ 2. Redistributions in binary form must reproduce the above copyright +!!$ notice, this list of conditions, and the following disclaimer in the +!!$ documentation and/or other materials provided with the distribution. +!!$ 3. The name of the MLD2P4 group or the names of its contributors may +!!$ not be used to endorse or promote products derived from this +!!$ software without specific written permission. +!!$ +!!$ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +!!$ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +!!$ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +!!$ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +!!$ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +!!$ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +!!$ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +!!$ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +!!$ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +!!$ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +!!$ POSSIBILITY OF SUCH DAMAGE. +!!$ +!!$ +! +! +! +! +! +! + +module mld_d_umf_solver + + use iso_c_binding + use mld_d_prec_type + + type, extends(mld_d_base_solver_type) :: mld_d_umf_solver_type +!!$ type(psb_dspmat_type) :: l, u +!!$ real(psb_dpk_), allocatable :: d(:) + type(c_ptr) :: symbolic=c_null_ptr, numeric=c_null_ptr + integer(c_long_long) :: symbsize=0, numsize=0 +!!$ integer :: fact_type, fill_in +!!$ real(psb_dpk_) :: thresh + contains + procedure, pass(sv) :: build => d_umf_solver_bld + procedure, pass(sv) :: apply => d_umf_solver_apply + procedure, pass(sv) :: free => d_umf_solver_free + procedure, pass(sv) :: seti => d_umf_solver_seti + procedure, pass(sv) :: setc => d_umf_solver_setc + procedure, pass(sv) :: setr => d_umf_solver_setr + procedure, pass(sv) :: descr => d_umf_solver_descr + procedure, pass(sv) :: sizeof => d_umf_solver_sizeof + end type mld_d_umf_solver_type + + + private :: d_umf_solver_bld, d_umf_solver_apply, & + & d_umf_solver_free, d_umf_solver_seti, & + & d_umf_solver_setc, d_umf_solver_setr,& + & d_umf_solver_descr, d_umf_solver_sizeof + + + interface + function mld_dumf_fact(n,nnz,values,rowind,colptr,& + & symptr,numptr,ssize,nsize)& + & bind(c,name='mld_dumf_fact') result(info) + use iso_c_binding + integer(c_int), value :: n,nnz + integer(c_int) :: info + integer(c_long_long) :: ssize, nsize + integer(c_int) :: rowind(*),colptr(*) + real(c_double) :: values(*) + type(c_ptr) :: symptr, numptr + end function mld_dumf_fact + end interface + + interface + function mld_dumf_solve(itrans,n,x, b, ldb, numptr)& + & bind(c,name='mld_dumf_solve') result(info) + use iso_c_binding + integer(c_int) :: info + integer(c_int), value :: itrans,n,ldb + real(c_double) :: x(*), b(ldb,*) + type(c_ptr), value :: numptr + end function mld_dumf_solve + end interface + + interface + function mld_dumf_free(symptr, numptr)& + & bind(c,name='mld_dumf_free') result(info) + use iso_c_binding + integer(c_int) :: info + type(c_ptr), value :: symptr, numptr + end function mld_dumf_free + end interface + +contains + + subroutine d_umf_solver_apply(alpha,sv,x,beta,y,desc_data,trans,work,info) + use psb_sparse_mod + type(psb_desc_type), intent(in) :: desc_data + class(mld_d_umf_solver_type), intent(in) :: sv + real(psb_dpk_),intent(in) :: x(:) + real(psb_dpk_),intent(inout) :: y(:) + real(psb_dpk_),intent(in) :: alpha,beta + character(len=1),intent(in) :: trans + real(psb_dpk_),target, intent(inout) :: work(:) + integer, intent(out) :: info + + integer :: n_row,n_col + real(psb_dpk_), pointer :: ww(:) + integer :: ictxt,np,me,i, err_act + character :: trans_ + character(len=20) :: name='d_umf_solver_apply' + + call psb_erractionsave(err_act) + + info = psb_success_ + + trans_ = psb_toupper(trans) + select case(trans_) + case('N') + case('T','C') + case default + call psb_errpush(psb_err_iarg_invalid_i_,name) + goto 9999 + end select + + n_row = psb_cd_get_local_rows(desc_data) + n_col = psb_cd_get_local_cols(desc_data) + + if (n_col <= size(work)) then + ww => work(1:n_col) + else + allocate(ww(n_col),stat=info) + if (info /= psb_success_) then + info=psb_err_alloc_request_ + call psb_errpush(info,name,i_err=(/n_col,0,0,0,0/),& + & a_err='real(psb_dpk_)') + goto 9999 + end if + endif + + select case(trans_) + case('N') + info = mld_dumf_solve(0,n_row,ww,x,n_row,sv%numeric) + case('T','C') + info = mld_dumf_solve(1,n_row,ww,x,n_row,sv%numeric) + case default + call psb_errpush(psb_err_internal_error_,name,a_err='Invalid TRANS in ILU subsolve') + goto 9999 + end select + + if (info == psb_success_) call psb_geaxpby(alpha,ww,beta,y,desc_data,info) + + + if (info /= psb_success_) then + call psb_errpush(psb_err_internal_error_,name,a_err='Error in subsolve') + goto 9999 + endif + + if (n_col > size(work)) then + deallocate(ww) + endif + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + + end subroutine d_umf_solver_apply + + subroutine d_umf_solver_bld(a,desc_a,sv,upd,info,b) + + use psb_sparse_mod + + Implicit None + + ! Arguments + type(psb_dspmat_type), intent(in), target :: a + Type(psb_desc_type), Intent(in) :: desc_a + class(mld_d_umf_solver_type), intent(inout) :: sv + character, intent(in) :: upd + integer, intent(out) :: info + type(psb_dspmat_type), intent(in), target, optional :: b + ! Local variables + type(psb_dspmat_type) :: atmp + type(psb_d_csc_sparse_mat) :: acsc + integer :: n_row,n_col, nrow_a, nztota + real(psb_dpk_), pointer :: ww(:), aux(:), tx(:),ty(:) + integer :: ictxt,np,me,i, err_act, debug_unit, debug_level + character(len=20) :: name='d_umf_solver_bld', ch_err + + info=psb_success_ + call psb_erractionsave(err_act) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + ictxt = psb_cd_get_context(desc_a) + call psb_info(ictxt, me, np) + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),' start' + + + n_row = psb_cd_get_local_rows(desc_a) + n_row = psb_cd_get_local_cols(desc_a) + + if (psb_toupper(upd) == 'F') then + + call a%cscnv(atmp,info,type='coo') + call psb_rwextd(n_row,atmp,info,b=b) + call atmp%mv_to(acsc) + nrow_a = acsc%get_nrows() + nztota = acsc%get_nzeros() + + ! Fix the entres to call C-base UMFPACK. + acsc%ia(:) = acsc%ia(:) - 1 + acsc%icp(:) = acsc%icp(:) - 1 + info = mld_dumf_fact(nrow_a,nztota,acsc%val,& + & acsc%ia,acsc%icp,sv%symbolic,sv%numeric,& + & sv%symbsize,sv%numsize) + + if (info /= psb_success_) then + info=psb_err_from_subroutine_ + ch_err='mld_dumf_fact' + call psb_errpush(info,name,a_err=ch_err) + goto 9999 + end if + + call acsc%free() + call atmp%free() + else + ! ? + info=psb_err_internal_error_ + call psb_errpush(info,name) + goto 9999 + + end if + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),' end' + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_bld + + + subroutine d_umf_solver_seti(sv,what,val,info) + + use psb_sparse_mod + + Implicit None + + ! Arguments + class(mld_d_umf_solver_type), intent(inout) :: sv + integer, intent(in) :: what + integer, intent(in) :: val + integer, intent(out) :: info + Integer :: err_act + character(len=20) :: name='d_umf_solver_seti' + + info = psb_success_ + call psb_erractionsave(err_act) + + select case(what) + case default +!!$ write(0,*) name,': Error: invalid WHAT' +!!$ info = -2 + end select + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_seti + + subroutine d_umf_solver_setc(sv,what,val,info) + + use psb_sparse_mod + + Implicit None + + ! Arguments + class(mld_d_umf_solver_type), intent(inout) :: sv + integer, intent(in) :: what + character(len=*), intent(in) :: val + integer, intent(out) :: info + Integer :: err_act, ival + character(len=20) :: name='d_umf_solver_setc' + + info = psb_success_ + call psb_erractionsave(err_act) + + + call mld_stringval(val,ival,info) + if (info == psb_success_) call sv%set(what,ival,info) + if (info /= psb_success_) then + info = psb_err_from_subroutine_ + call psb_errpush(info, name) + goto 9999 + end if + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_setc + + subroutine d_umf_solver_setr(sv,what,val,info) + + use psb_sparse_mod + + Implicit None + + ! Arguments + class(mld_d_umf_solver_type), intent(inout) :: sv + integer, intent(in) :: what + real(psb_dpk_), intent(in) :: val + integer, intent(out) :: info + Integer :: err_act + character(len=20) :: name='d_umf_solver_setr' + + call psb_erractionsave(err_act) + info = psb_success_ + + select case(what) + case default +!!$ write(0,*) name,': Error: invalid WHAT' +!!$ info = -2 +!!$ goto 9999 + end select + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_setr + + subroutine d_umf_solver_free(sv,info) + + use psb_sparse_mod + + Implicit None + + ! Arguments + class(mld_d_umf_solver_type), intent(inout) :: sv + integer, intent(out) :: info + Integer :: err_act + character(len=20) :: name='d_umf_solver_free' + + call psb_erractionsave(err_act) + + + info = mld_dumf_free(sv%symbolic,sv%numeric) + + if (info /= psb_success_) goto 9999 + sv%symbolic = c_null_ptr + sv%numeric = c_null_ptr + sv%symbsize = 0 + sv%numsize = 0 + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_free + + subroutine d_umf_solver_descr(sv,info,iout) + + use psb_sparse_mod + + Implicit None + + ! Arguments + class(mld_d_umf_solver_type), intent(in) :: sv + integer, intent(out) :: info + integer, intent(in), optional :: iout + + ! Local variables + integer :: err_act + integer :: ictxt, me, np + character(len=20), parameter :: name='mld_d_umf_solver_descr' + integer :: iout_ + + call psb_erractionsave(err_act) + info = psb_success_ + if (present(iout)) then + iout_ = iout + else + iout_ = 6 + endif + + write(iout_,*) ' UMFPACK Sparse Factorization Solver. ' + + call psb_erractionrestore(err_act) + return + +9999 continue + call psb_erractionrestore(err_act) + if (err_act == psb_act_abort_) then + call psb_error() + return + end if + return + end subroutine d_umf_solver_descr + + function d_umf_solver_sizeof(sv) result(val) + use psb_sparse_mod + implicit none + ! Arguments + class(mld_d_umf_solver_type), intent(in) :: sv + integer(psb_long_int_k_) :: val + integer :: i + + val = 2*psb_sizeof_int + psb_sizeof_dp + val = val + sv%symbsize + val = val + sv%numsize + return + end function d_umf_solver_sizeof + +end module mld_d_umf_solver diff --git a/mlprec/mld_dmlprec_bld.f90 b/mlprec/mld_dmlprec_bld.f90 index c8bc0eb9..79650b16 100644 --- a/mlprec/mld_dmlprec_bld.f90 +++ b/mlprec/mld_dmlprec_bld.f90 @@ -73,6 +73,7 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info) use mld_d_as_smoother use mld_d_diag_solver use mld_d_ilu_solver + use mld_d_umf_solver Implicit None @@ -358,6 +359,8 @@ subroutine mld_dmlprec_bld(a,desc_a,p,info) & p%precv(i)%prec%rprcparm(mld_sub_iluthrs_),info) case(mld_diag_scale_) allocate(mld_d_diag_solver_type :: p%precv(i)%sm%sv, stat=info) + case(mld_umf_) + allocate(mld_d_umf_solver_type :: p%precv(i)%sm%sv, stat=info) case default info = -1 end select diff --git a/mlprec/mld_dprecbld.f90 b/mlprec/mld_dprecbld.f90 index 50e17e09..a73d7518 100644 --- a/mlprec/mld_dprecbld.f90 +++ b/mlprec/mld_dprecbld.f90 @@ -67,6 +67,7 @@ subroutine mld_dprecbld(a,desc_a,p,info) use mld_d_as_smoother use mld_d_diag_solver use mld_d_ilu_solver + use mld_d_umf_solver Implicit None @@ -227,6 +228,8 @@ subroutine mld_dprecbld(a,desc_a,p,info) & p%precv(1)%prec%rprcparm(mld_sub_iluthrs_),info) case(mld_diag_scale_) allocate(mld_d_diag_solver_type :: p%precv(1)%sm%sv, stat=info) + case(mld_umf_) + allocate(mld_d_umf_solver_type :: p%precv(1)%sm%sv, stat=info) case default info = -1 end select diff --git a/mlprec/mld_dumf_interface.c b/mlprec/mld_dumf_interface.c index fe3a2e8b..4ae51785 100644 --- a/mlprec/mld_dumf_interface.c +++ b/mlprec/mld_dumf_interface.c @@ -76,39 +76,6 @@ Availability: */ - -#ifdef LowerUndescore -#define mld_dumf_fact_ mld_dumf_fact_ -#define mld_dumf_solve_ mld_dumf_solve_ -#define mld_dumf_free_ mld_dumf_free_ -#endif -#ifdef LowerDoubleUndescore -#define mld_dumf_fact_ mld_dumf_fact__ -#define mld_dumf_solve_ mld_dumf_solve__ -#define mld_dumf_free_ mld_dumf_free__ -#endif -#ifdef LowerCase -#define mld_dumf_fact_ mld_dumf_fact -#define mld_dumf_solve_ mld_dumf_solve -#define mld_dumf_free_ mld_dumf_free -#endif -#ifdef UpperUndescore -#define mld_dumf_fact_ MLD_DUMF_FACT_ -#define mld_dumf_solve_ MLD_DUMF_SOLVE_ -#define mld_dumf_free_ MLD_DUMF_FREE_ -#endif -#ifdef UpperDoubleUndescore -#define mld_dumf_fact_ MLD_DUMF_FACT__ -#define mld_dumf_solve_ MLD_DUMF_SOLVE__ -#define mld_dumf_free_ MLD_DUMF_FREE__ -#endif -#ifdef UpperCase -#define mld_dumf_fact_ MLD_DUMF_FACT -#define mld_dumf_solve_ MLD_DUMF_SOLVE -#define mld_dumf_free_ MLD_DUMF_FREE -#endif - - #include #ifdef Have_UMF_ #include "umfpack.h" @@ -120,133 +87,114 @@ typedef long long fptr; typedef int fptr; /* 32-bit by default */ #endif -void -mld_dumf_fact_(int *n, int *nnz, - double *values, int *rowind, int *colptr, -#ifdef Have_UMF_ - fptr *symptr, - fptr *numptr, - -#else - void *symptr, - void *numptr, -#endif - int *info) +int mld_dumf_fact(int n, int nnz, + double *values, int *rowind, int *colptr, + void **symptr, void **numptr, + long long int *ssize, + long long int *nsize) { #ifdef Have_UMF_ double Info [UMFPACK_INFO], Control [UMFPACK_CONTROL]; void *Symbolic, *Numeric ; - int i; + int i, info; + long long int tmp; umfpack_di_defaults(Control); - for (i = 0; i <= *n; ++i) --colptr[i]; - for (i = 0; i < *nnz; ++i) --rowind[i]; - *info = umfpack_di_symbolic (*n, *n, colptr, rowind, values, &Symbolic, + info = umfpack_di_symbolic (n, n, colptr, rowind, values, &Symbolic, Control, Info); - if ( *info == UMFPACK_OK ) { - *info = 0; + if ( info == UMFPACK_OK ) { + info = 0; } else { - printf("umfpack_di_symbolic() error returns INFO= %d\n", *info); - *info = -11; - *numptr = (fptr) NULL; - return; + printf("umfpack_di_symbolic() error returns INFO= %d\n", info); + *symptr = (void *) NULL; + *numptr = (void *) NULL; + return -11; } - *symptr = (fptr) Symbolic; - - *info = umfpack_di_numeric (colptr, rowind, values, Symbolic, &Numeric, + *symptr = Symbolic; + *ssize = Info[UMFPACK_SYMBOLIC_SIZE]; + *ssize *= Info[UMFPACK_SIZE_OF_UNIT]; + + info = umfpack_di_numeric (colptr, rowind, values, Symbolic, &Numeric, Control, Info) ; - if ( *info == UMFPACK_OK ) { - *info = 0; - *numptr = (fptr) Numeric; + if ( info == UMFPACK_OK ) { + info = 0; + *numptr = Numeric; + *nsize = Info[UMFPACK_NUMERIC_SIZE]; + *nsize *= Info[UMFPACK_SIZE_OF_UNIT]; + } else { - printf("umfpack_di_numeric() error returns INFO= %d\n", *info); - *info = -12; - *numptr = (fptr) NULL; + printf("umfpack_di_numeric() error returns INFO= %d\n", info); + info = -12; + *numptr = NULL; } - - for (i = 0; i <= *n; ++i) ++colptr[i]; - for (i = 0; i < *nnz; ++i) ++rowind[i]; + + + return info; + #else fprintf(stderr," UMF Not Configured, fix make.inc and recompile\n"); - *info=-1; + return -1; #endif } -void -mld_dumf_solve_(int *itrans, int *n, - double *x, double *b, int *ldb, -#ifdef Have_UMF_ - fptr *numptr, - -#else - void *numptr, -#endif - int *info) +int mld_dumf_solve(int itrans, int n, + double *x, double *b, int ldb, + void *numptr) { #ifdef Have_UMF_ double Info [UMFPACK_INFO], Control [UMFPACK_CONTROL]; void *Symbolic, *Numeric ; - int i,trans; + int i,trans, info; umfpack_di_defaults(Control); Control[UMFPACK_IRSTEP]=0; - if (*itrans == 0) { + if (itrans == 0) { trans = UMFPACK_A; - } else if (*itrans ==1) { + } else if (itrans ==1) { trans = UMFPACK_At; } else { trans = UMFPACK_A; } - *info = umfpack_di_solve(trans,NULL,NULL,NULL, - x,b,(void *) *numptr,Control,Info); - + info = umfpack_di_solve(trans,NULL,NULL,NULL, + x,b,numptr,Control,Info); + return info; #else - fprintf(stderr," UMF Not Configured, fix make.inc and recompile\n"); - *info=-1; + fprintf(stderr," UMF Not Configured, fix make.inc and recompile\n"); + return -1; #endif } -void -mld_dumf_free_( -#ifdef Have_UMF_ - fptr *symptr, - fptr *numptr, - -#else - void *symptr, - void *numptr, -#endif - int *info) +int mld_dumf_free(void *symptr, void *numptr) { #ifdef Have_UMF_ void *Symbolic, *Numeric ; - Symbolic = (void *) *symptr; - Numeric = (void *) *numptr; + Symbolic = symptr; + Numeric = numptr; umfpack_di_free_numeric(&Numeric); umfpack_di_free_symbolic(&Symbolic); - *info=0; + return 0; #else - fprintf(stderr," UMF Not Configured, fix make.inc and recompile\n"); - *info=-1; + fprintf(stderr," UMF Not Configured, fix make.inc and recompile\n"); + return -1; #endif }