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

Init Parallelize

Browse Source
psblas-bgmres
gabrielequatrana 12 months ago
parent 6987582c30
commit d10631530f
14 changed files with 429 additions and 304 deletions
Show Stats Download Patch File Download Diff File

25
base/comm/psb_dscatter_a.F90
Unescape Escape View File

@ -63,7 +63,7 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, root)
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_mpk_) :: np, me, iroot, icomm, myrank, rootrank, iam, nlr integer(psb_mpk_) :: np, iam, iroot, icomm, myrank, rootrank, nlr
integer(psb_ipk_) :: ierr(5), err_act, nrow,& integer(psb_ipk_) :: ierr(5), err_act, nrow,&
& ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, & & ilocx, jlocx, lda_locx, lda_globx, lock, globk, k, maxk, &
& col,pos & col,pos
@ -102,29 +102,24 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, root)
iroot = psb_root_ iroot = psb_root_
end if end if
icomm = psb_get_mpi_comm(ctxt)
myrank = psb_get_mpi_rank(ctxt,iam)
iglobx = 1 iglobx = 1
jglobx = 1 jglobx = 1
lda_globx = size(globx,1)
m = desc_a%get_global_rows() ! Get col number K and broadcast to other processes
n = desc_a%get_global_cols() if ((iroot==-1).or.(iam==iroot)) then
icomm = psb_get_mpi_comm(ctxt) lda_globx = size(globx,1)
myrank = psb_get_mpi_rank(ctxt,me)
if (iroot==-1) then
lda_globx = size(globx, 1)
k = size(globx,2) k = size(globx,2)
call psb_bcast(ctxt,k,root=iroot)
else else
if (iam==iroot) then call psb_bcast(ctxt,k,root=iroot)
k = size(globx,2)
lda_globx = size(globx, 1)
end if
end if end if
m = desc_a%get_global_rows() m = desc_a%get_global_rows()
n = desc_a%get_global_cols() n = desc_a%get_global_cols()
! there should be a global check on k here!!! ! there should be a global check on k here!!!
if ((iroot==-1).or.(iam==iroot)) & if ((iroot==-1).or.(iam==iroot)) &
& call psb_chkglobvect(m,n,lda_globx,iglobx,jglobx,desc_a,info) & call psb_chkglobvect(m,n,lda_globx,iglobx,jglobx,desc_a,info)
@ -211,7 +206,7 @@ subroutine psb_dscatterm(globx, locx, desc_a, info, root)
! scatter ! scatter
call mpi_scatterv(scatterv,all_dim,displ,& call mpi_scatterv(scatterv,all_dim,displ,&
& psb_mpi_r_dpk_,locx(1,col),nrow,& & psb_mpi_r_dpk_,locx(:,col),nrow,&
& psb_mpi_r_dpk_,rootrank,icomm,info) & psb_mpi_r_dpk_,rootrank,icomm,info)
end do end do

14
base/modules/psblas/psb_d_psblas_mod.F90
Unescape Escape View File

@ -45,27 +45,25 @@ module psb_d_psblas_mod
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_ddot_vect end function psb_ddot_vect
function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res) function psb_ddot_multivect_col_v(x, y, desc_a,info,global) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_multivect_type, psb_dspmat_type & psb_d_multivect_type, psb_dspmat_type
real(psb_dpk_), allocatable :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
type(psb_d_multivect_type), intent(inout) :: x, y type(psb_d_multivect_type), intent(inout) :: x, y
logical, optional, intent(in) :: t
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_ddot_multivect end function psb_ddot_multivect_col_v
function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res) function psb_ddot_multivect_row_a(x, y, desc_a,info,global) result(res)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_multivect_type, psb_dspmat_type & psb_d_multivect_type, psb_dspmat_type
real(psb_dpk_), allocatable :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
type(psb_d_multivect_type), intent(inout) :: x type(psb_d_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:) real(psb_dpk_), intent(in) :: y(:,:)
logical, optional, intent(in) :: t
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, intent(in), optional :: global logical, intent(in), optional :: global
end function psb_ddot_multivect_1 end function psb_ddot_multivect_row_a
function psb_ddotv(x, y, desc_a,info,global) function psb_ddotv(x, y, desc_a,info,global)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_vect_type, psb_dspmat_type & psb_d_vect_type, psb_dspmat_type
@ -129,7 +127,7 @@ module psb_d_psblas_mod
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psb_daxpby_multivect end subroutine psb_daxpby_multivect
subroutine psb_daxpby_multivect_1(alpha, x, beta, y, desc_a, info) subroutine psb_daxpby_multivect_a(alpha, x, beta, y, desc_a, info)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_d_multivect_type, psb_dspmat_type & psb_d_multivect_type, psb_dspmat_type
real(psb_dpk_), intent(in) :: x(:,:) real(psb_dpk_), intent(in) :: x(:,:)
@ -137,7 +135,7 @@ module psb_d_psblas_mod
real(psb_dpk_), intent (in) :: alpha, beta real(psb_dpk_), intent (in) :: alpha, beta
type(psb_desc_type), intent (in) :: desc_a type(psb_desc_type), intent (in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psb_daxpby_multivect_1 end subroutine psb_daxpby_multivect_a
subroutine psb_daxpby_vect_out(alpha, x, beta, y,& subroutine psb_daxpby_vect_out(alpha, x, beta, y,&
& z, desc_a, info) & z, desc_a, info)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &

233
base/modules/serial/psb_d_base_vect_mod.F90
Unescape Escape View File

@ -2246,14 +2246,17 @@ module psb_d_base_multivect_mod
procedure, pass(x) :: set_vect => d_base_mlv_set_vect procedure, pass(x) :: set_vect => d_base_mlv_set_vect
generic, public :: set => set_vect, set_scal generic, public :: set => set_vect, set_scal
! !
! Dot product and AXPBY ! TODO Dot product (col-by-col and row-by-col) and AXPBY
! !
procedure, pass(x) :: dot_v => d_base_mlv_dot_v procedure, pass(x) :: dot_col_v => d_base_mlv_dot_col_v
procedure, pass(x) :: dot_a => d_base_mlv_dot_a procedure, pass(x) :: dot_col_a => d_base_mlv_dot_col_a
generic, public :: dot => dot_v, dot_a generic, public :: dot_col => dot_col_v, dot_col_a
procedure, pass(y) :: axpby_v => d_base_mlv_axpby_v procedure, pass(x) :: dot_row_v => d_base_mlv_dot_row_v
procedure, pass(y) :: axpby_a => d_base_mlv_axpby_a procedure, pass(x) :: dot_row_a => d_base_mlv_dot_row_a
generic, public :: axpby => axpby_v, axpby_a generic, public :: dot_row => dot_row_v, dot_row_a
procedure, pass(y) :: axpby_v => d_base_mlv_axpby_v
procedure, pass(y) :: axpby_a => d_base_mlv_axpby_a
generic, public :: axpby => axpby_v, axpby_a
! !
! MultiVector by vector/multivector multiplication. Need all variants ! MultiVector by vector/multivector multiplication. Need all variants
! to handle multiple requirements from preconditioners ! to handle multiple requirements from preconditioners
@ -2358,14 +2361,22 @@ contains
real(psb_dpk_), intent(in) :: this(:,:) real(psb_dpk_), intent(in) :: this(:,:)
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
integer(psb_ipk_) :: info integer(psb_ipk_) :: info
integer(psb_ipk_) :: i
call psb_realloc(size(this,1),size(this,2),x%v,info) call psb_realloc(size(this,1),size(this,2),x%v,info)
if (info /= 0) then if (info /= 0) then
call psb_errpush(psb_err_alloc_dealloc_,'base_mlv_vect_bld') call psb_errpush(psb_err_alloc_dealloc_,'base_mlv_vect_bld')
return return
end if end if
x%v(:,:) = this(:,:)
#if defined (OPENMP)
!$omp parallel do private(i)
do i = 1, size(this,1)
x%v(i,:) = this(i,:)
end do
#else
x%v(:,:) = this(:,:)
#endif
end subroutine d_base_mlv_bld_x end subroutine d_base_mlv_bld_x
! !
@ -2801,31 +2812,24 @@ contains
end subroutine d_base_mlv_set_vect end subroutine d_base_mlv_set_vect
! ! TODO
! Dot products ! Col Dot products
! !
! !
!> Function base_mlv_dot_v !> Function base_mlv_dot_col_v
!! \memberof psb_d_base_multivect_type !! \memberof psb_d_base_multivect_type
!! \brief Dot product by another base_mlv_vector !! \brief Col-by-col mult using dot product by a mlv
!! \param nr Number of rows to be considered
!! \param y The other (base_mlv_vect) to be multiplied by !! \param y The other (base_mlv_vect) to be multiplied by
!! \param res Result matrix !! \param res Result vector
!! \param t If true, x is transposed
!! !!
subroutine d_base_mlv_dot_v(x,y,res,t) function d_base_mlv_dot_col_v(nr,x,y) result(res)
implicit none implicit none
class(psb_d_base_multivect_type), intent(inout) :: x, y class(psb_d_base_multivect_type), intent(inout) :: x, y
real(psb_dpk_), intent(inout) :: res(:,:) integer(psb_ipk_), intent(in) :: nr
logical, optional, intent(in) :: t real(psb_dpk_), allocatable :: res(:,:)
logical :: t_ real(psb_dpk_), external :: ddot
external :: dgemm integer(psb_ipk_) :: i, j, n_x, n_y
integer(psb_ipk_) :: x_m, x_n, y_m, y_n
if (present(t)) then
t_ = t
else
t_ = .false.
end if
if (x%is_dev()) call x%sync() if (x%is_dev()) call x%sync()
! !
@ -2835,65 +2839,126 @@ contains
! If Y is not, throw the burden on it, implicitly ! If Y is not, throw the burden on it, implicitly
! calling dot_a ! calling dot_a
! !
x_m = x%get_nrows()
x_n = x%get_ncols()
y_m = y%get_nrows()
y_n = y%get_ncols()
select type(yy => y) select type(yy => y)
type is (psb_d_base_multivect_type) type is (psb_d_base_multivect_type)
if (y%is_dev()) call y%sync() if (y%is_dev()) call y%sync()
if (t_) then n_x = psb_size(x%v,2_psb_ipk_)
call dgemm('T','N',x_n,y_n,x_n,done,x%v,x_n,y%v,y_m,dzero,res,x_n) n_y = psb_size(y%v,2_psb_ipk_)
else allocate(res(n_x,n_y))
call dgemm('N','N',x_m,y_n,x_n,done,x%v,x_m,y%v,y_m,dzero,res,x_m) do i=1,n_x
end if do j=1,n_y
res(i,j) = ddot(nr,x%v(1:nr,i),1,y%v(1:nr,j),1)
end do
end do
class default class default
call x%dot(y%v,res,t) res = x%dot_col(nr,y%v)
end select end select
end subroutine d_base_mlv_dot_v end function d_base_mlv_dot_col_v
! !
! Base workhorse is good old BLAS1 ! Base workhorse is good old BLAS1
! !
! !
!> Function base_mlv_dot_a !> Function base_mlv_dot_col_a
!! \memberof psb_d_base_multivect_type !! \memberof psb_d_base_multivect_type
!! \brief Dot product by a normal array !! \brief Col-by-col mult using dot product by a normal array
!! \param n Number of entries to be considered !! \param nr Number of rows to be considered
!! \param y(:,:) The array to be multiplied by !! \param y(:,:) The array to be multiplied by
!! \param res Result matrix !! \param res Result vector
!! \param t If true, x is transposed
!! !!
subroutine d_base_mlv_dot_a(x,y,res,t) function d_base_mlv_dot_col_a(nr,x,y) result(res)
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:) real(psb_dpk_), intent(in) :: y(:,:)
real(psb_dpk_), intent(inout) :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
logical, optional, intent(in) :: t real(psb_dpk_), external :: ddot
logical :: t_ integer(psb_ipk_) :: i, j, n_x, n_y
external :: dgemm
integer(psb_ipk_) :: x_m, x_n, y_m, y_n
if (present(t)) then
t_ = t
else
t_ = .false.
end if
if (x%is_dev()) call x%sync() if (x%is_dev()) call x%sync()
n_x = psb_size(x%v,2_psb_ipk_)
n_y = size(y,2_psb_ipk_)
allocate(res(n_x,n_y))
do i=1,n_x
do j=1,n_y
res(i,j) = ddot(nr,x%v(1:nr,i),1,y(1:nr,j),1)
end do
end do
x_m = x%get_nrows() end function d_base_mlv_dot_col_a
x_n = x%get_ncols()
y_m = size(y,dim=1)
y_n = size(y,dim=2)
if (t_) then !
call dgemm('T','N',x_n,y_n,x_n,done,x%v,x_n,y,y_m,dzero,res,x_n) ! Row Dot products
else !
call dgemm('N','N',x_m,y_n,x_n,done,x%v,x_m,y,y_m,dzero,res,x_m) !
end if !> Function base_mlv_dot_col_v
!! \memberof psb_d_base_multivect_type
!! \brief Row-by-col mult using dot product by mlv
!! \param nr Number of rows to be considered
!! \param y The other (base_mlv_vect) to be multiplied by
!! \param res Result vector
!!
function d_base_mlv_dot_row_v(nr,x,y) result(res)
implicit none
class(psb_d_base_multivect_type), intent(inout) :: x, y
integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res(:,:)
real(psb_dpk_), external :: ddot
integer(psb_ipk_) :: i, j, n_x, n_y
if (x%is_dev()) call x%sync()
!
! Note: this is the base implementation.
! When we get here, we are sure that X is of
! TYPE psb_d_base_mlv_vect (or its class does not care).
! If Y is not, throw the burden on it, implicitly
! calling dot_a
!
select type(yy => y)
type is (psb_d_base_multivect_type)
if (y%is_dev()) call y%sync()
n_x = psb_size(x%v,2_psb_ipk_)
n_y = psb_size(y%v,2_psb_ipk_)
allocate(res(nr,n_y))
do i=1,nr
do j=1,n_y
res(i,j) = ddot(n_x,x%v(i,:),1,y%v(:,j),1)
end do
end do
class default
res = x%dot_row(nr,y%v)
end select
end function d_base_mlv_dot_row_v
!
! Base workhorse is good old BLAS1
!
!
!> Function base_mlv_dot_row_a
!! \memberof psb_d_base_multivect_type
!! \brief Row-by-col mult using dot product by a normal array
!! \param nr Number of rows to be considered
!! \param y(:,:) The array to be multiplied by
!! \param res Result vector
!!
function d_base_mlv_dot_row_a(nr,x,y) result(res)
class(psb_d_base_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:)
real(psb_dpk_), allocatable :: res(:,:)
real(psb_dpk_), external :: ddot
integer(psb_ipk_) :: i, j, n_x, n_y
end subroutine d_base_mlv_dot_a if (x%is_dev()) call x%sync()
n_x = psb_size(x%v,2_psb_ipk_)
n_y = size(y,2_psb_ipk_)
allocate(res(psb_size(x%v,1_psb_ipk_),n_y))
do i=1,nr
do j=1,n_y
res(i,j) = ddot(n_x,x%v(i,:),1,y(:,j),1)
end do
end do
end function d_base_mlv_dot_row_a
! !
! AXPBY is invoked via Y, hence the structure below. ! AXPBY is invoked via Y, hence the structure below.
@ -2928,7 +2993,7 @@ contains
select type(xx => x) select type(xx => x)
type is (psb_d_base_multivect_type) type is (psb_d_base_multivect_type)
call psb_geaxpby(m,nc,alpha,x%v,beta,y%v,info) call psb_geaxpby(m,nc,alpha,x%v,beta,y%v,info)
class default class default
call y%axpby(m,alpha,x%v,beta,info,n=n) call y%axpby(m,alpha,x%v,beta,info,n=n)
end select end select
@ -3215,17 +3280,17 @@ contains
!> Function base_mlv_nrm2 !> Function base_mlv_nrm2
!! \memberof psb_d_base_multivect_type !! \memberof psb_d_base_multivect_type
!! \brief 2-norm |x(1:n)|_2 !! \brief 2-norm |x(1:n)|_2
!! \param nc how many entries to consider !! \param nr how many rows to consider
function d_base_mlv_nrm2(nc,x) result(res) function d_base_mlv_nrm2(nr,x) result(res)
implicit none implicit none
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res real(psb_dpk_), allocatable :: res
real(psb_dpk_), external :: dnrm2 real(psb_dpk_), external :: dnrm2
integer(psb_ipk_) :: j, nr integer(psb_ipk_) :: j, nc
if (x%is_dev()) call x%sync() if (x%is_dev()) call x%sync()
nr = x%get_nrows() nc = x%get_ncols()
res = dnrm2(nc*nr,x%v,1) res = dnrm2(nc*nr,x%v,1)
end function d_base_mlv_nrm2 end function d_base_mlv_nrm2
@ -3234,16 +3299,16 @@ contains
!> Function base_mlv_amax !> Function base_mlv_amax
!! \memberof psb_d_base_multivect_type !! \memberof psb_d_base_multivect_type
!! \brief infinity-norm |x(1:n)|_\infty !! \brief infinity-norm |x(1:n)|_\infty
!! \param nc how many entries to consider !! \param nr how many rows to consider
function d_base_mlv_amax(nc,x) result(res) function d_base_mlv_amax(nr,x) result(res)
implicit none implicit none
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_) :: res real(psb_dpk_) :: res
integer(psb_ipk_) :: i, nr integer(psb_ipk_) :: i, nc
if (x%is_dev()) call x%sync() if (x%is_dev()) call x%sync()
nr = x%get_nrows() nc = x%get_ncols()
res = 0 res = 0
do i=1,nr do i=1,nr
res = max(res,sum(abs(x%v(i,1:nc)))) res = max(res,sum(abs(x%v(i,1:nc))))
@ -3255,16 +3320,16 @@ contains
!> Function base_mlv_asum !> Function base_mlv_asum
!! \memberof psb_d_base_multivect_type !! \memberof psb_d_base_multivect_type
!! \brief 1-norm |x(1:n)|_1 !! \brief 1-norm |x(1:n)|_1
!! \param nc how many entries to consider !! \param nr how many rows to consider
function d_base_mlv_asum(nc,x) result(res) function d_base_mlv_asum(nr,x) result(res)
implicit none implicit none
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res real(psb_dpk_), allocatable :: res
integer(psb_ipk_) :: j, nr integer(psb_ipk_) :: j, nc
if (x%is_dev()) call x%sync() if (x%is_dev()) call x%sync()
nr = x%get_nrows() nc = x%get_ncols()
res = 0 res = 0
do j=1,nc do j=1,nc
res = max(res,sum(abs(x%v(1:nr,j)))) res = max(res,sum(abs(x%v(1:nr,j))))
@ -3314,10 +3379,10 @@ contains
!! \param info Return code !! \param info Return code
!! \brief QR factorization !! \brief QR factorization
! !
subroutine d_base_mlv_qr_fact(x, res, info) function d_base_mlv_qr_fact(x, info) result(res)
implicit none implicit none
class(psb_d_base_multivect_type), intent(inout) :: x class(psb_d_base_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(inout) :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
real(psb_dpk_), allocatable :: tau(:), work(:) real(psb_dpk_), allocatable :: tau(:), work(:)
integer(psb_ipk_) :: i, j, m, n, lda, lwork integer(psb_ipk_) :: i, j, m, n, lda, lwork
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
@ -3330,7 +3395,7 @@ contains
n = x%get_ncols() n = x%get_ncols()
lda = m lda = m
lwork = n lwork = n
allocate(tau(n), work(lwork)) allocate(tau(n), work(lwork), res(n,n))
! Perform QR factorization ! Perform QR factorization
call dgeqrf(m, n, x%v, lda, tau, work, lwork, info) call dgeqrf(m, n, x%v, lda, tau, work, lwork, info)
@ -3348,7 +3413,7 @@ contains
deallocate(tau, work) deallocate(tau, work)
end subroutine d_base_mlv_qr_fact end function d_base_mlv_qr_fact
function d_base_mlv_use_buffer() result(res) function d_base_mlv_use_buffer() result(res)
implicit none implicit none

99
base/modules/serial/psb_d_vect_mod.F90
Unescape Escape View File

@ -1389,12 +1389,15 @@ module psb_d_multivect_mod
! !
! Dot product and AXPBY ! Dot product and AXPBY
! !
procedure, pass(x) :: dot_v => d_vect_dot_v procedure, pass(x) :: dot_col_v => d_vect_dot_col_v
procedure, pass(x) :: dot_a => d_vect_dot_a procedure, pass(x) :: dot_col_a => d_vect_dot_col_a
generic, public :: dot => dot_v, dot_a generic, public :: dot_col => dot_col_v, dot_col_a
procedure, pass(y) :: axpby_v => d_vect_axpby_v procedure, pass(x) :: dot_row_v => d_vect_dot_row_v
procedure, pass(y) :: axpby_a => d_vect_axpby_a procedure, pass(x) :: dot_row_a => d_vect_dot_row_a
generic, public :: axpby => axpby_v, axpby_a generic, public :: dot_row => dot_row_v, dot_row_a
procedure, pass(y) :: axpby_v => d_vect_axpby_v
procedure, pass(y) :: axpby_a => d_vect_axpby_a
generic, public :: axpby => axpby_v, axpby_a
! !
! MultiVector by vector/multivector multiplication. Need all variants ! MultiVector by vector/multivector multiplication. Need all variants
! to handle multiple requirements from preconditioners ! to handle multiple requirements from preconditioners
@ -1548,9 +1551,11 @@ contains
class(psb_d_multivect_type), intent(out) :: x class(psb_d_multivect_type), intent(out) :: x
class(psb_d_base_multivect_type), intent(in), optional :: mold class(psb_d_base_multivect_type), intent(in), optional :: mold
integer(psb_ipk_) :: info integer(psb_ipk_) :: info
class(psb_d_base_multivect_type), pointer :: mld
info = psb_success_ info = psb_success_
if (allocated(x%v)) &
& call x%free(info)
if (present(mold)) then if (present(mold)) then
allocate(x%v,stat=info,mold=mold) allocate(x%v,stat=info,mold=mold)
else else
@ -1837,41 +1842,67 @@ contains
class(psb_d_base_multivect_type), allocatable :: tmp class(psb_d_base_multivect_type), allocatable :: tmp
integer(psb_ipk_) :: info integer(psb_ipk_) :: info
info = psb_success_
if (present(mold)) then if (present(mold)) then
allocate(tmp,stat=info,mold=mold) allocate(tmp,stat=info,mold=mold)
else else
allocate(tmp,stat=info, mold=psb_d_get_base_multivect_default()) allocate(tmp,stat=info,mold=psb_d_get_base_multivect_default())
endif endif
if (allocated(x%v)) then if (allocated(x%v)) then
call x%v%sync() if (allocated(x%v%v)) then
if (info == psb_success_) call tmp%bld(x%v%v) call x%v%sync()
call x%v%free(info) if (info == psb_success_) call tmp%bld(x%v%v)
call x%v%free(info)
endif
end if end if
call move_alloc(tmp,x%v) call move_alloc(tmp,x%v)
end subroutine d_vect_cnv end subroutine d_vect_cnv
subroutine d_vect_dot_v(x,y,res,t) function d_vect_dot_col_v(nr,x,y) result(res)
implicit none
class(psb_d_multivect_type), intent(inout) :: x, y
integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res(:,:)
if (allocated(x%v).and.allocated(y%v)) &
& res = x%v%dot_col(nr,y%v)
end function d_vect_dot_col_v
function d_vect_dot_col_a(nr,x,y) result(res)
implicit none
class(psb_d_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:)
integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res(:,:)
if (allocated(x%v)) &
& res = x%v%dot_col(nr,y)
end function d_vect_dot_col_a
function d_vect_dot_row_v(nr,x,y) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x, y class(psb_d_multivect_type), intent(inout) :: x, y
real(psb_dpk_), intent(inout) :: res(:,:) integer(psb_ipk_), intent(in) :: nr
logical, optional, intent(in) :: t real(psb_dpk_), allocatable :: res(:,:)
if (allocated(x%v).and.allocated(y%v)) & if (allocated(x%v).and.allocated(y%v)) &
& call x%v%dot(y%v,res,t) & res = x%v%dot_row(nr,y%v)
end subroutine d_vect_dot_v end function d_vect_dot_row_v
subroutine d_vect_dot_a(x,y,res,t) function d_vect_dot_row_a(nr,x,y) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x class(psb_d_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:) real(psb_dpk_), intent(in) :: y(:,:)
real(psb_dpk_), intent(inout) :: res(:,:) integer(psb_ipk_), intent(in) :: nr
logical, optional, intent(in) :: t real(psb_dpk_), allocatable :: res(:,:)
if (allocated(x%v)) & if (allocated(x%v)) &
& call x%v%dot(y,res,t) & res = x%v%dot_row(nr,y)
end subroutine d_vect_dot_a end function d_vect_dot_row_a
subroutine d_vect_axpby_v(m,alpha, x, beta, y, info) subroutine d_vect_axpby_v(m,alpha, x, beta, y, info)
use psi_serial_mod use psi_serial_mod
@ -2014,57 +2045,57 @@ contains
!!$ !!$
!!$ !!$
function d_vect_nrm2(nc,x) result(res) function d_vect_nrm2(nr,x) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x class(psb_d_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_), allocatable :: res real(psb_dpk_), allocatable :: res
if (allocated(x%v)) then if (allocated(x%v)) then
res = x%v%nrm2(nc) res = x%v%nrm2(nr)
else else
res = dzero res = dzero
end if end if
end function d_vect_nrm2 end function d_vect_nrm2
function d_vect_amax(nc,x) result(res) function d_vect_amax(nr,x) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x class(psb_d_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_) :: res real(psb_dpk_) :: res
if (allocated(x%v)) then if (allocated(x%v)) then
res = x%v%amax(nc) res = x%v%amax(nr)
else else
res = dzero res = dzero
end if end if
end function d_vect_amax end function d_vect_amax
function d_vect_asum(nc,x) result(res) function d_vect_asum(nr,x) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x class(psb_d_multivect_type), intent(inout) :: x
integer(psb_ipk_), intent(in) :: nc integer(psb_ipk_), intent(in) :: nr
real(psb_dpk_) :: res real(psb_dpk_) :: res
if (allocated(x%v)) then if (allocated(x%v)) then
res = x%v%asum(nc) res = x%v%asum(nr)
else else
res = dzero res = dzero
end if end if
end function d_vect_asum end function d_vect_asum
subroutine d_vect_qr_fact(x, res, info) function d_vect_qr_fact(x, info) result(res)
implicit none implicit none
class(psb_d_multivect_type), intent(inout) :: x class(psb_d_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(inout) :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
if (allocated(x%v)) then if (allocated(x%v)) then
call x%v%qr_fact(res, info) res = x%v%qr_fact(info)
endif endif
end subroutine d_vect_qr_fact end function d_vect_qr_fact
end module psb_d_multivect_mod end module psb_d_multivect_mod

7
base/psblas/psb_damax.f90
Unescape Escape View File

@ -417,10 +417,9 @@ function psb_damax_multivect(x, desc_a, info, global) result(res)
ix = 1 ix = 1
jx = 1 jx = 1
m = x%get_nrows() m = desc_a%get_global_rows()
n = x%get_ncols()
call psb_chkvect(m,n,x%get_nrows(),ix,jx,desc_a,info,iix,jjx) call psb_chkvect(m,x%get_ncols(),x%get_nrows(),ix,jx,desc_a,info,iix,jjx)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect' ch_err='psb_chkvect'
@ -436,7 +435,7 @@ function psb_damax_multivect(x, desc_a, info, global) result(res)
! compute local max ! compute local max
if ((desc_a%get_local_rows() > 0).and.(m /= 0)) then if ((desc_a%get_local_rows() > 0).and.(m /= 0)) then
res = x%amax(x%get_ncols()) res = x%amax(desc_a%get_local_rows())
else else
res = dzero res = dzero
end if end if

25
base/psblas/psb_daxpby.f90
Unescape Escape View File

@ -159,7 +159,7 @@ subroutine psb_daxpby_multivect(alpha, x, beta, y, desc_a, info)
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, err_act, iix, jjx, iiy, jjy integer(psb_ipk_) :: np, me, err_act, iix, jjx, iiy, jjy
integer(psb_lpk_) :: ix, ijx, iy, ijy, x_m, x_n, y_m, y_n integer(psb_lpk_) :: ix, ijx, iy, ijy, m
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_dgeaxpby' name='psb_dgeaxpby'
@ -192,21 +192,17 @@ subroutine psb_daxpby_multivect(alpha, x, beta, y, desc_a, info)
iy = ione iy = ione
ijy = ione ijy = ione
x_m = x%get_nrows() m = desc_a%get_global_rows()
x_n = x%get_ncols()
y_m = y%get_nrows()
y_n = y%get_ncols()
! check vector correctness ! check vector correctness
call psb_chkvect(x_m,x_n,x%get_nrows(),ix,ijx,desc_a,info,iix,jjx) call psb_chkvect(m,x%get_ncols(),x%get_nrows(),ix,ijx,desc_a,info,iix,jjx)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect 1' ch_err='psb_chkvect 1'
call psb_errpush(info,name,a_err=ch_err) call psb_errpush(info,name,a_err=ch_err)
goto 9999 goto 9999
end if end if
call psb_chkvect(y_m,y_n,y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy) call psb_chkvect(m,y%get_ncols(),y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect 2' ch_err='psb_chkvect 2'
@ -249,8 +245,8 @@ end subroutine psb_daxpby_multivect
! Note: from a functional point of view, X is input, but here ! Note: from a functional point of view, X is input, but here
! it's declared INOUT because of the sync() methods. ! it's declared INOUT because of the sync() methods.
! !
subroutine psb_daxpby_multivect_1(alpha, x, beta, y, desc_a, info) subroutine psb_daxpby_multivect_a(alpha, x, beta, y, desc_a, info)
use psb_base_mod, psb_protect_name => psb_daxpby_multivect_1 use psb_base_mod, psb_protect_name => psb_daxpby_multivect_a
implicit none implicit none
real(psb_dpk_), intent(in) :: x(:,:) real(psb_dpk_), intent(in) :: x(:,:)
type(psb_d_multivect_type), intent (inout) :: y type(psb_d_multivect_type), intent (inout) :: y
@ -261,7 +257,7 @@ subroutine psb_daxpby_multivect_1(alpha, x, beta, y, desc_a, info)
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, err_act, iiy, jjy integer(psb_ipk_) :: np, me, err_act, iiy, jjy
integer(psb_lpk_) :: iy, ijy, y_m, y_n integer(psb_lpk_) :: iy, ijy, m
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_dgeaxpby' name='psb_dgeaxpby'
@ -286,10 +282,9 @@ subroutine psb_daxpby_multivect_1(alpha, x, beta, y, desc_a, info)
iy = ione iy = ione
ijy = ione ijy = ione
y_m = y%get_nrows() m = desc_a%get_global_rows()
y_n = y%get_ncols()
call psb_chkvect(y_m,y_n,y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy) call psb_chkvect(m,y%get_ncols(),y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect 2' ch_err='psb_chkvect 2'
@ -313,7 +308,7 @@ subroutine psb_daxpby_multivect_1(alpha, x, beta, y, desc_a, info)
return return
end subroutine psb_daxpby_multivect_1 end subroutine psb_daxpby_multivect_a
! !
! Parallel Sparse BLAS version 3.5 ! Parallel Sparse BLAS version 3.5

125
base/psblas/psb_ddot.f90
Unescape Escape View File

@ -158,8 +158,8 @@ function psb_ddot_vect(x, y, desc_a,info,global) result(res)
end function psb_ddot_vect end function psb_ddot_vect
! !
! Function: psb_ddot_multivect ! Function: psb_ddot_multivect_col_v
! psb_ddot computes the dot product of two distributed vectors, ! psb_ddot computes the col-by-col dot product of two distributed vectors,
! !
! dot := ( X )**C * ( Y ) ! dot := ( X )**C * ( Y )
! !
@ -169,35 +169,33 @@ end function psb_ddot_vect
! y - type(psb_d_multivect_type) The input vector containing the entries of sub( Y ). ! y - type(psb_d_multivect_type) The input vector containing the entries of sub( Y ).
! desc_a - type(psb_desc_type). The communication descriptor. ! desc_a - type(psb_desc_type). The communication descriptor.
! info - integer. Return code ! info - integer. Return code
! t - logical(optional) Whether x is transposed, default: .false.
! global - logical(optional) Whether to perform the global sum, default: .true. ! global - logical(optional) Whether to perform the global sum, default: .true.
! !
! Note: from a functional point of view, X and Y are input, but here ! Note: from a functional point of view, X and Y are input, but here
! they are declared INOUT because of the sync() methods. ! they are declared INOUT because of the sync() methods.
! !
! !
function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res) function psb_ddot_multivect_col_v(x, y, desc_a,info,global) result(res)
use psb_desc_mod use psb_desc_mod
use psb_d_base_mat_mod use psb_d_base_mat_mod
use psb_check_mod use psb_check_mod
use psb_error_mod use psb_error_mod
use psb_penv_mod use psb_penv_mod
use psb_d_vect_mod use psb_d_vect_mod
use psb_d_psblas_mod, psb_protect_name => psb_ddot_multivect use psb_d_psblas_mod, psb_protect_name => psb_ddot_multivect_col_v
implicit none implicit none
real(psb_dpk_), allocatable :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
type(psb_d_multivect_type), intent(inout) :: x, y type(psb_d_multivect_type), intent(inout) :: x, y
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, optional, intent(in) :: t
logical, intent(in), optional :: global logical, intent(in), optional :: global
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, idx, ndm,& integer(psb_ipk_) :: np, me, idx, ndm,&
& err_act, iix, jjx, iiy, jjy, i, nr & err_act, iix, jjx, iiy, jjy, i, j, k, nr
integer(psb_lpk_) :: ix, ijx, iy, ijy, x_m, x_n, y_m, y_n integer(psb_lpk_) :: ix, ijx, iy, ijy, m
logical :: global_, t_ logical :: global_
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_ddot_multivect' name='psb_ddot_multivect'
@ -225,12 +223,6 @@ function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res)
goto 9999 goto 9999
endif endif
if (present(t)) then
t_ = t
else
t_ = .false.
end if
if (present(global)) then if (present(global)) then
global_ = global global_ = global
else else
@ -243,16 +235,13 @@ function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res)
iy = ione iy = ione
ijy = ione ijy = ione
x_m = x%get_nrows() ! TODO
x_n = x%get_ncols() m = desc_a%get_global_rows()
y_m = y%get_nrows()
y_n = y%get_ncols()
! check vector correctness ! check vector correctness
call psb_chkvect(x_m,x_n,x%get_nrows(),ix,ijx,desc_a,info,iix,jjx) call psb_chkvect(m,x%get_ncols(),x%get_nrows(),ix,ijx,desc_a,info,iix,jjx)
if (info == psb_success_) & if (info == psb_success_) &
& call psb_chkvect(y_m,y_n,y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy) & call psb_chkvect(m,y%get_ncols(),y%get_nrows(),iy,ijy,desc_a,info,iiy,jjy)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect' ch_err='psb_chkvect'
@ -269,28 +258,26 @@ function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res)
nr = desc_a%get_local_rows() nr = desc_a%get_local_rows()
if(nr > 0) then if(nr > 0) then
if (t_) then res = x%dot_col(nr,y)
allocate(res(x_n,y_n))
else
allocate(res(x_m,y_n))
endif
call x%dot(y,res,t_)
! TODO adjust dot_local because overlapped elements are computed more than once ! TODO adjust dot_local because overlapped elements are computed more than once
! if (size(desc_a%ovrlap_elem,1)>0) then if (size(desc_a%ovrlap_elem,1)>0) then
! if (x%v%is_dev()) call x%sync() if (x%v%is_dev()) call x%sync()
! if (y%v%is_dev()) call y%sync() if (y%v%is_dev()) call y%sync()
! do i=1,size(desc_a%ovrlap_elem,1) do j=1,x%get_ncols()
! idx = desc_a%ovrlap_elem(i,1) do i=1,size(desc_a%ovrlap_elem,1)
! ndm = desc_a%ovrlap_elem(i,2) idx = desc_a%ovrlap_elem(i,1)
! res = res - (real(ndm-1)/real(ndm))*(x%v%v(idx)*y%v%v(idx)) ndm = desc_a%ovrlap_elem(i,2)
! end do res(idx,j) = res(idx,j) - (real(ndm-1)/real(ndm))*(x%v%v(idx,j)*y%v%v(idx,j))
! end if end do
end do
end if
else else
allocate(res(size(x%v%v,2_psb_ipk_),size(y%v%v,2_psb_ipk_)))
res = dzero res = dzero
end if end if
! compute global sum ! TODO compute global sum
if (global_) call psb_sum(ctxt, res) if (global_) call psb_sum(ctxt, res)
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -300,10 +287,10 @@ function psb_ddot_multivect(x, y, desc_a,info,t,global) result(res)
return return
end function psb_ddot_multivect end function psb_ddot_multivect_col_v
! !
! Function: psb_ddot_multivect_1 ! Function: psb_ddot_multivect_row_a
! psb_ddot computes the dot product of two distributed vectors, ! psb_ddot computes the row-by-col dot product of two distributed vectors,
! !
! dot := ( X )**C * ( Y ) ! dot := ( X )**C * ( Y )
! !
@ -313,36 +300,34 @@ end function psb_ddot_multivect
! y - real(psb_dpk_)(:,:) The input vector containing the entries of sub( Y ). ! y - real(psb_dpk_)(:,:) The input vector containing the entries of sub( Y ).
! desc_a - type(psb_desc_type). The communication descriptor. ! desc_a - type(psb_desc_type). The communication descriptor.
! info - integer. Return code ! info - integer. Return code
! t - logical(optional) Whether x is transposed, default: .false.
! global - logical(optional) Whether to perform the global sum, default: .true. ! global - logical(optional) Whether to perform the global sum, default: .true.
! !
! Note: from a functional point of view, X and Y are input, but here ! Note: from a functional point of view, X and Y are input, but here
! they are declared INOUT because of the sync() methods. ! they are declared INOUT because of the sync() methods.
! !
! !
function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res) function psb_ddot_multivect_row_a(x, y, desc_a, info, global) result(res)
use psb_desc_mod use psb_desc_mod
use psb_d_base_mat_mod use psb_d_base_mat_mod
use psb_check_mod use psb_check_mod
use psb_error_mod use psb_error_mod
use psb_penv_mod use psb_penv_mod
use psb_d_vect_mod use psb_d_vect_mod
use psb_d_psblas_mod, psb_protect_name => psb_ddot_multivect_1 use psb_d_psblas_mod, psb_protect_name => psb_ddot_multivect_row_a
implicit none implicit none
real(psb_dpk_), allocatable :: res(:,:) real(psb_dpk_), allocatable :: res(:,:)
type(psb_d_multivect_type), intent(inout) :: x type(psb_d_multivect_type), intent(inout) :: x
real(psb_dpk_), intent(in) :: y(:,:) real(psb_dpk_), intent(in) :: y(:,:)
type(psb_desc_type), intent(in) :: desc_a type(psb_desc_type), intent(in) :: desc_a
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
logical, optional, intent(in) :: t
logical, intent(in), optional :: global logical, intent(in), optional :: global
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, idx, ndm,& integer(psb_ipk_) :: np, me, idx, ndm,&
& err_act, iix, jjx, i, nr & err_act, iix, jjx, i, j, nr
integer(psb_lpk_) :: ix, ijx, iy, ijy, x_m, x_n, y_n integer(psb_lpk_) :: ix, ijx, iy, ijy, m
logical :: global_, t_ logical :: global_
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_ddot_multivect' name='psb_ddot_multivect'
@ -365,12 +350,6 @@ function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res)
goto 9999 goto 9999
endif endif
if (present(t)) then
t_ = t
else
t_ = .false.
end if
if (present(global)) then if (present(global)) then
global_ = global global_ = global
else else
@ -380,13 +359,10 @@ function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res)
ix = ione ix = ione
ijx = ione ijx = ione
x_m = x%get_nrows() m = desc_a%get_global_rows()
x_n = x%get_ncols()
y_n = size(y,dim=2)
! check vector correctness ! check vector correctness
call psb_chkvect(x_m,x_n,x%get_nrows(),ix,ijx,desc_a,info,iix,jjx) call psb_chkvect(m,x%get_ncols(),x%get_nrows(),ix,ijx,desc_a,info,iix,jjx)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect' ch_err='psb_chkvect'
@ -403,28 +379,25 @@ function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res)
nr = desc_a%get_local_rows() nr = desc_a%get_local_rows()
if(nr > 0) then if(nr > 0) then
if (t_) then res = x%dot_row(nr,y)
allocate(res(x_n,y_n))
else
allocate(res(x_m,y_n))
endif
call x%dot(y,res,t_)
! TODO adjust dot_local because overlapped elements are computed more than once ! TODO adjust dot_local because overlapped elements are computed more than once
! if (size(desc_a%ovrlap_elem,1)>0) then if (size(desc_a%ovrlap_elem,1)>0) then
! if (x%v%is_dev()) call x%sync() if (x%v%is_dev()) call x%sync()
! if (y%v%is_dev()) call y%sync() do j=1,x%get_ncols()
! do i=1,size(desc_a%ovrlap_elem,1) do i=1,size(desc_a%ovrlap_elem,1)
! idx = desc_a%ovrlap_elem(i,1) idx = desc_a%ovrlap_elem(i,1)
! ndm = desc_a%ovrlap_elem(i,2) ndm = desc_a%ovrlap_elem(i,2)
! res = res - (real(ndm-1)/real(ndm))*(x%v%v(idx)*y%v%v(idx)) res(idx,j) = res(idx,j) - (real(ndm-1)/real(ndm))*(x%v%v(idx,j)*y(idx,j))
! end do end do
! end if end do
end if
else else
allocate(res(nr,size(y,2_psb_ipk_)))
res = dzero res = dzero
end if end if
! compute global sum ! TODO compute global sum
if (global_) call psb_sum(ctxt, res) if (global_) call psb_sum(ctxt, res)
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -434,7 +407,7 @@ function psb_ddot_multivect_1(x, y, desc_a,info,t,global) result(res)
return return
end function psb_ddot_multivect_1 end function psb_ddot_multivect_row_a
! !
! Function: psb_ddot ! Function: psb_ddot
! psb_ddot computes the dot product of two distributed vectors, ! psb_ddot computes the dot product of two distributed vectors,

32
base/psblas/psb_dnrm2.f90
Unescape Escape View File

@ -400,7 +400,8 @@ function psb_dnrm2_multivect(x, desc_a, info,global) result(res)
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, err_act, iix, jjx integer(psb_ipk_) :: np, me, err_act, idx, i, j, iix, jjx, ldx, ndm
real(psb_dpk_) :: dd
integer(psb_lpk_) :: ix, jx, m, n integer(psb_lpk_) :: ix, jx, m, n
logical :: global_ logical :: global_
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
@ -436,10 +437,11 @@ function psb_dnrm2_multivect(x, desc_a, info,global) result(res)
ix = 1 ix = 1
jx = 1 jx = 1
m = x%get_nrows() m = desc_a%get_global_rows()
n = x%get_ncols() n = x%get_ncols()
ldx = x%get_nrows()
call psb_chkvect(m,n,x%get_nrows(),ix,jx,desc_a,info,iix,jjx) call psb_chkvect(m,n,ldx,ix,jx,desc_a,info,iix,jjx)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect' ch_err='psb_chkvect'
@ -453,21 +455,25 @@ function psb_dnrm2_multivect(x, desc_a, info,global) result(res)
end if end if
if (desc_a%get_local_rows() > 0) then if (desc_a%get_local_rows() > 0) then
res = x%nrm2(x%get_ncols()) res = x%nrm2(desc_a%get_local_rows())
! TODO adjust because overlapped elements are computed more than once ! TODO adjust because overlapped elements are computed more than once
! if (size(desc_a%ovrlap_elem,1)>0) then if (size(desc_a%ovrlap_elem,1)>0) then
! if (x%is_dev()) call x%sync() if (x%v%is_dev()) call x%sync()
! do i=1,size(desc_a%ovrlap_elem,1) do j=1,x%get_ncols()
! idx = desc_a%ovrlap_elem(i,1) do i=1,size(desc_a%ovrlap_elem,1)
! ndm = desc_a%ovrlap_elem(i,2) idx = desc_a%ovrlap_elem(i,1)
! dd = dble(ndm-1)/dble(ndm) ndm = desc_a%ovrlap_elem(i,2)
! res = res * sqrt(done - dd*(abs(x%v%v(idx))/res)**2) dd = dble(ndm-1)/dble(ndm)
! end do res = res * sqrt(done - dd*(abs(x%v%v(idx,j))/res)**2)
! end if end do
end do
end if
else else
res = dzero res = dzero
end if end if
! TODO
if (global_) call psb_nrm2(ctxt,res) if (global_) call psb_nrm2(ctxt,res)
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)

11
base/psblas/psb_dqrfact.f90
Unescape Escape View File

@ -21,7 +21,7 @@ function psb_dqrfact(x, desc_a, info) result(res)
! locals ! locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np, me, err_act, iix, jjx integer(psb_ipk_) :: np, me, err_act, iix, jjx
integer(psb_lpk_) :: ix, ijx, x_m, x_n integer(psb_lpk_) :: ix, ijx, m
character(len=20) :: name, ch_err character(len=20) :: name, ch_err
name='psb_dgqrfact' name='psb_dgqrfact'
@ -46,10 +46,9 @@ function psb_dqrfact(x, desc_a, info) result(res)
ix = ione ix = ione
ijx = ione ijx = ione
x_m = x%get_nrows() m = desc_a%get_global_rows()
x_n = x%get_ncols()
call psb_chkvect(x_m,x_n,x%get_nrows(),ix,ijx,desc_a,info,iix,jjx) call psb_chkvect(m,x%get_ncols(),x%get_nrows(),ix,ijx,desc_a,info,iix,jjx)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
ch_err='psb_chkvect' ch_err='psb_chkvect'
@ -62,9 +61,9 @@ function psb_dqrfact(x, desc_a, info) result(res)
call psb_errpush(info,name) call psb_errpush(info,name)
end if end if
! TODO serial?
if(desc_a%get_local_rows() > 0) then if(desc_a%get_local_rows() > 0) then
allocate(res(x_n,x_n)) res = x%qr_fact(info)
call x%qr_fact(res, info)
end if end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)

4
base/psblas/psb_dspmm.f90
Unescape Escape View File

@ -365,8 +365,8 @@ subroutine psb_dspmv_multivect(alpha, a, x, beta, y, desc_a, info, trans, work,d
ncol = desc_a%get_local_cols() ncol = desc_a%get_local_cols()
lldx = x%get_nrows() lldx = x%get_nrows()
lldy = y%get_nrows() lldy = y%get_nrows()
if ((info == 0).and.(lldx<ncol)) call x%reall(ncol,nrow,info) if ((info == 0).and.(lldx<ncol)) call x%reall(ncol,x%get_ncols(),info)
if ((info == 0).and.(lldy<ncol)) call y%reall(ncol,nrow,info) if ((info == 0).and.(lldy<ncol)) call y%reall(ncol,y%get_ncols(),info)
if (psb_errstatus_fatal()) then if (psb_errstatus_fatal()) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_

27
base/tools/psb_dallc.f90
Unescape Escape View File

@ -282,7 +282,7 @@ subroutine psb_dalloc_multivect(x, desc_a,info,n, dupl, bldmode)
!locals !locals
type(psb_ctxt_type) :: ctxt type(psb_ctxt_type) :: ctxt
integer(psb_ipk_) :: np,me,nr,i,err_act, n_, lb_ integer(psb_ipk_) :: np,me,nr,i,err_act, n_
integer(psb_ipk_) :: dupl_, bldmode_, nrmt_ integer(psb_ipk_) :: dupl_, bldmode_, nrmt_
integer(psb_ipk_) :: exch(1) integer(psb_ipk_) :: exch(1)
integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: debug_level, debug_unit
@ -333,9 +333,9 @@ subroutine psb_dalloc_multivect(x, desc_a,info,n, dupl, bldmode)
! As this is a rank-1 array, optional parameter N is actually ignored. ! As this is a rank-1 array, optional parameter N is actually ignored.
!....allocate x ..... !....allocate x .....
if (desc_a%is_asb().or.desc_a%is_upd()) then if (psb_is_asb_desc(desc_a).or.psb_is_upd_desc(desc_a)) then
nr = max(1,desc_a%get_local_cols()) nr = max(1,desc_a%get_local_cols())
else if (desc_a%is_bld()) then else if (psb_is_bld_desc(desc_a)) then
nr = max(1,desc_a%get_local_rows()) nr = max(1,desc_a%get_local_rows())
else else
info = psb_err_internal_error_ info = psb_err_internal_error_
@ -346,12 +346,12 @@ subroutine psb_dalloc_multivect(x, desc_a,info,n, dupl, bldmode)
allocate(psb_d_base_multivect_type :: x%v, stat=info) allocate(psb_d_base_multivect_type :: x%v, stat=info)
if (info == 0) call x%all(nr,n_,info) if (info == 0) call x%all(nr,n_,info)
if (info == 0) call x%zero() if (info == 0) call x%zero()
if (psb_errstatus_fatal()) then if (psb_errstatus_fatal()) then
info=psb_err_alloc_request_ info=psb_err_alloc_request_
call psb_errpush(info,name,i_err=(/nr/),a_err='real(psb_spk_)') call psb_errpush(info,name,i_err=(/nr/),a_err='real(psb_spk_)')
goto 9999 goto 9999
endif endif
if (present(bldmode)) then if (present(bldmode)) then
bldmode_ = bldmode bldmode_ = bldmode
else else
@ -364,6 +364,7 @@ subroutine psb_dalloc_multivect(x, desc_a,info,n, dupl, bldmode)
end if end if
call x%set_dupl(dupl_) call x%set_dupl(dupl_)
call x%set_remote_build(bldmode_) call x%set_remote_build(bldmode_)
call x%set_nrmv(0)
if (x%is_remote_build()) then if (x%is_remote_build()) then
nrmt_ = max(100,(desc_a%get_local_cols()-desc_a%get_local_rows())) nrmt_ = max(100,(desc_a%get_local_cols()-desc_a%get_local_rows()))
allocate(x%rmtv(nrmt_,n_)) allocate(x%rmtv(nrmt_,n_))
@ -451,6 +452,19 @@ subroutine psb_dalloc_multivect_r2(x, desc_a,info,m,n,lb, dupl, bldmode)
lb_ = 1 lb_ = 1
endif endif
!global check on m parameters
if (me == psb_root_) then
exch(1)=m_
call psb_bcast(ctxt,exch(1),root=psb_root_)
else
call psb_bcast(ctxt,exch(1),root=psb_root_)
if (exch(1) /= m_) then
info=psb_err_parm_differs_among_procs_
call psb_errpush(info,name,i_err=(/ione/))
goto 9999
endif
endif
!global check on n parameters !global check on n parameters
if (me == psb_root_) then if (me == psb_root_) then
exch(1)=n_ exch(1)=n_
@ -466,9 +480,9 @@ subroutine psb_dalloc_multivect_r2(x, desc_a,info,m,n,lb, dupl, bldmode)
! As this is a rank-1 array, optional parameter N is actually ignored. ! As this is a rank-1 array, optional parameter N is actually ignored.
!....allocate x ..... !....allocate x .....
if (desc_a%is_asb().or.desc_a%is_upd()) then if (psb_is_asb_desc(desc_a).or.psb_is_upd_desc(desc_a)) then
nr = max(1,desc_a%get_local_cols()) nr = max(1,desc_a%get_local_cols())
else if (desc_a%is_bld()) then else if (psb_is_bld_desc(desc_a)) then
nr = max(1,desc_a%get_local_rows()) nr = max(1,desc_a%get_local_rows())
else else
info = psb_err_internal_error_ info = psb_err_internal_error_
@ -500,6 +514,7 @@ subroutine psb_dalloc_multivect_r2(x, desc_a,info,m,n,lb, dupl, bldmode)
do i=lb_, lb_+m_-1 do i=lb_, lb_+m_-1
call x(i)%set_dupl(dupl_) call x(i)%set_dupl(dupl_)
call x(i)%set_remote_build(bldmode_) call x(i)%set_remote_build(bldmode_)
call x(i)%set_nrmv(0)
if (x(i)%is_remote_build()) then if (x(i)%is_remote_build()) then
nrmt_ = max(100,(desc_a%get_local_cols()-desc_a%get_local_rows())) nrmt_ = max(100,(desc_a%get_local_cols()-desc_a%get_local_rows()))
allocate(x(i)%rmtv(nrmt_,n_)) allocate(x(i)%rmtv(nrmt_,n_))

98
krylov/psb_dbgmres.f90
Unescape Escape View File

@ -61,7 +61,7 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
integer(psb_ipk_), Optional, Intent(out) :: iter integer(psb_ipk_), Optional, Intent(out) :: iter
real(psb_dpk_), Optional, Intent(out) :: err real(psb_dpk_), Optional, Intent(out) :: err
real(psb_dpk_), allocatable :: aux(:), h(:,:), beta(:,:) real(psb_dpk_), allocatable :: aux(:), h(:,:), beta(:,:), temp(:,:)
type(psb_d_multivect_type), allocatable :: v(:) type(psb_d_multivect_type), allocatable :: v(:)
type(psb_d_multivect_type) :: v_tot, w type(psb_d_multivect_type) :: v_tot, w
@ -69,9 +69,8 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
real(psb_dpk_) :: t1, t2 real(psb_dpk_) :: t1, t2
real(psb_dpk_) :: rti, rti1 real(psb_dpk_) :: rti, rti1
integer(psb_ipk_) :: litmax, naux, itrace_, n_row, n_col, nrep integer(psb_ipk_) :: litmax, naux, itrace_, n_row, n_col, nrhs, nrep
integer(psb_lpk_) :: mglob, m, n, n_add integer(psb_lpk_) :: mglob, n_add
integer(psb_ipk_) :: n_
integer(psb_ipk_) :: i, j, istop_, err_act, idx_i, idx_j, idx integer(psb_ipk_) :: i, j, istop_, err_act, idx_i, idx_j, idx
integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: debug_level, debug_unit
@ -153,16 +152,13 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
goto 9999 goto 9999
endif endif
m = x%get_nrows() call psb_chkvect(mglob,x%get_ncols(),x%get_nrows(),lone,lone,desc_a,info)
n = x%get_ncols()
call psb_chkvect(m,n,x%get_nrows(),lone,lone,desc_a,info)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_chkvect on X') call psb_errpush(info,name,a_err='psb_chkvect on X')
goto 9999 goto 9999
end if end if
call psb_chkvect(m,n,b%get_nrows(),lone,lone,desc_a,info) call psb_chkvect(mglob,b%get_ncols(),b%get_nrows(),lone,lone,desc_a,info)
if(info /= psb_success_) then if(info /= psb_success_) then
info=psb_err_from_subroutine_ info=psb_err_from_subroutine_
call psb_errpush(info,name,a_err='psb_chkvect on B') call psb_errpush(info,name,a_err='psb_chkvect on B')
@ -170,15 +166,14 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
end if end if
naux=4*n_col naux=4*n_col
allocate(aux(naux),h((nrep+1)*n,nrep*n),stat=info) nrhs = x%get_ncols()
allocate(aux(naux),h((nrep+1)*nrhs,nrep*nrhs),stat=info)
n_ = n if (info == psb_success_) call psb_geall(v,desc_a,info,m=nrep+1,n=nrhs)
if (info == psb_success_) call psb_geall(v,desc_a,info,m=nrep+1,n=n_) if (info == psb_success_) call psb_geall(v_tot,desc_a,info,n=(nrep+1)*nrhs)
if (info == psb_success_) call psb_geall(v_tot,desc_a,info,n=(nrep+1)*n_) if (info == psb_success_) call psb_geall(w,desc_a,info,n=nrhs)
if (info == psb_success_) call psb_geall(w,desc_a,info,n=n_) if (info == psb_success_) call psb_geasb(v,desc_a,info,mold=x%v,n=nrhs)
if (info == psb_success_) call psb_geasb(v,desc_a,info,mold=x%v,n=n_) if (info == psb_success_) call psb_geasb(v_tot,desc_a,info,mold=x%v,n=(nrep+1)*nrhs)
if (info == psb_success_) call psb_geasb(v_tot,desc_a,info,mold=x%v,n=(nrep+1)*n_) if (info == psb_success_) call psb_geasb(w,desc_a,info,mold=x%v,n=nrhs)
if (info == psb_success_) call psb_geasb(w,desc_a,info,mold=x%v,n=n_)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_non_ info=psb_err_from_subroutine_non_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -202,11 +197,12 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
goto 9999 goto 9999
end if end if
h = dzero
errnum = dzero errnum = dzero
errden = done errden = done
deps = eps deps = eps
itx = 0 itx = 0
n_add = n-1 n_add = nrhs-1
if ((itrace_ > 0).and.(me == psb_root_)) call log_header(methdname) if ((itrace_ > 0).and.(me == psb_root_)) call log_header(methdname)
@ -232,6 +228,7 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
goto 9999 goto 9999
end if end if
! TODO gather su root e poi scatter
! STEP 2: Compute QR_fact(R(0)) ! STEP 2: Compute QR_fact(R(0))
beta = psb_geqrfact(v(1),desc_a,info) beta = psb_geqrfact(v(1),desc_a,info)
if (info /= psb_success_) then if (info /= psb_success_) then
@ -243,10 +240,31 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
! STEP 3: Outer loop ! STEP 3: Outer loop
outer: do j=1,nrep outer: do j=1,nrep
! TODO Check convergence
! if (istop_ == 1) then
! rni = psb_geamax(v(1),desc_a,info)
! xni = psb_geamax(x,desc_a,info)
! errnum = rni
! errden = (ani*xni+bni)
! else if (istop_ == 2) then
! rni = psb_genrm2(v(1),desc_a,info)
! errnum = rni
! errden = bn2
! endif
! if (info /= psb_success_) then
! info=psb_err_from_subroutine_non_
! call psb_errpush(info,name)
! goto 9999
! end if
! if (errnum <= eps*errden) exit outer
! if (itrace_ > 0) call log_conv(methdname,me,itx,itrace_,errnum,errden,deps)
itx = itx + 1 itx = itx + 1
! Compute j index for H operations ! Compute j index for H operations
idx_j = (j-1)*n+1 idx_j = (j-1)*nrhs+1
! STEP 4: Compute W = AV(j) ! STEP 4: Compute W = AV(j)
call psb_spmm(done,a,v(j),dzero,w,desc_a,info,work=aux) call psb_spmm(done,a,v(j),dzero,w,desc_a,info,work=aux)
@ -261,31 +279,44 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
! STEP 5: Inner loop ! STEP 5: Inner loop
inner: do i=1,j inner: do i=1,j
write(*,*) 'PROC ', me, ' LOOOP 1', i
! Compute i index for H operations ! Compute i index for H operations
idx_i = (i-1)*n+1 idx_i = (i-1)*nrhs+1
! STEP 6: Compute H(i,j) = V(i)_T*W ! STEP 6: Compute H(i,j) = V(i)_T*W
h(idx_i:idx_i+n_add,idx_j:idx_j+n_add) = psb_gedot(v(i),w,desc_a,info,.true.) h(idx_i:idx_i+n_add,idx_j:idx_j+n_add) = psb_gedot(v(i),w,desc_a,info)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_non_ info=psb_err_from_subroutine_non_
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
end if end if
write(*,*) 'PROC ', me, ' LOOOP 2', i
! STEP 7: Compute W = W - V(i)*H(i,j) ! STEP 7: Compute W = W - V(i)*H(i,j)
call psb_geaxpby(-done,psb_gedot(v(i),h(idx_i:idx_i+n_add,idx_j:idx_j+n_add),desc_a,info),done,w,desc_a,info) temp = psb_gedot(v(i),h(idx_i:idx_i+n_add,idx_j:idx_j+n_add),desc_a,info)
!call psb_geaxpby(-done,psb_gedot(v(i),h(idx_i:idx_i+n_add,idx_j:idx_j+n_add),desc_a,info),done,w,desc_a,info)
write(*,*) 'PROC ', me, ' LOOOP 3', i
call psb_geaxpby(-done,temp,done,w,desc_a,info)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_non_ info=psb_err_from_subroutine_non_
call psb_errpush(info,name) call psb_errpush(info,name)
goto 9999 goto 9999
end if end if
write(*,*) 'PROC ', me, ' LOOOP 4', i
end do inner end do inner
! STEP 8: Compute QR_fact(W) ! STEP 8: Compute QR_fact(W)
!write(*,*) 'PROC ', me, ' BBBB ', j
! Store R in H(j+1,j) ! Store R in H(j+1,j)
h(idx_j+n:idx_j+n+n_add,idx_j:idx_j+n_add) = psb_geqrfact(w,desc_a,info) h(idx_j+nrhs:idx_j+nrhs+n_add,idx_j:idx_j+n_add) = psb_geqrfact(w,desc_a,info)
if (info /= psb_success_) then if (info /= psb_success_) then
info=psb_err_from_subroutine_non_ info=psb_err_from_subroutine_non_
call psb_errpush(info,name) call psb_errpush(info,name)
@ -300,6 +331,8 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
goto 9999 goto 9999
end if end if
write(*,*) 'PROC ', me, ' AAAA'
end do outer end do outer
! STEP 9: Compute Y(m) ! STEP 9: Compute Y(m)
@ -310,10 +343,11 @@ subroutine psb_dbgmres_multivect(a, prec, b, x, eps, desc_a, info, itmax, iter,
goto 9999 goto 9999
end if end if
! TODO Va vene che ci siano altre righe perchè poi si passa localrows
! STEP 10: Compute V = {V(1),...,V(m)} ! STEP 10: Compute V = {V(1),...,V(m)}
do i=1,nrep+1 do i=1,nrep+1
idx = (i-1)*n+1 idx = (i-1)*nrhs+1
v_tot%v%v(:,idx:idx+n_add) = v(i)%v%v(:,1:n) v_tot%v%v(1:n_row,idx:idx+n_add) = v(i)%v%v(1:n_row,1:nrhs)
enddo enddo
! STEP 11: X(m) = X(0) + V*Y(m) ! STEP 11: X(m) = X(0) + V*Y(m)
@ -360,19 +394,19 @@ contains
integer(psb_ipk_) :: m_h, n_h, mn integer(psb_ipk_) :: m_h, n_h, mn
! Initialize params ! Initialize params
m_h = (nrep+1)*n m_h = (nrep+1)*nrhs
n_h = nrep*n n_h = nrep*nrhs
mn = min(m_h,n_h) mn = min(m_h,n_h)
lwork = max(1,mn+max(mn,n)) lwork = max(1,mn+max(mn,nrhs))
allocate(work(lwork)) allocate(work(lwork))
! Compute E1*beta ! Compute E1*beta
allocate(beta_e1(m_h,n)) allocate(beta_e1(m_h,nrhs))
beta_e1 = dzero beta_e1 = dzero
beta_e1(1:n,1:n) = beta beta_e1(1:nrhs,1:nrhs) = beta
! Compute min Frobenius norm ! Compute min Frobenius norm
call dgels('N',m_h,n_h,n,h,m_h,beta_e1,m_h,work,lwork,info) call dgels('N',m_h,n_h,nrhs,h,m_h,beta_e1,m_h,work,lwork,info)
deallocate(work,beta_e1) deallocate(work,beta_e1)

6
test/block_krylov/getp.f90
Unescape Escape View File

@ -128,12 +128,12 @@ contains
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
write(psb_out_unit,'("Solving matrix : ",a)') mtrx_file write(psb_out_unit,'("Solving matrix : ",a)') mtrx_file
write(psb_out_unit,'("Number of processors : ",i1)') np write(psb_out_unit,'("Number of processors : ",i3)') np
write(psb_out_unit,'("Data distribution : ",a)') part write(psb_out_unit,'("Data distribution : ",a)') part
write(psb_out_unit,'("Iterative method : ",a)') kmethd write(psb_out_unit,'("Iterative method : ",a)') kmethd
write(psb_out_unit,'("Preconditioner : ",a)') ptype write(psb_out_unit,'("Preconditioner : ",a)') ptype
write(psb_out_unit,'("Number of RHS : ",i1)') nrhs write(psb_out_unit,'("Number of RHS : ",i3)') nrhs
write(psb_out_unit,'("Number of iterations : ",i1)') itrs write(psb_out_unit,'("Number of iterations : ",i3)') itrs
write(psb_out_unit,'("Storage format : ",a)') afmt(1:3) write(psb_out_unit,'("Storage format : ",a)') afmt(1:3)
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
else else

25
test/block_krylov/psb_dbf_sample.f90
Unescape Escape View File

@ -117,7 +117,7 @@ program psb_dbf_sample
b_mv_glob =>aux_b(:,:) b_mv_glob =>aux_b(:,:)
else else
write(psb_out_unit,'("Generating an rhs...")') write(psb_out_unit,'("Generating an rhs...")')
write(psb_out_unit,'("Number of RHS: ",i1)') nrhs write(psb_out_unit,'("Number of RHS: ",i3)') nrhs
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
call psb_realloc(m,nrhs,aux_b,ircode) call psb_realloc(m,nrhs,aux_b,ircode)
if (ircode /= 0) then if (ircode /= 0) then
@ -197,16 +197,27 @@ program psb_dbf_sample
if(iam == psb_root_) then if(iam == psb_root_) then
write(psb_out_unit,'("Preconditioner time: ",es12.5)')tprec write(psb_out_unit,'("Preconditioner time: ",es12.5)')tprec
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
write(psb_out_unit,'("Starting algorithm")')
write(psb_out_unit,'(" ")')
end if end if
call psb_barrier(ctxt) call psb_barrier(ctxt)
t1 = psb_wtime() t1 = psb_wtime()
call psb_krylov(kmethd,a,prec,b_mv,x_mv,eps,desc_a,info,& call psb_krylov(kmethd,a,prec,b_mv,x_mv,eps,desc_a,info,&
& itmax=itmax,iter=iter,err=err,itrace=itrace,& & itmax=itmax,iter=iter,err=err,itrace=itrace,&
& itrs=itrs,istop=istopc) & itrs=itrs,istop=istopc)
call psb_barrier(ctxt) call psb_barrier(ctxt)
t2 = psb_wtime() - t1 t2 = psb_wtime() - t1
call psb_amx(ctxt,t2) call psb_amx(ctxt,t2)
if(iam == psb_root_) then
write(psb_out_unit,'("Finished algorithm")')
write(psb_out_unit,'(" ")')
end if
! TODO spmm cambia X (che senso ha?)
call psb_geaxpby(done,b_mv,dzero,r_mv,desc_a,info) call psb_geaxpby(done,b_mv,dzero,r_mv,desc_a,info)
call psb_spmm(-done,a,x_mv,done,r_mv,desc_a,info) call psb_spmm(-done,a,x_mv,done,r_mv,desc_a,info)
@ -221,6 +232,10 @@ program psb_dbf_sample
call psb_sum(ctxt,descsize) call psb_sum(ctxt,descsize)
call psb_sum(ctxt,precsize) call psb_sum(ctxt,precsize)
call psb_gather(x_mv_glob,x_mv,desc_a,info,root=psb_root_)
if (info == psb_success_) call psb_gather(r_mv_glob,r_mv,desc_a,info,root=psb_root_)
if (info /= psb_success_) goto 9999
if (iam == psb_root_) then if (iam == psb_root_) then
call prec%descr(info) call prec%descr(info)
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
@ -240,12 +255,12 @@ program psb_dbf_sample
write(psb_out_unit,'("Residual norm 2: ",es12.5)')resmx write(psb_out_unit,'("Residual norm 2: ",es12.5)')resmx
write(psb_out_unit,'("Residual norm inf: ",es12.5)')resmxp write(psb_out_unit,'("Residual norm inf: ",es12.5)')resmxp
write(psb_out_unit,'(" ")') write(psb_out_unit,'(" ")')
! TODO
! do i=1,m
! write(psb_out_unit,993) i, x_mv_glob(i,:), r_mv_glob(i,:), b_mv_glob(i,:)
! enddo
end if end if
call psb_gather(x_mv_glob,x_mv,desc_a,info,root=psb_root_)
if (info == psb_success_) call psb_gather(r_mv_glob,r_mv,desc_a,info,root=psb_root_)
if (info /= psb_success_) goto 9999
998 format(i8,4(2x,g20.14)) 998 format(i8,4(2x,g20.14))
993 format(i6,4(1x,e12.6)) 993 format(i6,4(1x,e12.6))

Write Preview
Loading…
Cancel
Save