Start work on REMAP.

new-context
Salvatore Filippone 4 years ago
parent c936d6e5bd
commit 7c6ffcd4a2

@ -320,6 +320,19 @@ module psb_cd_tools_mod
module procedure psb_local_index, psb_local_index_v
end interface
interface psb_remap
subroutine psb_cd_remap(np_remap, desc_in, desc_out, info)
import :: psb_ipk_, psb_desc_type
implicit none
!....parameters...
integer(psb_ipk_), intent(in) :: np_remap
type(psb_desc_type), intent(inout) :: desc_in
type(psb_desc_type), intent(out) :: desc_out
integer(psb_ipk_), intent(out) :: info
end subroutine psb_cd_remap
end interface
contains
subroutine psb_get_boundary(bndel,desc,info)

@ -431,5 +431,17 @@ Module psb_d_tools_mod
end function
end interface
interface psb_remap
subroutine psb_d_remap(np_remap, desc_in, a_in, desc_out, a_out, info)
import
implicit none
!....parameters...
integer(psb_ipk_), intent(in) :: np_remap
type(psb_desc_type), intent(inout) :: desc_in
type(psb_dspmat_type), intent(inout) :: a_in
type(psb_dspmat_type), intent(out) :: a_out
type(psb_desc_type), intent(out) :: desc_out
integer(psb_ipk_), intent(out) :: info
end subroutine psb_d_remap
end interface psb_remap
end module psb_d_tools_mod

@ -1,9 +1,9 @@
include ../../Make.inc
FOBJS = psb_cdall.o psb_cdals.o psb_cdalv.o psb_cd_inloc.o psb_cdins.o psb_cdprt.o \
psb_cdren.o psb_cdrep.o psb_get_overlap.o psb_cd_lstext.o\
psb_cdren.o psb_cdrep.o psb_get_overlap.o psb_cd_lstext.o psb_cd_remap.o\
psb_cdcpy.o psb_cd_reinit.o psb_cd_switch_ovl_indxmap.o psb_cd_renum_block.o \
psb_dspalloc.o psb_dspasb.o \
psb_dspalloc.o psb_dspasb.o psb_d_remap.o \
psb_dspfree.o psb_dspins.o psb_dsprn.o \
psb_sspalloc.o psb_sspasb.o \
psb_sspfree.o psb_sspins.o psb_ssprn.o\

@ -0,0 +1,141 @@
!
! Parallel Sparse BLAS version 3.5
! (C) Copyright 2006-2018
! Salvatore Filippone
! Alfredo Buttari
!
! 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 PSBLAS 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 PSBLAS 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.
!
!
!
! Subroutine: psb_cdcpy
! Produces a clone of a descriptor.
!
! Arguments:
! desc_in - type(psb_desc_type). The communication descriptor to be cloned.
! desc_out - type(psb_desc_type). The output communication descriptor.
! info - integer. Return code.
subroutine psb_cd_remap(np_remap, desc_in, desc_out, info)
use psb_base_mod, psb_protect_name => psb_cd_remap
implicit none
!....parameters...
integer(psb_ipk_), intent(in) :: np_remap
type(psb_desc_type), intent(inout) :: desc_in
type(psb_desc_type), intent(out) :: desc_out
integer(psb_ipk_), intent(out) :: info
!locals
integer(psb_ipk_) :: np, me, ictxt, err_act
integer(psb_ipk_) :: newctxt, rnp, rme
integer(psb_ipk_) :: ipdest, id1, id2, imd, i
integer(psb_ipk_), allocatable :: newnl(:)
integer(psb_ipk_) :: debug_level, debug_unit
character(len=20) :: name
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
if (psb_get_errstatus() /= 0) return
info = psb_success_
call psb_erractionsave(err_act)
name = 'psb_cdcpy'
ictxt = desc_in%get_context()
! check on blacs grid
call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_ext_) &
& write(debug_unit,*) me,' ',trim(name),': Entered'
if (np == -1) then
info = psb_err_context_error_
call psb_errpush(info,name)
goto 9999
endif
write(0,*) ' Remapping from ',np,' onto ', np_remap
if (desc_in%get_fmt() == 'BLOCK') then
! OK
call psb_init(newctxt,np=np_remap,basectxt=ictxt)
call psb_info(newctxt,rme,rnp)
write(0,*) 'Old context: ',me,np,' New context: ',rme,rnp
call psb_bcast(ictxt,rnp)
allocate(newnl(rnp),stat=info)
if (info /= 0) then
info = psb_err_alloc_dealloc_
call psb_errpush(info,name)
goto 9999
endif
if (rnp >= np) then
write(0,*) ' No remapping on larger proc count now'
info = psb_err_internal_error_
call psb_errpush(info,name)
goto 9999
end if
id2 = np/rnp
id1 = id2+1
imd = mod(np,rnp)
if (me < (imd*id1)) then
ipdest = (me/id1)
else
ipdest = ( ((me-imd*id1)/id2) + imd)
end if
write(0,*) ' Sending my data from ',me,' to ', &
& ipdest, 'out of ',rnp,rnp-1
newnl = 0
newnl(ipdest+1) = desc_in%get_local_rows()
call psb_sum(ictxt,newnl)
if (rme>=0) then
call psb_cdall(newctxt,desc_out,info,nl=newnl(rme+1))
call psb_cdasb(desc_out,info)
write(0,*) me,rme,'In ',desc_in%get_local_rows(),desc_in%get_global_rows(),&
& ' out ',desc_out%get_local_rows(),desc_out%get_global_rows()
else
write(0,*) me,rme,'In ',desc_in%get_local_rows(),desc_in%get_global_rows(),&
& ' out ',0,0
end if
call psb_exit(newctxt,close=.false.)
else
write(0,*) 'Right now only BLOCK on input '
info = psb_err_invalid_cd_state_
call psb_errpush(info,name)
goto 9999
endif
!call psb_cdall()
! For the time being cleanup
call psb_erractionrestore(err_act)
return
9999 call psb_error_handler(ictxt,err_act)
return
end subroutine psb_cd_remap

@ -29,14 +29,14 @@
! POSSIBILITY OF SUCH DAMAGE.
!
!
!
! Subroutine: psb_cdcpy
! Produces a clone of a descriptor.
!
! Arguments:
! desc_in - type(psb_desc_type). The communication descriptor to be cloned.
! desc_out - type(psb_desc_type). The output communication descriptor.
! info - integer. Return code.
!
! Subroutine: psb_cdcpy
! Produces a clone of a descriptor.
!
! Arguments:
! desc_in - type(psb_desc_type). The communication descriptor to be cloned.
! desc_out - type(psb_desc_type). The output communication descriptor.
! info - integer. Return code.
subroutine psb_cdcpy(desc_in, desc_out, info)
use psb_base_mod, psb_protect_name => psb_cdcpy

@ -0,0 +1,143 @@
!
! Parallel Sparse BLAS version 3.5
! (C) Copyright 2006-2018
! Salvatore Filippone
! Alfredo Buttari
!
! 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 PSBLAS 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 PSBLAS 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.
!
!
!
! Subroutine: psb_cdcpy
! Produces a clone of a descriptor.
!
! Arguments:
! desc_in - type(psb_desc_type). The communication descriptor to be cloned.
! desc_out - type(psb_desc_type). The output communication descriptor.
! info - integer. Return code.
subroutine psb_d_remap(np_remap, desc_in, a_in, desc_out, a_out, info)
use psb_base_mod, psb_protect_name => psb_d_remap
implicit none
!....parameters...
integer(psb_ipk_), intent(in) :: np_remap
type(psb_desc_type), intent(inout) :: desc_in
type(psb_dspmat_type), intent(inout) :: a_in
type(psb_dspmat_type), intent(out) :: a_out
type(psb_desc_type), intent(out) :: desc_out
integer(psb_ipk_), intent(out) :: info
!locals
integer(psb_ipk_) :: np, me, ictxt, err_act
integer(psb_ipk_) :: newctxt, rnp, rme
integer(psb_ipk_) :: ipdest, id1, id2, imd, i
integer(psb_ipk_), allocatable :: newnl(:)
integer(psb_ipk_) :: debug_level, debug_unit
character(len=20) :: name
debug_unit = psb_get_debug_unit()
debug_level = psb_get_debug_level()
if (psb_get_errstatus() /= 0) return
info = psb_success_
call psb_erractionsave(err_act)
name = 'psb_cdcpy'
ictxt = desc_in%get_context()
! check on blacs grid
call psb_info(ictxt, me, np)
if (debug_level >= psb_debug_ext_) &
& write(debug_unit,*) me,' ',trim(name),': Entered'
if (np == -1) then
info = psb_err_context_error_
call psb_errpush(info,name)
goto 9999
endif
write(0,*) ' Remapping from ',np,' onto ', np_remap
if (desc_in%get_fmt() == 'BLOCK') then
! OK
call psb_init(newctxt,np=np_remap,basectxt=ictxt)
call psb_info(newctxt,rme,rnp)
write(0,*) 'Old context: ',me,np,' New context: ',rme,rnp
call psb_bcast(ictxt,rnp)
allocate(newnl(rnp),stat=info)
if (info /= 0) then
info = psb_err_alloc_dealloc_
call psb_errpush(info,name)
goto 9999
endif
if (rnp >= np) then
write(0,*) ' No remapping on larger proc count now'
info = psb_err_internal_error_
call psb_errpush(info,name)
goto 9999
end if
id2 = np/rnp
id1 = id2+1
imd = mod(np,rnp)
if (me < (imd*id1)) then
ipdest = (me/id1)
else
ipdest = ( ((me-imd*id1)/id2) + imd)
end if
write(0,*) ' Sending my data from ',me,' to ', &
& ipdest, 'out of ',rnp,rnp-1
newnl = 0
newnl(ipdest+1) = desc_in%get_local_rows()
call psb_sum(ictxt,newnl)
if (rme>=0) then
call psb_cdall(newctxt,desc_out,info,nl=newnl(rme+1))
call psb_cdasb(desc_out,info)
write(0,*) me,rme,'In ',desc_in%get_local_rows(),desc_in%get_global_rows(),&
& ' out ',desc_out%get_local_rows(),desc_out%get_global_rows()
else
write(0,*) me,rme,'In ',desc_in%get_local_rows(),desc_in%get_global_rows(),&
& ' out ',0,0
end if
call psb_exit(newctxt,close=.false.)
else
write(0,*) 'Right now only BLOCK on input '
info = psb_err_invalid_cd_state_
call psb_errpush(info,name)
goto 9999
endif
!call psb_cdall()
! For the time being cleanup
call psb_erractionrestore(err_act)
return
9999 call psb_error_handler(ictxt,err_act)
return
end subroutine psb_d_remap

@ -634,10 +634,10 @@ program psb_d_pde3d
real(psb_dpk_) :: t1, t2, tprec
! sparse matrix and preconditioner
type(psb_dspmat_type) :: a
type(psb_dspmat_type) :: a, aremap
type(psb_dprec_type) :: prec
! descriptor
type(psb_desc_type) :: desc_a
type(psb_desc_type) :: desc_a, desc_rmp, desc_blk
! dense vectors
type(psb_d_vect_type) :: xxv,bv
! parallel environment
@ -649,7 +649,7 @@ program psb_d_pde3d
real(psb_dpk_) :: err, eps
! other variables
integer(psb_ipk_) :: info, i
integer(psb_ipk_) :: info, i, rnp
character(len=20) :: name,ch_err
character(len=40) :: fname
@ -696,6 +696,16 @@ program psb_d_pde3d
if (iam == psb_root_) write(psb_out_unit,'("Overall matrix creation time : ",es12.5)')t2
if (iam == psb_root_) write(psb_out_unit,'(" ")')
call psb_cd_renum_block(desc_a,desc_blk,info)
do rnp = 1, np/2+1
if (iam == 0) write(0,*) 'Remapping from ',np,' to ',rnp
flush(0)
call psb_barrier(ictxt)
call psb_remap(rnp,desc_blk,a,desc_rmp,aremap,info)
flush(0)
call psb_barrier(ictxt)
if (iam == 0) write(0,*) ' Info ',info
end do
!
! cleanup storage and exit
!

Loading…
Cancel
Save