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

psblas2-dev:

Browse Source 
base/comm/psb_dscatter.F90
 base/comm/psb_iscatter.F90
 base/comm/psb_zscatter.F90

Cleaned up scatter routines from embarassing bugs.
psblas3-type-indexed
Salvatore Filippone 17 years ago
parent d2bcfbdf95
commit 4e0c233a48
3 changed files with 394 additions and 347 deletions
Show Stats Download Patch File Download Diff File

55
base/comm/psb_dscatter.F90
Unescape Escape View File

@ -148,7 +148,7 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, iroot)
nrow=psb_cd_get_local_rows(desc_a) nrow=psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do j=1,k do j=1,k
do i=1, nrow do i=1, nrow
@ -158,7 +158,6 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np),stat=info) allocate(displ(np),all_dim(np),stat=info)
@ -169,13 +168,15 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, iroot)
goto 9999 goto 9999
end if end if
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if (me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1)+all_dim(i-1)
end do
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
@ -197,8 +198,8 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx,jglobx+c-1) scatterv(pos+j)=globx(idx,jglobx+c-1)
end do end do
end do end do
end if end if
@ -210,7 +211,8 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, iroot)
end do end do
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -301,13 +303,16 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
real(psb_dpk_), allocatable :: scatterv(:) real(psb_dpk_), allocatable :: scatterv(:)
integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:) integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:)
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
integer :: debug_level, debug_unit
name='psb_scatterv' name='psb_scatterv'
if (psb_get_errstatus() /= 0) return if (psb_get_errstatus() /= 0) return
info=0 info=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
ictxt=psb_cd_get_context(desc_a) ictxt=psb_cd_get_context(desc_a)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
! check on blacs grid ! check on blacs grid
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
@ -332,6 +337,10 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
call psb_get_mpicomm(ictxt,icomm) call psb_get_mpicomm(ictxt,icomm)
call psb_get_rank(myrank,ictxt,me) call psb_get_rank(myrank,ictxt,me)
iglobx = 1
jglobx = 1
ilocx = 1
jlocx = 1
lda_globx = size(globx) lda_globx = size(globx)
lda_locx = size(locx) lda_locx = size(locx)
@ -359,7 +368,7 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
nrow = psb_cd_get_local_rows(desc_a) nrow = psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do i=1, nrow do i=1, nrow
idx=desc_a%loc_to_glob(i) idx=desc_a%loc_to_glob(i)
@ -367,18 +376,24 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np)) allocate(displ(np),all_dim(np))
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if(me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1) + all_dim(i-1)
end do
if (debug_level >= psb_debug_inner_) then
write(debug_unit,*) me,' ',trim(name),' displ:',displ(1:np), &
&' dim',all_dim(1:np), sum(all_dim)
endif
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim))) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)))
end if end if
@ -391,8 +406,9 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx) scatterv(pos+j)=globx(idx)
end do end do
end do end do
end if end if
@ -401,7 +417,8 @@ subroutine psb_dscatterv(globx, locx, desc_a, info, iroot)
& mpi_double_precision,locx,nrow,& & mpi_double_precision,locx,nrow,&
& mpi_double_precision,rootrank,icomm,info) & mpi_double_precision,rootrank,icomm,info)
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

57
base/comm/psb_iscatter.F90
Unescape Escape View File

@ -127,6 +127,7 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
n = psb_cd_get_global_cols(desc_a) n = psb_cd_get_global_cols(desc_a)
call psb_bcast(ictxt,k,root=iiroot) call psb_bcast(ictxt,k,root=iiroot)
! there should be a global check on k here!!! ! there should be a global check on k here!!!
call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info) call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info)
@ -146,7 +147,7 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
nrow=psb_cd_get_local_rows(desc_a) nrow=psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do j=1,k do j=1,k
do i=1, nrow do i=1, nrow
@ -156,7 +157,6 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np),stat=info) allocate(displ(np),all_dim(np),stat=info)
@ -167,13 +167,15 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
goto 9999 goto 9999
end if end if
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if (me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1)+all_dim(i-1)
end do
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
@ -195,8 +197,8 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx,jglobx+c-1) scatterv(pos+j)=globx(idx,jglobx+c-1)
end do end do
end do end do
end if end if
@ -208,7 +210,8 @@ subroutine psb_iscatterm(globx, locx, desc_a, info, iroot)
end do end do
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -299,13 +302,16 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
integer, allocatable :: scatterv(:) integer, allocatable :: scatterv(:)
integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:) integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:)
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
integer :: debug_level, debug_unit
name='psb_scatterv' name='psb_scatterv'
if (psb_get_errstatus() /= 0) return if (psb_get_errstatus() /= 0) return
info=0 info=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
ictxt=psb_cd_get_context(desc_a) ictxt=psb_cd_get_context(desc_a)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
! check on blacs grid ! check on blacs grid
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
@ -330,6 +336,10 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
call psb_get_mpicomm(ictxt,icomm) call psb_get_mpicomm(ictxt,icomm)
call psb_get_rank(myrank,ictxt,me) call psb_get_rank(myrank,ictxt,me)
iglobx = 1
jglobx = 1
ilocx = 1
jlocx = 1
lda_globx = size(globx) lda_globx = size(globx)
lda_locx = size(locx) lda_locx = size(locx)
@ -337,7 +347,6 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
n = psb_cd_get_global_cols(desc_a) n = psb_cd_get_global_cols(desc_a)
k = 1 k = 1
! there should be a global check on k here!!! ! there should be a global check on k here!!!
call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info) call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info)
@ -358,7 +367,7 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
nrow = psb_cd_get_local_rows(desc_a) nrow = psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do i=1, nrow do i=1, nrow
idx=desc_a%loc_to_glob(i) idx=desc_a%loc_to_glob(i)
@ -366,18 +375,24 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np)) allocate(displ(np),all_dim(np))
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if(me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1) + all_dim(i-1)
end do
if (debug_level >= psb_debug_inner_) then
write(debug_unit,*) me,' ',trim(name),' displ:',displ(1:np), &
&' dim',all_dim(1:np), sum(all_dim)
endif
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim))) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)))
end if end if
@ -390,8 +405,9 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx) scatterv(pos+j)=globx(idx)
end do end do
end do end do
end if end if
@ -400,7 +416,8 @@ subroutine psb_iscatterv(globx, locx, desc_a, info, iroot)
& mpi_integer,locx,nrow,& & mpi_integer,locx,nrow,&
& mpi_integer,rootrank,icomm,info) & mpi_integer,rootrank,icomm,info)
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

67
base/comm/psb_zscatter.F90
Unescape Escape View File

@ -103,12 +103,10 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
iiroot = psb_root_ iiroot = psb_root_
endif endif
iglobx = 1 iglobx = 1
jglobx = 1 jglobx = 1
ilocx = 1 ilocx = 1
jlocx = 1 jlocx = 1
lda_globx = size(globx,1) lda_globx = size(globx,1)
lda_locx = size(locx, 1) lda_locx = size(locx, 1)
@ -119,10 +117,10 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
globk=size(globx,2)-jglobx+1 globk=size(globx,2)-jglobx+1
maxk=min(lock,globk) maxk=min(lock,globk)
k = maxk k = maxk
call psb_get_mpicomm(ictxt,icomm) call psb_get_mpicomm(ictxt,icomm)
call psb_get_rank(myrank,ictxt,me) call psb_get_rank(myrank,ictxt,me)
lda_globx = size(globx) lda_globx = size(globx)
lda_locx = size(locx) lda_locx = size(locx)
@ -134,8 +132,7 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
! there should be a global check on k here!!! ! there should be a global check on k here!!!
call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info) call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info)
if (info == 0) & if (info == 0) call psb_chkvect(m,n,size(locx),ilocx,jlocx,desc_a,info,ilx,jlx)
& call psb_chkvect(m,n,size(locx),ilocx,jlocx,desc_a,info,ilx,jlx)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
ch_err='psb_chk(glob)vect' ch_err='psb_chk(glob)vect'
@ -151,7 +148,7 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
nrow=psb_cd_get_local_rows(desc_a) nrow=psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do j=1,k do j=1,k
do i=1, nrow do i=1, nrow
@ -161,7 +158,6 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np),stat=info) allocate(displ(np),all_dim(np),stat=info)
@ -172,13 +168,15 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
goto 9999 goto 9999
end if end if
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if (me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1)+all_dim(i-1)
end do
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)),stat=info)
if(info /= 0) then if(info /= 0) then
info=4010 info=4010
@ -200,8 +198,8 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx,jglobx+c-1) scatterv(pos+j)=globx(idx,jglobx+c-1)
end do end do
end do end do
end if end if
@ -213,7 +211,8 @@ subroutine psb_zscatterm(globx, locx, desc_a, info, iroot)
end do end do
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return
@ -304,13 +303,16 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
complex(psb_dpk_), allocatable :: scatterv(:) complex(psb_dpk_), allocatable :: scatterv(:)
integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:) integer, allocatable :: displ(:), l_t_g_all(:), all_dim(:)
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
integer :: debug_level, debug_unit
name='psb_scatterv' name='psb_scatterv'
if (psb_get_errstatus() /= 0) return if (psb_get_errstatus() /= 0) return
info=0 info=0
call psb_erractionsave(err_act) call psb_erractionsave(err_act)
ictxt=psb_cd_get_context(desc_a) ictxt=psb_cd_get_context(desc_a)
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
! check on blacs grid ! check on blacs grid
call psb_info(ictxt, me, np) call psb_info(ictxt, me, np)
@ -335,6 +337,10 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
call psb_get_mpicomm(ictxt,icomm) call psb_get_mpicomm(ictxt,icomm)
call psb_get_rank(myrank,ictxt,me) call psb_get_rank(myrank,ictxt,me)
iglobx = 1
jglobx = 1
ilocx = 1
jlocx = 1
lda_globx = size(globx) lda_globx = size(globx)
lda_locx = size(locx) lda_locx = size(locx)
@ -342,7 +348,6 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
n = psb_cd_get_global_cols(desc_a) n = psb_cd_get_global_cols(desc_a)
k = 1 k = 1
! there should be a global check on k here!!! ! there should be a global check on k here!!!
call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info) call psb_chkglobvect(m,n,size(globx),iglobx,jglobx,desc_a,info)
@ -363,7 +368,7 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
nrow = psb_cd_get_local_rows(desc_a) nrow = psb_cd_get_local_rows(desc_a)
if(root == -1) then if ((root == -1).or.(np==1)) then
! extract my chunk ! extract my chunk
do i=1, nrow do i=1, nrow
idx=desc_a%loc_to_glob(i) idx=desc_a%loc_to_glob(i)
@ -371,18 +376,24 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
end do end do
else else
call psb_get_rank(rootrank,ictxt,root) call psb_get_rank(rootrank,ictxt,root)
end if
! root has to gather size information ! root has to gather size information
allocate(displ(np),all_dim(np)) allocate(displ(np),all_dim(np))
call mpi_gather(nrow,1,mpi_integer,all_dim,& call mpi_gather(nrow,1,mpi_integer,all_dim,&
& np,mpi_integer,rootrank,icomm,info) & 1,mpi_integer,rootrank,icomm,info)
displ(1)=1 if(me == root) then
displ(2:)=all_dim(1:np-1)+1 displ(1)=0
do i=2,np
displ(i)=displ(i-1) + all_dim(i-1)
end do
if (debug_level >= psb_debug_inner_) then
write(debug_unit,*) me,' ',trim(name),' displ:',displ(1:np), &
&' dim',all_dim(1:np), sum(all_dim)
endif
! root has to gather loc_glob from each process ! root has to gather loc_glob from each process
if(me == root) then
allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim))) allocate(l_t_g_all(sum(all_dim)),scatterv(sum(all_dim)))
end if end if
@ -395,17 +406,19 @@ subroutine psb_zscatterv(globx, locx, desc_a, info, iroot)
do i=1,np do i=1,np
pos=displ(i) pos=displ(i)
do j=1, all_dim(i) do j=1, all_dim(i)
idx=l_t_g_all(pos+j-1) idx=l_t_g_all(pos+j)
scatterv(pos+j-1)=globx(idx) scatterv(pos+j)=globx(idx)
end do end do
end do end do
end if end if
call mpi_scatterv(scatterv,all_dim,displ,& call mpi_scatterv(scatterv,all_dim,displ,&
& mpi_double_precision,locx,nrow,& & mpi_double_complex,locx,nrow,&
& mpi_double_precision,rootrank,icomm,info) & mpi_double_complex,rootrank,icomm,info)
deallocate(all_dim, l_t_g_all, displ, scatterv) if (me==root) deallocate(all_dim, l_t_g_all, displ, scatterv)
end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
return return

Write Preview
Loading…
Cancel
Save