Moved csrp from tools to serial, taking out desc_a from the interface.

Update the user guide adding whether each routine is a synchronization point.
This commit is contained in:
Salvatore Filippone
2007-09-28 16:46:49 +00:00
parent 285da66426
commit 81ce9e94fd
16 changed files with 167 additions and 125 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ FOBJS = psb_cest.o psb_dcoins.o psb_dcsmm.o psb_dcsmv.o \
psb_zcoins.o psb_zcsprt.o psb_zneigh.o psb_ztransp.o psb_ztransc.o\
psb_zrwextd.o psb_zsymbmm.o psb_znumbmm.o psb_zspscal.o psb_zspclip.o\
psb_getifield.o psb_setifield.o psb_update_mod.o psb_getrow_mod.o\
psb_dgelp.o psb_zgelp.o
psb_dgelp.o psb_zgelp.o psb_dcsrp.o psb_zcsrp.o
LIBDIR=..
MODDIR=../modules
+166
View File
@@ -0,0 +1,166 @@
!!$
!!$ Parallel Sparse BLAS v2.0
!!$ (C) Copyright 2006 Salvatore Filippone University of Rome Tor Vergata
!!$ Alfredo Buttari University of Rome Tor Vergata
!!$
!!$ 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.
!!$
!!$
! File: psb_dcsrp.f90
!
!
! Subroutine: psb_dcsrp
! Apply a right permutation to a sparse matrix, i.e. permute the column
! indices.
!
! Parameters:
! trans - character. Whether iperm or its transpose
! should be applied
! iperm - integer, dimension(:) A permutation vector; its size
! must be either N_ROW or N_COL
! a - type(<psb_dspmat_type). The matrix to be permuted
! info - integer. Eventually returns an error code
subroutine psb_dcsrp(trans,iperm,a, info)
use psb_serial_mod, psb_protect_name => psb_dcsrp
use psb_const_mod
! implicit none
interface dcsrp
subroutine dcsrp(trans,m,n,fida,descra,ia1,ia2,&
& infoa,p,work,lwork,ierror)
integer, intent(in) :: m, n, lwork
integer, intent(out) :: ierror
character, intent(in) :: trans
double precision, intent(inout) :: work(*)
integer, intent(in) :: p(*)
integer, intent(inout) :: ia1(*), ia2(*), infoa(*)
character, intent(in) :: fida*5, descra*11
end subroutine dcsrp
end interface
interface isaperm
logical function isaperm(n,ip)
integer, intent(in) :: n
integer, intent(inout) :: ip(*)
end function isaperm
end interface
!...parameters....
type(psb_dspmat_type), intent(inout) :: a
integer, intent(inout) :: iperm(:), info
character, intent(in) :: trans
!....locals....
integer,allocatable :: ipt(:)
integer :: i,np,me, n_col,l_dcsdp, ipsize
integer :: dectype
real(kind(1.d0)), allocatable :: work_dcsdp(:)
integer :: ictxt,n_row,err_act, int_err(5)
character(len=20) :: name, char_err
real(kind(1.d0)) :: time(10)
logical, parameter :: debug=.false.
time(1) = psb_wtime()
n_row = psb_get_sp_nrows(a)
n_col = psb_get_sp_ncols(a)
if(psb_get_errstatus() /= 0) return
info=0
call psb_erractionsave(err_act)
name = 'psd_csrp'
ipsize = size(iperm)
if (.not.((ipsize == n_col).or.(ipsize == n_row) )) then
info = 35
int_err(1) = 1
int_err(2) = ipsize
call psb_errpush(info,name,int_err)
goto 9999
else
if (.not.isaperm(ipsize,iperm)) then
info = 70
int_err(1) = 1
call psb_errpush(info,name,int_err)
goto 9999
endif
endif
l_dcsdp = (n_col)
call psb_realloc(l_dcsdp,work_dcsdp,info)
call psb_realloc(n_col,ipt,info)
if(info /= psb_no_err_) then
info=4010
char_err='psrealloc'
call psb_errpush(info,name,a_err=char_err)
goto 9999
end if
if (ipsize == n_col) then
do i=1, n_col
ipt(i) = iperm(i)
enddo
else
do i=1, n_row
ipt(i) = iperm(i)
enddo
do i=n_row+1,n_col
ipt(i) = i
enddo
endif
! crossed fingers.....
! fix glob_to_loc/loc_to_glob mappings, then indices lists
! hmm, maybe we should just move all of this onto a different level,
! have a specialized subroutine, and do it in the solver context????
call dcsrp(trans,n_row,n_col,a%fida,a%descra,a%ia1,a%ia2,a%infoa,&
& ipt,work_dcsdp,size(work_dcsdp),info)
if(info /= psb_no_err_) then
info=4010
char_err='dcsrp'
call psb_errpush(info,name,a_err=char_err)
goto 9999
end if
deallocate(ipt,work_dcsdp)
time(4) = psb_wtime()
time(4) = time(4) - time(3)
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 psb_dcsrp
+165
View File
@@ -0,0 +1,165 @@
!!$
!!$ Parallel Sparse BLAS v2.0
!!$ (C) Copyright 2006 Salvatore Filippone University of Rome Tor Vergata
!!$ Alfredo Buttari University of Rome Tor Vergata
!!$
!!$ 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.
!!$
!!$
! File: psb_zcsrp.f90
!
!
! Subroutine: psb_zcsrp
! Apply a right permutation to a sparse matrix, i.e. permute the column
! indices.
!
! Parameters:
! trans - character. Whether iperm or its transpose
! should be applied
! iperm - integer, dimension(:) A permutation vector; its size
! must be either N_ROW or N_COL
! a - type(<psb_zspmat_type). The matrix to be permuted
! info - integer. Eventually returns an error code
subroutine psb_zcsrp(trans,iperm,a, info)
use psb_serial_mod, psb_protect_name => psb_zcsrp
use psb_const_mod
! implicit none
interface
subroutine zcsrp(trans,m,n,fida,descra,ia1,ia2,&
& infoa,p,work,lwork,ierror)
integer, intent(in) :: m, n, lwork
integer, intent(out) :: ierror
character, intent(in) :: trans
complex(kind(1.d0)), intent(inout) :: work(*)
integer, intent(in) :: p(*)
integer, intent(inout) :: ia1(*), ia2(*), infoa(*)
character, intent(in) :: fida*5, descra*11
end subroutine zcsrp
end interface
interface isaperm
logical function isaperm(n,ip)
integer, intent(in) :: n
integer, intent(inout) :: ip(*)
end function isaperm
end interface
!...parameters....
type(psb_zspmat_type), intent(inout) :: a
integer, intent(inout) :: iperm(:), info
character, intent(in) :: trans
!....locals....
integer, allocatable :: ipt(:)
integer :: i,np,me, n_col,l_dcsdp, ipsize
integer :: dectype
real(kind(1.d0)), allocatable :: work_dcsdp(:)
integer :: ictxt,n_row,err_act, int_err(5)
character(len=20) :: name, char_err
real(kind(1.d0)) :: time(10)
logical, parameter :: debug=.false.
time(1) = psb_wtime()
n_row = psb_get_sp_nrows(a)
n_col = psb_get_sp_ncols(a)
if(psb_get_errstatus() /= 0) return
info=0
call psb_erractionsave(err_act)
name = 'psd_csrp'
ipsize = size(iperm)
if (.not.((ipsize == n_col).or.(ipsize == n_row) )) then
info = 35
int_err(1) = 1
int_err(2) = ipsize
call psb_errpush(info,name,int_err)
goto 9999
else
if (.not.isaperm(ipsize,iperm)) then
info = 70
int_err(1) = 1
call psb_errpush(info,name,int_err)
goto 9999
endif
endif
l_dcsdp = (n_col)
call psb_realloc(l_dcsdp,work_dcsdp,info)
call psb_realloc(n_col,ipt,info)
if(info /= psb_no_err_) then
info=4010
char_err='psrealloc'
call psb_errpush(info,name,a_err=char_err)
goto 9999
end if
if (ipsize == n_col) then
do i=1, n_col
ipt(i) = iperm(i)
enddo
else
do i=1, n_row
ipt(i) = iperm(i)
enddo
do i=n_row+1,n_col
ipt(i) = i
enddo
endif
! crossed fingers.....
! fix glob_to_loc/loc_to_glob mappings, then indices lists
! hmm, maybe we should just move all of this onto a different level,
! have a specialized subroutine, and do it in the solver context????
call zcsrp(trans,n_row,n_col,a%fida,a%descra,a%ia1,a%ia2,a%infoa,&
& ipt,work_dcsdp,size(work_dcsdp),info)
if(info /= psb_no_err_) then
info=4010
char_err='dcsrp'
call psb_errpush(info,name,a_err=char_err)
goto 9999
end if
deallocate(ipt,work_dcsdp)
time(4) = psb_wtime()
time(4) = time(4) - time(3)
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 psb_zcsrp