fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'psblas-3.6-maint' into 3.6-recursive

Browse Source
3.6-recursive
Salvatore Filippone 8 years ago
parent bf3212e793 ba72faee7d
commit 53a829d33a
17 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File

4
base/serial/impl/psb_c_mat_impl.F90
Unescape Escape View File

@ -1201,7 +1201,7 @@ subroutine psb_c_cscnv(a,b,info,type,mold,upd,dupl)
call move_alloc(altmp,b%a) call move_alloc(altmp,b%a)
call b%trim() call b%trim()
call b%asb() call b%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -1293,8 +1293,8 @@ subroutine psb_c_cscnv_ip(a,info,type,mold,dupl)
end if end if
call move_alloc(altmp,a%a) call move_alloc(altmp,a%a)
call a%set_asb()
call a%trim() call a%trim()
call a%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

4
base/serial/impl/psb_d_mat_impl.F90
Unescape Escape View File

@ -1201,7 +1201,7 @@ subroutine psb_d_cscnv(a,b,info,type,mold,upd,dupl)
call move_alloc(altmp,b%a) call move_alloc(altmp,b%a)
call b%trim() call b%trim()
call b%asb() call b%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -1293,8 +1293,8 @@ subroutine psb_d_cscnv_ip(a,info,type,mold,dupl)
end if end if
call move_alloc(altmp,a%a) call move_alloc(altmp,a%a)
call a%set_asb()
call a%trim() call a%trim()
call a%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

4
base/serial/impl/psb_s_mat_impl.F90
Unescape Escape View File

@ -1201,7 +1201,7 @@ subroutine psb_s_cscnv(a,b,info,type,mold,upd,dupl)
call move_alloc(altmp,b%a) call move_alloc(altmp,b%a)
call b%trim() call b%trim()
call b%asb() call b%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -1293,8 +1293,8 @@ subroutine psb_s_cscnv_ip(a,info,type,mold,dupl)
end if end if
call move_alloc(altmp,a%a) call move_alloc(altmp,a%a)
call a%set_asb()
call a%trim() call a%trim()
call a%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

4
base/serial/impl/psb_z_mat_impl.F90
Unescape Escape View File

@ -1201,7 +1201,7 @@ subroutine psb_z_cscnv(a,b,info,type,mold,upd,dupl)
call move_alloc(altmp,b%a) call move_alloc(altmp,b%a)
call b%trim() call b%trim()
call b%asb() call b%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -1293,8 +1293,8 @@ subroutine psb_z_cscnv_ip(a,info,type,mold,dupl)
end if end if
call move_alloc(altmp,a%a) call move_alloc(altmp,a%a)
call a%set_asb()
call a%trim() call a%trim()
call a%set_asb()
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

4
config/pac.m4
Unescape Escape View File

@ -1823,8 +1823,8 @@ fi
if test "x$pac_metis_lib_ok" == "xyes" ; then if test "x$pac_metis_lib_ok" == "xyes" ; then
AC_MSG_CHECKING([for METIS_SetDefaultOptions in $LIBS]) AC_MSG_CHECKING([for METIS_SetDefaultOptions in $LIBS])
AC_TRY_LINK_FUNC(METIS_SetDefaultOptions, AC_TRY_LINK_FUNC(METIS_SetDefaultOptions,
[psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; ], [psblas_cv_metis_version="5"; ],
[psblas_cv_have_metis=no;pac_metis_lib_ok="no. Unusable METIS version, sorry."; METIS_LIBS=""]) [psblas_cv_metis_version="4"; ])
AC_MSG_RESULT($pac_metis_lib_ok) AC_MSG_RESULT($pac_metis_lib_ok)
fi fi

6
configure vendored
Unescape Escape View File

@ -11378,12 +11378,12 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes || test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext $as_test_x conftest$ac_exeext
}; then }; then
psblas_cv_have_metis=yes;pac_metis_lib_ok=yes; psblas_cv_metis_version="5";
else else
$as_echo "$as_me: failed program was:" >&5 $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5 sed 's/^/| /' conftest.$ac_ext >&5
psblas_cv_have_metis=no;pac_metis_lib_ok="no. Unusable METIS version, sorry."; METIS_LIBS="" psblas_cv_metis_version="4";
fi fi
rm -rf conftest.dSYM rm -rf conftest.dSYM
@ -11398,7 +11398,7 @@ CPPFLAGS="$SAVE_CPPFLAGS";
if test "x$psblas_cv_have_metis" == "xyes" ; then if test "x$psblas_cv_have_metis" == "xyes" ; then
FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES" FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES"
CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES" CDEFINES="-DHAVE_METIS_ -DMETIS_$psblas_cv_metis_version $psblas_cv_metis_includes $CDEFINES"
fi fi

2
configure.ac
Unescape Escape View File

@ -677,7 +677,7 @@ dnl AC_CHECK_HEADERS([rsb.h], [ LIBS="${LIBS} $want_rsb_libs"], [])
PAC_CHECK_METIS PAC_CHECK_METIS
if test "x$psblas_cv_have_metis" == "xyes" ; then if test "x$psblas_cv_have_metis" == "xyes" ; then
FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES" FDEFINES="$psblas_cv_define_prepend-DHAVE_METIS $FDEFINES"
CDEFINES="-DHAVE_METIS_ $psblas_cv_metis_includes $CDEFINES" CDEFINES="-DHAVE_METIS_ -DMETIS_$psblas_cv_metis_version $psblas_cv_metis_includes $CDEFINES"
fi fi
PAC_CHECK_AMD PAC_CHECK_AMD

2
krylov/psb_ccg.F90
Unescape Escape View File

@ -203,7 +203,7 @@ recursive subroutine psb_ccg_vect(a,prec,b,x,eps,desc_a,info,&
istebz = 0 istebz = 0
end if end if
itx=0 itx=0
alpha = czero
restart: do restart: do
! = ! =

2
krylov/psb_dcg.F90
Unescape Escape View File

@ -211,7 +211,7 @@ recursive subroutine psb_dcg_vect(a,prec,b,x,eps,desc_a,info,&
end if end if
end if end if
itx=0 itx=0
alpha = dzero
restart: do restart: do
! = ! =

2
krylov/psb_scg.F90
Unescape Escape View File

@ -211,7 +211,7 @@ recursive subroutine psb_scg_vect(a,prec,b,x,eps,desc_a,info,&
end if end if
end if end if
itx=0 itx=0
alpha = szero
restart: do restart: do
! = ! =

2
krylov/psb_zcg.F90
Unescape Escape View File

@ -203,7 +203,7 @@ recursive subroutine psb_zcg_vect(a,prec,b,x,eps,desc_a,info,&
istebz = 0 istebz = 0
end if end if
itx=0 itx=0
alpha = zzero
restart: do restart: do
! = ! =

18
util/metis_int.c
Unescape Escape View File

@ -10,6 +10,7 @@ int metis_PartGraphKway_C(int *n, int *ixadj, int *iadj, int *ivwg,
int *graphpart) int *graphpart)
{ {
int res = -1; int res = -1;
#if defined(METIS_5)
idx_t objval = 0; idx_t objval = 0;
idx_t options[METIS_NOPTIONS]; idx_t options[METIS_NOPTIONS];
//printf("Inside Metis/C interface\n"); //printf("Inside Metis/C interface\n");
@ -35,6 +36,23 @@ int metis_PartGraphKway_C(int *n, int *ixadj, int *iadj, int *ivwg,
} else { } else {
return res; return res;
} }
#elif defined(METIS_4)
idxtype objval = 0;
int options[8];
//printf("Inside Metis/C interface\n");
idxtype ncon=1;
int wflag=0;
int numflag=1;
int ecut;
options[0]=0;
METIS_PartGraphKway((int *)n,(idxtype *)ixadj,(idxtype *)iadj,
NULL,NULL,&wflag,&numflag,nparts,options,
&ecut,(idxtype *)graphpart);
return(0);
#elif
choke on me!
#endif
} }

3
util/psb_c_mmio_impl.f90
Unescape Escape View File

@ -346,7 +346,6 @@ subroutine cmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
@ -369,7 +368,6 @@ subroutine cmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
@ -392,7 +390,6 @@ subroutine cmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else else
write(psb_err_unit,*) 'read_matrix: matrix type not yet supported' write(psb_err_unit,*) 'read_matrix: matrix type not yet supported'

1
util/psb_d_mmio_impl.f90
Unescape Escape View File

@ -386,7 +386,6 @@ subroutine dmm_mat_read(a, info, iunit, filename)
if (info == 0) then if (info == 0) then
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
end if end if
if (infile /= 5) close(infile) if (infile /= 5) close(infile)

6
util/psb_metispart_mod.F90
Unescape Escape View File

@ -365,9 +365,9 @@ contains
!!$ write(*,*) 'Before allocation',nparts !!$ write(*,*) 'Before allocation',nparts
irpl=irp irpl = irp
jal = ja jal = ja
nl = n nl = n
nptl = nparts nptl = nparts
wgh_ = -1.0 wgh_ = -1.0
if(present(weights)) then if(present(weights)) then

2
util/psb_s_mmio_impl.f90
Unescape Escape View File

@ -341,7 +341,6 @@ subroutine smm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'real').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
@ -363,7 +362,6 @@ subroutine smm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else else
write(psb_err_unit,*) 'read_matrix: matrix type not yet supported' write(psb_err_unit,*) 'read_matrix: matrix type not yet supported'

3
util/psb_z_mmio_impl.f90
Unescape Escape View File

@ -346,7 +346,6 @@ subroutine zmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'symmetric')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
@ -369,7 +368,6 @@ subroutine zmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then else if ((psb_tolower(type) == 'complex').and.(psb_tolower(sym) == 'hermitian')) then
! we are generally working with non-symmetric matrices, so ! we are generally working with non-symmetric matrices, so
@ -392,7 +390,6 @@ subroutine zmm_mat_read(a, info, iunit, filename)
call acoo%fix(info) call acoo%fix(info)
call a%mv_from(acoo) call a%mv_from(acoo)
call a%cscnv(ircode,type='csr')
else else
write(psb_err_unit,*) 'read_matrix: matrix type not yet supported' write(psb_err_unit,*) 'read_matrix: matrix type not yet supported'

Write Preview
Loading…
Cancel
Save