Merged recent changes from development

oacc_loloum
sfilippone 5 months ago
parent cf2cc6cab9
commit 8220140729

@ -99,8 +99,8 @@ module psi_c_serial_mod
end subroutine psi_caxpbyv2 end subroutine psi_caxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_cabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_c_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_spk_ import :: psb_ipk_, psb_spk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_c_serial_mod
complex(psb_spk_), intent (inout) :: z(:) complex(psb_spk_), intent (inout) :: z(:)
complex(psb_spk_), intent (in) :: alpha, beta,gamma,delta complex(psb_spk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_cabgdxyz end subroutine psi_c_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_cxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_cxyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_d_serial_mod
end subroutine psi_daxpbyv2 end subroutine psi_daxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_dabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_d_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_dpk_ import :: psb_ipk_, psb_dpk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_d_serial_mod
real(psb_dpk_), intent (inout) :: z(:) real(psb_dpk_), intent (inout) :: z(:)
real(psb_dpk_), intent (in) :: alpha, beta,gamma,delta real(psb_dpk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_dabgdxyz end subroutine psi_d_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_dxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_dxyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_e_serial_mod
end subroutine psi_eaxpbyv2 end subroutine psi_eaxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_eabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_e_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_ import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_e_serial_mod
integer(psb_epk_), intent (inout) :: z(:) integer(psb_epk_), intent (inout) :: z(:)
integer(psb_epk_), intent (in) :: alpha, beta,gamma,delta integer(psb_epk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_eabgdxyz end subroutine psi_e_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_exyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_exyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_i2_serial_mod
end subroutine psi_i2axpbyv2 end subroutine psi_i2axpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_i2abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_i2_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_ import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_i2_serial_mod
integer(psb_i2pk_), intent (inout) :: z(:) integer(psb_i2pk_), intent (inout) :: z(:)
integer(psb_i2pk_), intent (in) :: alpha, beta,gamma,delta integer(psb_i2pk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_i2abgdxyz end subroutine psi_i2_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_i2xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_i2xyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_m_serial_mod
end subroutine psi_maxpbyv2 end subroutine psi_maxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_mabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_m_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_ import :: psb_ipk_, psb_lpk_,psb_mpk_, psb_epk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_m_serial_mod
integer(psb_mpk_), intent (inout) :: z(:) integer(psb_mpk_), intent (inout) :: z(:)
integer(psb_mpk_), intent (in) :: alpha, beta,gamma,delta integer(psb_mpk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_mabgdxyz end subroutine psi_m_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_mxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_mxyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_s_serial_mod
end subroutine psi_saxpbyv2 end subroutine psi_saxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_sabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_s_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_spk_ import :: psb_ipk_, psb_spk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_s_serial_mod
real(psb_spk_), intent (inout) :: z(:) real(psb_spk_), intent (inout) :: z(:)
real(psb_spk_), intent (in) :: alpha, beta,gamma,delta real(psb_spk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_sabgdxyz end subroutine psi_s_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_sxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_sxyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -99,8 +99,8 @@ module psi_z_serial_mod
end subroutine psi_zaxpbyv2 end subroutine psi_zaxpbyv2
end interface psb_geaxpby end interface psb_geaxpby
interface psi_abgdxyz interface psi_upd_xyz
subroutine psi_zabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_z_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
import :: psb_ipk_, psb_dpk_ import :: psb_ipk_, psb_dpk_
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -109,8 +109,8 @@ module psi_z_serial_mod
complex(psb_dpk_), intent (inout) :: z(:) complex(psb_dpk_), intent (inout) :: z(:)
complex(psb_dpk_), intent (in) :: alpha, beta,gamma,delta complex(psb_dpk_), intent (in) :: alpha, beta,gamma,delta
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
end subroutine psi_zabgdxyz end subroutine psi_z_upd_xyz
end interface psi_abgdxyz end interface psi_upd_xyz
interface psi_xyzw interface psi_xyzw
subroutine psi_zxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_zxyzw(m,a,b,c,d,e,f,x, y, z,w, info)

@ -143,8 +143,8 @@ module psb_c_psblas_mod
end subroutine psb_caxpby end subroutine psb_caxpby
end interface end interface
interface psb_abgdxyz interface psb_upd_xyz
subroutine psb_cabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_c_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_c_vect_type, psb_cspmat_type & psb_c_vect_type, psb_cspmat_type
@ -154,8 +154,8 @@ module psb_c_psblas_mod
complex(psb_spk_), intent (in) :: alpha, beta, gamma, delta complex(psb_spk_), intent (in) :: alpha, beta, gamma, delta
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_cabgdxyz_vect end subroutine psb_c_upd_xyz_vect
end interface psb_abgdxyz end interface psb_upd_xyz
interface psb_geamax interface psb_geamax
function psb_camax(x, desc_a, info, jx,global) function psb_camax(x, desc_a, info, jx,global)

@ -143,8 +143,8 @@ module psb_d_psblas_mod
end subroutine psb_daxpby end subroutine psb_daxpby
end interface end interface
interface psb_abgdxyz interface psb_upd_xyz
subroutine psb_dabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_d_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
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
@ -154,8 +154,8 @@ module psb_d_psblas_mod
real(psb_dpk_), intent (in) :: alpha, beta, gamma, delta real(psb_dpk_), intent (in) :: alpha, beta, gamma, delta
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_dabgdxyz_vect end subroutine psb_d_upd_xyz_vect
end interface psb_abgdxyz end interface psb_upd_xyz
interface psb_geamax interface psb_geamax
function psb_damax(x, desc_a, info, jx,global) function psb_damax(x, desc_a, info, jx,global)

@ -143,8 +143,8 @@ module psb_s_psblas_mod
end subroutine psb_saxpby end subroutine psb_saxpby
end interface end interface
interface psb_abgdxyz interface psb_upd_xyz
subroutine psb_sabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_s_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
import :: psb_desc_type, psb_spk_, psb_ipk_, & import :: psb_desc_type, psb_spk_, psb_ipk_, &
& psb_s_vect_type, psb_sspmat_type & psb_s_vect_type, psb_sspmat_type
@ -154,8 +154,8 @@ module psb_s_psblas_mod
real(psb_spk_), intent (in) :: alpha, beta, gamma, delta real(psb_spk_), intent (in) :: alpha, beta, gamma, delta
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_sabgdxyz_vect end subroutine psb_s_upd_xyz_vect
end interface psb_abgdxyz end interface psb_upd_xyz
interface psb_geamax interface psb_geamax
function psb_samax(x, desc_a, info, jx,global) function psb_samax(x, desc_a, info, jx,global)

@ -143,8 +143,8 @@ module psb_z_psblas_mod
end subroutine psb_zaxpby end subroutine psb_zaxpby
end interface end interface
interface psb_abgdxyz interface psb_upd_xyz
subroutine psb_zabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_z_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
import :: psb_desc_type, psb_dpk_, psb_ipk_, & import :: psb_desc_type, psb_dpk_, psb_ipk_, &
& psb_z_vect_type, psb_zspmat_type & psb_z_vect_type, psb_zspmat_type
@ -154,8 +154,8 @@ module psb_z_psblas_mod
complex(psb_dpk_), intent (in) :: alpha, beta, gamma, delta complex(psb_dpk_), intent (in) :: alpha, beta, gamma, delta
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_zabgdxyz_vect end subroutine psb_z_upd_xyz_vect
end interface psb_abgdxyz end interface psb_upd_xyz
interface psb_geamax interface psb_geamax
function psb_zamax(x, desc_a, info, jx,global) function psb_zamax(x, desc_a, info, jx,global)

@ -155,7 +155,7 @@ module psb_c_base_vect_mod
procedure, pass(z) :: axpby_v2 => c_base_axpby_v2 procedure, pass(z) :: axpby_v2 => c_base_axpby_v2
procedure, pass(z) :: axpby_a2 => c_base_axpby_a2 procedure, pass(z) :: axpby_a2 => c_base_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => c_base_abgdxyz procedure, pass(z) :: upd_xyz => c_base_upd_xyz
procedure, pass(w) :: xyzw => c_base_xyzw procedure, pass(w) :: xyzw => c_base_xyzw
! !
@ -1130,12 +1130,12 @@ contains
end subroutine c_base_axpby_a2 end subroutine c_base_axpby_a2
! !
! ABGDXYZ is invoked via Z, hence the structure below. ! UPD_XYZ is invoked via Z, hence the structure below.
! !
! !
!> Function base_abgdxyz !> Function base_upd_xyz
!! \memberof psb_c_base_vect_type !! \memberof psb_c_base_vect_type
!! \brief ABGDXYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta !! \brief UPD_XYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta
!! \param m Number of entries to be considered !! \param m Number of entries to be considered
!! \param alpha scalar alpha !! \param alpha scalar alpha
!! \param beta scalar beta !! \param beta scalar beta
@ -1146,7 +1146,7 @@ contains
!! \param z The class(base_vect) to be added !! \param z The class(base_vect) to be added
!! \param info return code !! \param info return code
!! !!
subroutine c_base_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine c_base_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -1159,11 +1159,11 @@ contains
if (x%is_dev().and.(alpha/=czero)) call x%sync() if (x%is_dev().and.(alpha/=czero)) call x%sync()
if (y%is_dev().and.(beta/=czero)) call y%sync() if (y%is_dev().and.(beta/=czero)) call y%sync()
if (z%is_dev().and.(delta/=czero)) call z%sync() if (z%is_dev().and.(delta/=czero)) call z%sync()
call psi_abgdxyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info) call psi_upd_xyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info)
call y%set_host() call y%set_host()
call z%set_host() call z%set_host()
end subroutine c_base_abgdxyz end subroutine c_base_upd_xyz
subroutine c_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info) subroutine c_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info)
use psi_serial_mod use psi_serial_mod

@ -102,8 +102,9 @@ module psb_c_vect_mod
procedure, pass(z) :: axpby_v2 => c_vect_axpby_v2 procedure, pass(z) :: axpby_v2 => c_vect_axpby_v2
procedure, pass(z) :: axpby_a2 => c_vect_axpby_a2 procedure, pass(z) :: axpby_a2 => c_vect_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => c_vect_abgdxyz procedure, pass(z) :: upd_xyz => c_vect_upd_xyz
procedure, pass(z) :: xyzw => c_vect_xyzw procedure, pass(z) :: xyzw => c_vect_xyzw
procedure, pass(y) :: mlt_v => c_vect_mlt_v procedure, pass(y) :: mlt_v => c_vect_mlt_v
procedure, pass(y) :: mlt_a => c_vect_mlt_a procedure, pass(y) :: mlt_a => c_vect_mlt_a
procedure, pass(z) :: mlt_a_2 => c_vect_mlt_a_2 procedure, pass(z) :: mlt_a_2 => c_vect_mlt_a_2
@ -773,7 +774,7 @@ contains
end subroutine c_vect_axpby_a2 end subroutine c_vect_axpby_a2
subroutine c_vect_abgdxyz(m,alpha,beta,gamma,delta,x, y, z, info) subroutine c_vect_upd_xyz(m,alpha,beta,gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -784,9 +785,9 @@ contains
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
if (allocated(z%v)) & if (allocated(z%v)) &
call z%v%abgdxyz(m,alpha,beta,gamma,delta,x%v,y%v,info) call z%v%upd_xyz(m,alpha,beta,gamma,delta,x%v,y%v,info)
end subroutine c_vect_abgdxyz end subroutine c_vect_upd_xyz
subroutine c_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info) subroutine c_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info)
use psi_serial_mod use psi_serial_mod

@ -155,7 +155,7 @@ module psb_d_base_vect_mod
procedure, pass(z) :: axpby_v2 => d_base_axpby_v2 procedure, pass(z) :: axpby_v2 => d_base_axpby_v2
procedure, pass(z) :: axpby_a2 => d_base_axpby_a2 procedure, pass(z) :: axpby_a2 => d_base_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => d_base_abgdxyz procedure, pass(z) :: upd_xyz => d_base_upd_xyz
procedure, pass(w) :: xyzw => d_base_xyzw procedure, pass(w) :: xyzw => d_base_xyzw
! !
@ -1137,12 +1137,12 @@ contains
end subroutine d_base_axpby_a2 end subroutine d_base_axpby_a2
! !
! ABGDXYZ is invoked via Z, hence the structure below. ! UPD_XYZ is invoked via Z, hence the structure below.
! !
! !
!> Function base_abgdxyz !> Function base_upd_xyz
!! \memberof psb_d_base_vect_type !! \memberof psb_d_base_vect_type
!! \brief ABGDXYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta !! \brief UPD_XYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta
!! \param m Number of entries to be considered !! \param m Number of entries to be considered
!! \param alpha scalar alpha !! \param alpha scalar alpha
!! \param beta scalar beta !! \param beta scalar beta
@ -1153,7 +1153,7 @@ contains
!! \param z The class(base_vect) to be added !! \param z The class(base_vect) to be added
!! \param info return code !! \param info return code
!! !!
subroutine d_base_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine d_base_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -1166,11 +1166,11 @@ contains
if (x%is_dev().and.(alpha/=dzero)) call x%sync() if (x%is_dev().and.(alpha/=dzero)) call x%sync()
if (y%is_dev().and.(beta/=dzero)) call y%sync() if (y%is_dev().and.(beta/=dzero)) call y%sync()
if (z%is_dev().and.(delta/=dzero)) call z%sync() if (z%is_dev().and.(delta/=dzero)) call z%sync()
call psi_abgdxyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info) call psi_upd_xyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info)
call y%set_host() call y%set_host()
call z%set_host() call z%set_host()
end subroutine d_base_abgdxyz end subroutine d_base_upd_xyz
subroutine d_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info) subroutine d_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info)
use psi_serial_mod use psi_serial_mod

@ -102,8 +102,9 @@ module psb_d_vect_mod
procedure, pass(z) :: axpby_v2 => d_vect_axpby_v2 procedure, pass(z) :: axpby_v2 => d_vect_axpby_v2
procedure, pass(z) :: axpby_a2 => d_vect_axpby_a2 procedure, pass(z) :: axpby_a2 => d_vect_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => d_vect_abgdxyz procedure, pass(z) :: upd_xyz => d_vect_upd_xyz
procedure, pass(z) :: xyzw => d_vect_xyzw procedure, pass(z) :: xyzw => d_vect_xyzw
procedure, pass(y) :: mlt_v => d_vect_mlt_v procedure, pass(y) :: mlt_v => d_vect_mlt_v
procedure, pass(y) :: mlt_a => d_vect_mlt_a procedure, pass(y) :: mlt_a => d_vect_mlt_a
procedure, pass(z) :: mlt_a_2 => d_vect_mlt_a_2 procedure, pass(z) :: mlt_a_2 => d_vect_mlt_a_2
@ -780,7 +781,7 @@ contains
end subroutine d_vect_axpby_a2 end subroutine d_vect_axpby_a2
subroutine d_vect_abgdxyz(m,alpha,beta,gamma,delta,x, y, z, info) subroutine d_vect_upd_xyz(m,alpha,beta,gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -791,9 +792,9 @@ contains
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
if (allocated(z%v)) & if (allocated(z%v)) &
call z%v%abgdxyz(m,alpha,beta,gamma,delta,x%v,y%v,info) call z%v%upd_xyz(m,alpha,beta,gamma,delta,x%v,y%v,info)
end subroutine d_vect_abgdxyz end subroutine d_vect_upd_xyz
subroutine d_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info) subroutine d_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info)
use psi_serial_mod use psi_serial_mod

@ -155,7 +155,7 @@ module psb_s_base_vect_mod
procedure, pass(z) :: axpby_v2 => s_base_axpby_v2 procedure, pass(z) :: axpby_v2 => s_base_axpby_v2
procedure, pass(z) :: axpby_a2 => s_base_axpby_a2 procedure, pass(z) :: axpby_a2 => s_base_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => s_base_abgdxyz procedure, pass(z) :: upd_xyz => s_base_upd_xyz
procedure, pass(w) :: xyzw => s_base_xyzw procedure, pass(w) :: xyzw => s_base_xyzw
! !
@ -1137,12 +1137,12 @@ contains
end subroutine s_base_axpby_a2 end subroutine s_base_axpby_a2
! !
! ABGDXYZ is invoked via Z, hence the structure below. ! UPD_XYZ is invoked via Z, hence the structure below.
! !
! !
!> Function base_abgdxyz !> Function base_upd_xyz
!! \memberof psb_s_base_vect_type !! \memberof psb_s_base_vect_type
!! \brief ABGDXYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta !! \brief UPD_XYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta
!! \param m Number of entries to be considered !! \param m Number of entries to be considered
!! \param alpha scalar alpha !! \param alpha scalar alpha
!! \param beta scalar beta !! \param beta scalar beta
@ -1153,7 +1153,7 @@ contains
!! \param z The class(base_vect) to be added !! \param z The class(base_vect) to be added
!! \param info return code !! \param info return code
!! !!
subroutine s_base_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine s_base_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -1166,11 +1166,11 @@ contains
if (x%is_dev().and.(alpha/=szero)) call x%sync() if (x%is_dev().and.(alpha/=szero)) call x%sync()
if (y%is_dev().and.(beta/=szero)) call y%sync() if (y%is_dev().and.(beta/=szero)) call y%sync()
if (z%is_dev().and.(delta/=szero)) call z%sync() if (z%is_dev().and.(delta/=szero)) call z%sync()
call psi_abgdxyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info) call psi_upd_xyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info)
call y%set_host() call y%set_host()
call z%set_host() call z%set_host()
end subroutine s_base_abgdxyz end subroutine s_base_upd_xyz
subroutine s_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info) subroutine s_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info)
use psi_serial_mod use psi_serial_mod

@ -102,8 +102,9 @@ module psb_s_vect_mod
procedure, pass(z) :: axpby_v2 => s_vect_axpby_v2 procedure, pass(z) :: axpby_v2 => s_vect_axpby_v2
procedure, pass(z) :: axpby_a2 => s_vect_axpby_a2 procedure, pass(z) :: axpby_a2 => s_vect_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => s_vect_abgdxyz procedure, pass(z) :: upd_xyz => s_vect_upd_xyz
procedure, pass(z) :: xyzw => s_vect_xyzw procedure, pass(z) :: xyzw => s_vect_xyzw
procedure, pass(y) :: mlt_v => s_vect_mlt_v procedure, pass(y) :: mlt_v => s_vect_mlt_v
procedure, pass(y) :: mlt_a => s_vect_mlt_a procedure, pass(y) :: mlt_a => s_vect_mlt_a
procedure, pass(z) :: mlt_a_2 => s_vect_mlt_a_2 procedure, pass(z) :: mlt_a_2 => s_vect_mlt_a_2
@ -780,7 +781,7 @@ contains
end subroutine s_vect_axpby_a2 end subroutine s_vect_axpby_a2
subroutine s_vect_abgdxyz(m,alpha,beta,gamma,delta,x, y, z, info) subroutine s_vect_upd_xyz(m,alpha,beta,gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -791,9 +792,9 @@ contains
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
if (allocated(z%v)) & if (allocated(z%v)) &
call z%v%abgdxyz(m,alpha,beta,gamma,delta,x%v,y%v,info) call z%v%upd_xyz(m,alpha,beta,gamma,delta,x%v,y%v,info)
end subroutine s_vect_abgdxyz end subroutine s_vect_upd_xyz
subroutine s_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info) subroutine s_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info)
use psi_serial_mod use psi_serial_mod

@ -155,7 +155,7 @@ module psb_z_base_vect_mod
procedure, pass(z) :: axpby_v2 => z_base_axpby_v2 procedure, pass(z) :: axpby_v2 => z_base_axpby_v2
procedure, pass(z) :: axpby_a2 => z_base_axpby_a2 procedure, pass(z) :: axpby_a2 => z_base_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => z_base_abgdxyz procedure, pass(z) :: upd_xyz => z_base_upd_xyz
procedure, pass(w) :: xyzw => z_base_xyzw procedure, pass(w) :: xyzw => z_base_xyzw
! !
@ -1130,12 +1130,12 @@ contains
end subroutine z_base_axpby_a2 end subroutine z_base_axpby_a2
! !
! ABGDXYZ is invoked via Z, hence the structure below. ! UPD_XYZ is invoked via Z, hence the structure below.
! !
! !
!> Function base_abgdxyz !> Function base_upd_xyz
!! \memberof psb_z_base_vect_type !! \memberof psb_z_base_vect_type
!! \brief ABGDXYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta !! \brief UPD_XYZ combines two AXPBYS y=alpha*x+beta*y, z=gamma*y+delta*zeta
!! \param m Number of entries to be considered !! \param m Number of entries to be considered
!! \param alpha scalar alpha !! \param alpha scalar alpha
!! \param beta scalar beta !! \param beta scalar beta
@ -1146,7 +1146,7 @@ contains
!! \param z The class(base_vect) to be added !! \param z The class(base_vect) to be added
!! \param info return code !! \param info return code
!! !!
subroutine z_base_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine z_base_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -1159,11 +1159,11 @@ contains
if (x%is_dev().and.(alpha/=zzero)) call x%sync() if (x%is_dev().and.(alpha/=zzero)) call x%sync()
if (y%is_dev().and.(beta/=zzero)) call y%sync() if (y%is_dev().and.(beta/=zzero)) call y%sync()
if (z%is_dev().and.(delta/=zzero)) call z%sync() if (z%is_dev().and.(delta/=zzero)) call z%sync()
call psi_abgdxyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info) call psi_upd_xyz(m,alpha, beta, gamma,delta,x%v, y%v, z%v, info)
call y%set_host() call y%set_host()
call z%set_host() call z%set_host()
end subroutine z_base_abgdxyz end subroutine z_base_upd_xyz
subroutine z_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info) subroutine z_base_xyzw(m,a,b,c,d,e,f,x, y, z, w,info)
use psi_serial_mod use psi_serial_mod

@ -102,8 +102,9 @@ module psb_z_vect_mod
procedure, pass(z) :: axpby_v2 => z_vect_axpby_v2 procedure, pass(z) :: axpby_v2 => z_vect_axpby_v2
procedure, pass(z) :: axpby_a2 => z_vect_axpby_a2 procedure, pass(z) :: axpby_a2 => z_vect_axpby_a2
generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2 generic, public :: axpby => axpby_v, axpby_a, axpby_v2, axpby_a2
procedure, pass(z) :: abgdxyz => z_vect_abgdxyz procedure, pass(z) :: upd_xyz => z_vect_upd_xyz
procedure, pass(z) :: xyzw => z_vect_xyzw procedure, pass(z) :: xyzw => z_vect_xyzw
procedure, pass(y) :: mlt_v => z_vect_mlt_v procedure, pass(y) :: mlt_v => z_vect_mlt_v
procedure, pass(y) :: mlt_a => z_vect_mlt_a procedure, pass(y) :: mlt_a => z_vect_mlt_a
procedure, pass(z) :: mlt_a_2 => z_vect_mlt_a_2 procedure, pass(z) :: mlt_a_2 => z_vect_mlt_a_2
@ -773,7 +774,7 @@ contains
end subroutine z_vect_axpby_a2 end subroutine z_vect_axpby_a2
subroutine z_vect_abgdxyz(m,alpha,beta,gamma,delta,x, y, z, info) subroutine z_vect_upd_xyz(m,alpha,beta,gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -784,9 +785,9 @@ contains
integer(psb_ipk_), intent(out) :: info integer(psb_ipk_), intent(out) :: info
if (allocated(z%v)) & if (allocated(z%v)) &
call z%v%abgdxyz(m,alpha,beta,gamma,delta,x%v,y%v,info) call z%v%upd_xyz(m,alpha,beta,gamma,delta,x%v,y%v,info)
end subroutine z_vect_abgdxyz end subroutine z_vect_upd_xyz
subroutine z_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info) subroutine z_vect_xyzw(m,a,b,c,d,e,f,x, y, z, w, info)
use psi_serial_mod use psi_serial_mod

@ -743,9 +743,9 @@ subroutine psb_caddconst_vect(x,b,z,desc_a,info)
end subroutine psb_caddconst_vect end subroutine psb_caddconst_vect
subroutine psb_cabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_c_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
use psb_base_mod, psb_protect_name => psb_cabgdxyz_vect use psb_base_mod, psb_protect_name => psb_c_upd_xyz_vect
implicit none implicit none
type(psb_c_vect_type), intent (inout) :: x type(psb_c_vect_type), intent (inout) :: x
type(psb_c_vect_type), intent (inout) :: y type(psb_c_vect_type), intent (inout) :: y
@ -812,7 +812,7 @@ subroutine psb_cabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
end if end if
if(desc_a%get_local_rows() > 0) then if(desc_a%get_local_rows() > 0) then
call z%abgdxyz(nr,alpha,beta,gamma,delta,x,y,info) call z%upd_xyz(nr,alpha,beta,gamma,delta,x,y,info)
end if end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -822,5 +822,5 @@ subroutine psb_cabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
return return
end subroutine psb_cabgdxyz_vect end subroutine psb_c_upd_xyz_vect

@ -743,9 +743,9 @@ subroutine psb_daddconst_vect(x,b,z,desc_a,info)
end subroutine psb_daddconst_vect end subroutine psb_daddconst_vect
subroutine psb_dabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_d_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
use psb_base_mod, psb_protect_name => psb_dabgdxyz_vect use psb_base_mod, psb_protect_name => psb_d_upd_xyz_vect
implicit none implicit none
type(psb_d_vect_type), intent (inout) :: x type(psb_d_vect_type), intent (inout) :: x
type(psb_d_vect_type), intent (inout) :: y type(psb_d_vect_type), intent (inout) :: y
@ -812,7 +812,7 @@ subroutine psb_dabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
end if end if
if(desc_a%get_local_rows() > 0) then if(desc_a%get_local_rows() > 0) then
call z%abgdxyz(nr,alpha,beta,gamma,delta,x,y,info) call z%upd_xyz(nr,alpha,beta,gamma,delta,x,y,info)
end if end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -822,5 +822,5 @@ subroutine psb_dabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
return return
end subroutine psb_dabgdxyz_vect end subroutine psb_d_upd_xyz_vect

@ -743,9 +743,9 @@ subroutine psb_saddconst_vect(x,b,z,desc_a,info)
end subroutine psb_saddconst_vect end subroutine psb_saddconst_vect
subroutine psb_sabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_s_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
use psb_base_mod, psb_protect_name => psb_sabgdxyz_vect use psb_base_mod, psb_protect_name => psb_s_upd_xyz_vect
implicit none implicit none
type(psb_s_vect_type), intent (inout) :: x type(psb_s_vect_type), intent (inout) :: x
type(psb_s_vect_type), intent (inout) :: y type(psb_s_vect_type), intent (inout) :: y
@ -812,7 +812,7 @@ subroutine psb_sabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
end if end if
if(desc_a%get_local_rows() > 0) then if(desc_a%get_local_rows() > 0) then
call z%abgdxyz(nr,alpha,beta,gamma,delta,x,y,info) call z%upd_xyz(nr,alpha,beta,gamma,delta,x,y,info)
end if end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -822,5 +822,5 @@ subroutine psb_sabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
return return
end subroutine psb_sabgdxyz_vect end subroutine psb_s_upd_xyz_vect

@ -743,9 +743,9 @@ subroutine psb_zaddconst_vect(x,b,z,desc_a,info)
end subroutine psb_zaddconst_vect end subroutine psb_zaddconst_vect
subroutine psb_zabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,& subroutine psb_z_upd_xyz_vect(alpha, beta, gamma, delta, x, y, z,&
& desc_a, info) & desc_a, info)
use psb_base_mod, psb_protect_name => psb_zabgdxyz_vect use psb_base_mod, psb_protect_name => psb_z_upd_xyz_vect
implicit none implicit none
type(psb_z_vect_type), intent (inout) :: x type(psb_z_vect_type), intent (inout) :: x
type(psb_z_vect_type), intent (inout) :: y type(psb_z_vect_type), intent (inout) :: y
@ -812,7 +812,7 @@ subroutine psb_zabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
end if end if
if(desc_a%get_local_rows() > 0) then if(desc_a%get_local_rows() > 0) then
call z%abgdxyz(nr,alpha,beta,gamma,delta,x,y,info) call z%upd_xyz(nr,alpha,beta,gamma,delta,x,y,info)
end if end if
call psb_erractionrestore(err_act) call psb_erractionrestore(err_act)
@ -822,5 +822,5 @@ subroutine psb_zabgdxyz_vect(alpha, beta, gamma, delta, x, y, z,&
return return
end subroutine psb_zabgdxyz_vect end subroutine psb_z_upd_xyz_vect

@ -1568,7 +1568,7 @@ subroutine caxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine caxpbyv2 end subroutine caxpbyv2
subroutine psi_cabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_c_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_cabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='cabgdxyz' name='c_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_cabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_cabgdxyz end subroutine psi_c_upd_xyz
subroutine psi_cxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_cxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_cxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='cabgdxyz' name='c_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine daxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine daxpbyv2 end subroutine daxpbyv2
subroutine psi_dabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_d_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_dabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='dabgdxyz' name='d_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_dabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_dabgdxyz end subroutine psi_d_upd_xyz
subroutine psi_dxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_dxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_dxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='dabgdxyz' name='d_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine eaxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine eaxpbyv2 end subroutine eaxpbyv2
subroutine psi_eabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_e_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_eabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='eabgdxyz' name='e_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_eabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_eabgdxyz end subroutine psi_e_upd_xyz
subroutine psi_exyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_exyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_exyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='eabgdxyz' name='e_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine i2axpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine i2axpbyv2 end subroutine i2axpbyv2
subroutine psi_i2abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_i2_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_i2abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='i2abgdxyz' name='i2_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_i2abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_i2abgdxyz end subroutine psi_i2_upd_xyz
subroutine psi_i2xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_i2xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_i2xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='i2abgdxyz' name='i2_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine maxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine maxpbyv2 end subroutine maxpbyv2
subroutine psi_mabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_m_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_mabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='mabgdxyz' name='m_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_mabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_mabgdxyz end subroutine psi_m_upd_xyz
subroutine psi_mxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_mxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_mxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='mabgdxyz' name='m_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine saxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine saxpbyv2 end subroutine saxpbyv2
subroutine psi_sabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_s_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_sabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='sabgdxyz' name='s_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_sabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_sabgdxyz end subroutine psi_s_upd_xyz
subroutine psi_sxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_sxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_sxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='sabgdxyz' name='s_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -1568,7 +1568,7 @@ subroutine zaxpbyv2(m, n, alpha, X, lldx, beta, Y, lldy, Z, lldz, info)
end subroutine zaxpbyv2 end subroutine zaxpbyv2
subroutine psi_zabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine psi_z_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psb_const_mod use psb_const_mod
use psb_error_mod use psb_error_mod
implicit none implicit none
@ -1582,7 +1582,7 @@ subroutine psi_zabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='zabgdxyz' name='z_upd_xyz'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then
@ -1791,7 +1791,7 @@ subroutine psi_zabgdxyz(m,alpha, beta, gamma,delta,x, y, z, info)
call fcpsb_serror() call fcpsb_serror()
return return
end subroutine psi_zabgdxyz end subroutine psi_z_upd_xyz
subroutine psi_zxyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine psi_zxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psb_const_mod use psb_const_mod
@ -1808,7 +1808,7 @@ subroutine psi_zxyzw(m,a,b,c,d,e,f,x, y, z,w, info)
integer(psb_ipk_) :: i integer(psb_ipk_) :: i
integer(psb_ipk_) :: int_err(5) integer(psb_ipk_) :: int_err(5)
character name*20 character name*20
name='zabgdxyz' name='z_xyzw'
info = psb_success_ info = psb_success_
if (m.lt.0) then if (m.lt.0) then

@ -90,7 +90,7 @@ module psb_c_cuda_vect_mod
procedure, pass(x) :: dot_a => c_cuda_dot_a procedure, pass(x) :: dot_a => c_cuda_dot_a
procedure, pass(y) :: axpby_v => c_cuda_axpby_v procedure, pass(y) :: axpby_v => c_cuda_axpby_v
procedure, pass(y) :: axpby_a => c_cuda_axpby_a procedure, pass(y) :: axpby_a => c_cuda_axpby_a
procedure, pass(z) :: abgdxyz => c_cuda_abgdxyz procedure, pass(z) :: upd_xyz => c_cuda_upd_xyz
procedure, pass(y) :: mlt_v => c_cuda_mlt_v procedure, pass(y) :: mlt_v => c_cuda_mlt_v
procedure, pass(y) :: mlt_a => c_cuda_mlt_a procedure, pass(y) :: mlt_a => c_cuda_mlt_a
procedure, pass(z) :: mlt_a_2 => c_cuda_mlt_a_2 procedure, pass(z) :: mlt_a_2 => c_cuda_mlt_a_2
@ -912,7 +912,7 @@ contains
end subroutine c_cuda_axpby_v end subroutine c_cuda_axpby_v
subroutine c_cuda_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine c_cuda_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -946,7 +946,7 @@ contains
if ((nx<m).or.(ny<m).or.(nz<m)) then if ((nx<m).or.(ny<m).or.(nz<m)) then
info = psb_err_internal_error_ info = psb_err_internal_error_
else else
info = abgdxyzMultiVecDevice(m,alpha,beta,gamma,delta,& info = upd_xyzMultiVecDevice(m,alpha,beta,gamma,delta,&
& xx%deviceVect,yy%deviceVect,zz%deviceVect) & xx%deviceVect,yy%deviceVect,zz%deviceVect)
end if end if
call yy%set_dev() call yy%set_dev()
@ -972,7 +972,7 @@ contains
call z%axpby(m,gamma,y,delta,info) call z%axpby(m,gamma,y,delta,info)
end if end if
end subroutine c_cuda_abgdxyz end subroutine c_cuda_upd_xyz
subroutine c_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine c_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psi_serial_mod use psi_serial_mod

@ -313,16 +313,16 @@ module psb_c_vectordev_mod
end function axpbyMultiVecDeviceFloatComplex end function axpbyMultiVecDeviceFloatComplex
end interface end interface
interface abgdxyzMultiVecDevice interface upd_xyzMultiVecDevice
function abgdxyzMultiVecDeviceFloatComplex(n,alpha,beta,gamma,delta,deviceVecX,& function upd_xyzMultiVecDeviceFloatComplex(n,alpha,beta,gamma,delta,deviceVecX,&
& deviceVecY,deviceVecZ) & & deviceVecY,deviceVecZ) &
& result(res) bind(c,name='abgdxyzMultiVecDeviceFloatComplex') & result(res) bind(c,name='upd_xyzMultiVecDeviceFloatComplex')
use iso_c_binding use iso_c_binding
integer(c_int) :: res integer(c_int) :: res
integer(c_int), value :: n integer(c_int), value :: n
complex(c_float_complex), value :: alpha, beta,gamma,delta complex(c_float_complex), value :: alpha, beta,gamma,delta
type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ
end function abgdxyzMultiVecDeviceFloatComplex end function upd_xyzMultiVecDeviceFloatComplex
end interface end interface
interface xyzwMultiVecDevice interface xyzwMultiVecDevice

@ -90,7 +90,7 @@ module psb_d_cuda_vect_mod
procedure, pass(x) :: dot_a => d_cuda_dot_a procedure, pass(x) :: dot_a => d_cuda_dot_a
procedure, pass(y) :: axpby_v => d_cuda_axpby_v procedure, pass(y) :: axpby_v => d_cuda_axpby_v
procedure, pass(y) :: axpby_a => d_cuda_axpby_a procedure, pass(y) :: axpby_a => d_cuda_axpby_a
procedure, pass(z) :: abgdxyz => d_cuda_abgdxyz procedure, pass(z) :: upd_xyz => d_cuda_upd_xyz
procedure, pass(y) :: mlt_v => d_cuda_mlt_v procedure, pass(y) :: mlt_v => d_cuda_mlt_v
procedure, pass(y) :: mlt_a => d_cuda_mlt_a procedure, pass(y) :: mlt_a => d_cuda_mlt_a
procedure, pass(z) :: mlt_a_2 => d_cuda_mlt_a_2 procedure, pass(z) :: mlt_a_2 => d_cuda_mlt_a_2
@ -912,7 +912,7 @@ contains
end subroutine d_cuda_axpby_v end subroutine d_cuda_axpby_v
subroutine d_cuda_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine d_cuda_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -946,7 +946,7 @@ contains
if ((nx<m).or.(ny<m).or.(nz<m)) then if ((nx<m).or.(ny<m).or.(nz<m)) then
info = psb_err_internal_error_ info = psb_err_internal_error_
else else
info = abgdxyzMultiVecDevice(m,alpha,beta,gamma,delta,& info = upd_xyzMultiVecDevice(m,alpha,beta,gamma,delta,&
& xx%deviceVect,yy%deviceVect,zz%deviceVect) & xx%deviceVect,yy%deviceVect,zz%deviceVect)
end if end if
call yy%set_dev() call yy%set_dev()
@ -972,7 +972,7 @@ contains
call z%axpby(m,gamma,y,delta,info) call z%axpby(m,gamma,y,delta,info)
end if end if
end subroutine d_cuda_abgdxyz end subroutine d_cuda_upd_xyz
subroutine d_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine d_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psi_serial_mod use psi_serial_mod

@ -313,16 +313,16 @@ module psb_d_vectordev_mod
end function axpbyMultiVecDeviceDouble end function axpbyMultiVecDeviceDouble
end interface end interface
interface abgdxyzMultiVecDevice interface upd_xyzMultiVecDevice
function abgdxyzMultiVecDeviceDouble(n,alpha,beta,gamma,delta,deviceVecX,& function upd_xyzMultiVecDeviceDouble(n,alpha,beta,gamma,delta,deviceVecX,&
& deviceVecY,deviceVecZ) & & deviceVecY,deviceVecZ) &
& result(res) bind(c,name='abgdxyzMultiVecDeviceDouble') & result(res) bind(c,name='upd_xyzMultiVecDeviceDouble')
use iso_c_binding use iso_c_binding
integer(c_int) :: res integer(c_int) :: res
integer(c_int), value :: n integer(c_int), value :: n
real(c_double), value :: alpha, beta,gamma,delta real(c_double), value :: alpha, beta,gamma,delta
type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ
end function abgdxyzMultiVecDeviceDouble end function upd_xyzMultiVecDeviceDouble
end interface end interface
interface xyzwMultiVecDevice interface xyzwMultiVecDevice

@ -90,7 +90,7 @@ module psb_s_cuda_vect_mod
procedure, pass(x) :: dot_a => s_cuda_dot_a procedure, pass(x) :: dot_a => s_cuda_dot_a
procedure, pass(y) :: axpby_v => s_cuda_axpby_v procedure, pass(y) :: axpby_v => s_cuda_axpby_v
procedure, pass(y) :: axpby_a => s_cuda_axpby_a procedure, pass(y) :: axpby_a => s_cuda_axpby_a
procedure, pass(z) :: abgdxyz => s_cuda_abgdxyz procedure, pass(z) :: upd_xyz => s_cuda_upd_xyz
procedure, pass(y) :: mlt_v => s_cuda_mlt_v procedure, pass(y) :: mlt_v => s_cuda_mlt_v
procedure, pass(y) :: mlt_a => s_cuda_mlt_a procedure, pass(y) :: mlt_a => s_cuda_mlt_a
procedure, pass(z) :: mlt_a_2 => s_cuda_mlt_a_2 procedure, pass(z) :: mlt_a_2 => s_cuda_mlt_a_2
@ -912,7 +912,7 @@ contains
end subroutine s_cuda_axpby_v end subroutine s_cuda_axpby_v
subroutine s_cuda_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine s_cuda_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -946,7 +946,7 @@ contains
if ((nx<m).or.(ny<m).or.(nz<m)) then if ((nx<m).or.(ny<m).or.(nz<m)) then
info = psb_err_internal_error_ info = psb_err_internal_error_
else else
info = abgdxyzMultiVecDevice(m,alpha,beta,gamma,delta,& info = upd_xyzMultiVecDevice(m,alpha,beta,gamma,delta,&
& xx%deviceVect,yy%deviceVect,zz%deviceVect) & xx%deviceVect,yy%deviceVect,zz%deviceVect)
end if end if
call yy%set_dev() call yy%set_dev()
@ -972,7 +972,7 @@ contains
call z%axpby(m,gamma,y,delta,info) call z%axpby(m,gamma,y,delta,info)
end if end if
end subroutine s_cuda_abgdxyz end subroutine s_cuda_upd_xyz
subroutine s_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine s_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psi_serial_mod use psi_serial_mod

@ -313,16 +313,16 @@ module psb_s_vectordev_mod
end function axpbyMultiVecDeviceFloat end function axpbyMultiVecDeviceFloat
end interface end interface
interface abgdxyzMultiVecDevice interface upd_xyzMultiVecDevice
function abgdxyzMultiVecDeviceFloat(n,alpha,beta,gamma,delta,deviceVecX,& function upd_xyzMultiVecDeviceFloat(n,alpha,beta,gamma,delta,deviceVecX,&
& deviceVecY,deviceVecZ) & & deviceVecY,deviceVecZ) &
& result(res) bind(c,name='abgdxyzMultiVecDeviceFloat') & result(res) bind(c,name='upd_xyzMultiVecDeviceFloat')
use iso_c_binding use iso_c_binding
integer(c_int) :: res integer(c_int) :: res
integer(c_int), value :: n integer(c_int), value :: n
real(c_float), value :: alpha, beta,gamma,delta real(c_float), value :: alpha, beta,gamma,delta
type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ
end function abgdxyzMultiVecDeviceFloat end function upd_xyzMultiVecDeviceFloat
end interface end interface
interface xyzwMultiVecDevice interface xyzwMultiVecDevice

@ -90,7 +90,7 @@ module psb_z_cuda_vect_mod
procedure, pass(x) :: dot_a => z_cuda_dot_a procedure, pass(x) :: dot_a => z_cuda_dot_a
procedure, pass(y) :: axpby_v => z_cuda_axpby_v procedure, pass(y) :: axpby_v => z_cuda_axpby_v
procedure, pass(y) :: axpby_a => z_cuda_axpby_a procedure, pass(y) :: axpby_a => z_cuda_axpby_a
procedure, pass(z) :: abgdxyz => z_cuda_abgdxyz procedure, pass(z) :: upd_xyz => z_cuda_upd_xyz
procedure, pass(y) :: mlt_v => z_cuda_mlt_v procedure, pass(y) :: mlt_v => z_cuda_mlt_v
procedure, pass(y) :: mlt_a => z_cuda_mlt_a procedure, pass(y) :: mlt_a => z_cuda_mlt_a
procedure, pass(z) :: mlt_a_2 => z_cuda_mlt_a_2 procedure, pass(z) :: mlt_a_2 => z_cuda_mlt_a_2
@ -912,7 +912,7 @@ contains
end subroutine z_cuda_axpby_v end subroutine z_cuda_axpby_v
subroutine z_cuda_abgdxyz(m,alpha, beta, gamma,delta,x, y, z, info) subroutine z_cuda_upd_xyz(m,alpha, beta, gamma,delta,x, y, z, info)
use psi_serial_mod use psi_serial_mod
implicit none implicit none
integer(psb_ipk_), intent(in) :: m integer(psb_ipk_), intent(in) :: m
@ -946,7 +946,7 @@ contains
if ((nx<m).or.(ny<m).or.(nz<m)) then if ((nx<m).or.(ny<m).or.(nz<m)) then
info = psb_err_internal_error_ info = psb_err_internal_error_
else else
info = abgdxyzMultiVecDevice(m,alpha,beta,gamma,delta,& info = upd_xyzMultiVecDevice(m,alpha,beta,gamma,delta,&
& xx%deviceVect,yy%deviceVect,zz%deviceVect) & xx%deviceVect,yy%deviceVect,zz%deviceVect)
end if end if
call yy%set_dev() call yy%set_dev()
@ -972,7 +972,7 @@ contains
call z%axpby(m,gamma,y,delta,info) call z%axpby(m,gamma,y,delta,info)
end if end if
end subroutine z_cuda_abgdxyz end subroutine z_cuda_upd_xyz
subroutine z_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info) subroutine z_cuda_xyzw(m,a,b,c,d,e,f,x, y, z,w, info)
use psi_serial_mod use psi_serial_mod

@ -313,16 +313,16 @@ module psb_z_vectordev_mod
end function axpbyMultiVecDeviceDoubleComplex end function axpbyMultiVecDeviceDoubleComplex
end interface end interface
interface abgdxyzMultiVecDevice interface upd_xyzMultiVecDevice
function abgdxyzMultiVecDeviceDoubleComplex(n,alpha,beta,gamma,delta,deviceVecX,& function upd_xyzMultiVecDeviceDoubleComplex(n,alpha,beta,gamma,delta,deviceVecX,&
& deviceVecY,deviceVecZ) & & deviceVecY,deviceVecZ) &
& result(res) bind(c,name='abgdxyzMultiVecDeviceDoubleComplex') & result(res) bind(c,name='upd_xyzMultiVecDeviceDoubleComplex')
use iso_c_binding use iso_c_binding
integer(c_int) :: res integer(c_int) :: res
integer(c_int), value :: n integer(c_int), value :: n
complex(c_double_complex), value :: alpha, beta,gamma,delta complex(c_double_complex), value :: alpha, beta,gamma,delta
type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ type(c_ptr), value :: deviceVecX, deviceVecY, deviceVecZ
end function abgdxyzMultiVecDeviceDoubleComplex end function upd_xyzMultiVecDeviceDoubleComplex
end interface end interface
interface xyzwMultiVecDevice interface xyzwMultiVecDevice

Loading…
Cancel
Save