From 8883291d565414f72015315419fdb2bb076c1cd0 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 6 Apr 2017 14:49:39 +0000 Subject: [PATCH] psblas3-mcbind: cbind/base/psb_c_base.h cbind/base/psb_c_cbase.h cbind/base/psb_c_dbase.h cbind/base/psb_c_dcomm.h cbind/base/psb_c_psblas_cbind_mod.f90 cbind/base/psb_c_sbase.h cbind/base/psb_c_zbase.h cbind/base/psb_d_psblas_cbind_mod.f90 cbind/base/psb_s_psblas_cbind_mod.f90 cbind/base/psb_z_psblas_cbind_mod.f90 New spmm_opt --- cbind/base/psb_c_base.h | 22 +++++++++++- cbind/base/psb_c_cbase.h | 3 ++ cbind/base/psb_c_dbase.h | 3 ++ cbind/base/psb_c_dcomm.h | 4 +++ cbind/base/psb_c_psblas_cbind_mod.f90 | 52 +++++++++++++++++++++++++++ cbind/base/psb_c_sbase.h | 3 ++ cbind/base/psb_c_zbase.h | 3 ++ cbind/base/psb_d_psblas_cbind_mod.f90 | 52 +++++++++++++++++++++++++++ cbind/base/psb_s_psblas_cbind_mod.f90 | 52 +++++++++++++++++++++++++++ cbind/base/psb_z_psblas_cbind_mod.f90 | 52 +++++++++++++++++++++++++++ 10 files changed, 245 insertions(+), 1 deletion(-) diff --git a/cbind/base/psb_c_base.h b/cbind/base/psb_c_base.h index e61cfa79..fe07902e 100644 --- a/cbind/base/psb_c_base.h +++ b/cbind/base/psb_c_base.h @@ -2,7 +2,7 @@ #define PSB_C_BASE__ #ifdef __cplusplus extern "C" { - typedef char _Bool; + /*typedef char _Bool;*/ #endif #include @@ -11,6 +11,7 @@ extern "C" { #include #include #include +#include #if defined(LONG_INTEGERS_) @@ -94,6 +95,25 @@ extern "C" { #define PSB_AFMT_COO "COO" #define PSB_AFMT_RSB "RSB" + /* Transpose argument */ +#define psb_NoTrans_ "N" +#define psb_Trans_ "T" +#define psb_ConjTrans_ "C" + + /* legal values for halo swap modes argument */ +#define psb_swap_send_ 1 +#define psb_swap_recv_ 2 +#define psb_swap_sync_ 4 +#define psb_swap_mpi_ 8 + + /* legal values for ovrl update argument */ +#define psb_none_ 0 +#define psb_sum_ 1 +#define psb_avg_ 2 +#define psb_square_root_ 3 +#define psb_setzero_ 4 + + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/cbind/base/psb_c_cbase.h b/cbind/base/psb_c_cbase.h index ce9952f8..e74e39d9 100644 --- a/cbind/base/psb_c_cbase.h +++ b/cbind/base/psb_c_cbase.h @@ -55,6 +55,9 @@ psb_i_t psb_c_cgeaxpby(psb_c_t alpha, psb_c_cvector *xh, psb_c_t beta, psb_c_cvector *yh, psb_c_descriptor *cdh); psb_i_t psb_c_cspmm(psb_c_t alpha, psb_c_cspmat *ah, psb_c_cvector *xh, psb_c_t beta, psb_c_cvector *yh, psb_c_descriptor *cdh); +psb_i_t psb_c_cspmm_opt(psb_c_t alpha, psb_c_cspmat *ah, psb_c_cvector *xh, + psb_c_t beta, psb_c_cvector *yh, psb_c_descriptor *cdh, + char *trans, bool doswap); psb_i_t psb_c_cspsm(psb_c_t alpha, psb_c_cspmat *th, psb_c_cvector *xh, psb_c_t beta, psb_c_cvector *yh, psb_c_descriptor *cdh); #ifdef __cplusplus diff --git a/cbind/base/psb_c_dbase.h b/cbind/base/psb_c_dbase.h index f7179123..52868972 100644 --- a/cbind/base/psb_c_dbase.h +++ b/cbind/base/psb_c_dbase.h @@ -55,6 +55,9 @@ psb_i_t psb_c_dgeaxpby(psb_d_t alpha, psb_c_dvector *xh, psb_d_t beta, psb_c_dvector *yh, psb_c_descriptor *cdh); psb_i_t psb_c_dspmm(psb_d_t alpha, psb_c_dspmat *ah, psb_c_dvector *xh, psb_d_t beta, psb_c_dvector *yh, psb_c_descriptor *cdh); +psb_i_t psb_c_dspmm_opt(psb_d_t alpha, psb_c_dspmat *ah, psb_c_dvector *xh, + psb_d_t beta, psb_c_dvector *yh, psb_c_descriptor *cdh, + char *trans, bool doswap); psb_i_t psb_c_dspsm(psb_d_t alpha, psb_c_dspmat *th, psb_c_dvector *xh, psb_d_t beta, psb_c_dvector *yh, psb_c_descriptor *cdh); #ifdef __cplusplus diff --git a/cbind/base/psb_c_dcomm.h b/cbind/base/psb_c_dcomm.h index 0d5f6c4a..9c906117 100644 --- a/cbind/base/psb_c_dcomm.h +++ b/cbind/base/psb_c_dcomm.h @@ -6,6 +6,10 @@ extern "C" { #endif + psb_i_t psb_c_dhalo(psb_c_dvector *xh, psb_c_descriptor *cdh); + psb_i_t psb_c_dhalo_opt(psb_c_dvector *xh, psb_c_descriptor *cdh); + psb_i_t psb_c_dovrl(psb_c_dvector *xh, psb_c_descriptor *cdh); + psb_i_t psb_c_dovrl_opt(psb_c_dvector *xh, psb_c_descriptor *cdh); psb_i_t psb_c_dvscatter(psb_c_dvector *xh, psb_c_descriptor *cdh); psb_d_t* psb_c_dvgather(psb_c_dvector *xh, psb_c_descriptor *cdh); psb_c_dspmat* psb_c_dspgather(psb_c_dspmat *ah, psb_c_descriptor *cdh); diff --git a/cbind/base/psb_c_psblas_cbind_mod.f90 b/cbind/base/psb_c_psblas_cbind_mod.f90 index 809a16db..ac984562 100644 --- a/cbind/base/psb_c_psblas_cbind_mod.f90 +++ b/cbind/base/psb_c_psblas_cbind_mod.f90 @@ -241,6 +241,58 @@ contains end function psb_c_cspmm + function psb_c_cspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) + use psb_base_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + implicit none + integer(psb_c_int) :: res + + type(psb_c_cspmat) :: ah + type(psb_c_cvector) :: xh,yh + type(psb_c_descriptor) :: cdh + complex(c_float_complex), value :: alpha, beta + character(c_char) :: trans + logical(c_bool), value :: doswap + + type(psb_desc_type), pointer :: descp + type(psb_c_vect_type), pointer :: xp,yp + type(psb_cspmat_type), pointer :: ap + character :: ftrans + logical :: fdoswap + integer :: info + + res = -1 + if (c_associated(cdh%item)) then + call c_f_pointer(cdh%item,descp) + else + return + end if + if (c_associated(xh%item)) then + call c_f_pointer(xh%item,xp) + else + return + end if + if (c_associated(yh%item)) then + call c_f_pointer(yh%item,yp) + else + return + end if + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + fdoswap = doswap + ftrans = trans + call psb_spmm(alpha,ap,xp,beta,yp,descp,info,trans=ftrans,doswap=fdoswap) + + res = info + + end function psb_c_cspmm_opt + + function psb_c_cspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) use psb_base_mod use psb_objhandle_mod diff --git a/cbind/base/psb_c_sbase.h b/cbind/base/psb_c_sbase.h index 5d8132de..47a72d38 100644 --- a/cbind/base/psb_c_sbase.h +++ b/cbind/base/psb_c_sbase.h @@ -55,6 +55,9 @@ psb_i_t psb_c_sgeaxpby(psb_s_t alpha, psb_c_svector *xh, psb_s_t beta, psb_c_svector *yh, psb_c_descriptor *cdh); psb_i_t psb_c_sspmm(psb_s_t alpha, psb_c_sspmat *ah, psb_c_svector *xh, psb_s_t beta, psb_c_svector *yh, psb_c_descriptor *cdh); +psb_i_t psb_c_sspmm_opt(psb_s_t alpha, psb_c_sspmat *ah, psb_c_svector *xh, + psb_s_t beta, psb_c_svector *yh, psb_c_descriptor *cdh, + char *trans, bool doswap); psb_i_t psb_c_sspsm(psb_s_t alpha, psb_c_sspmat *th, psb_c_svector *xh, psb_s_t beta, psb_c_svector *yh, psb_c_descriptor *cdh); #ifdef __cplusplus diff --git a/cbind/base/psb_c_zbase.h b/cbind/base/psb_c_zbase.h index 540562d7..4d8f4f9a 100644 --- a/cbind/base/psb_c_zbase.h +++ b/cbind/base/psb_c_zbase.h @@ -55,6 +55,9 @@ psb_i_t psb_c_zgeaxpby(psb_z_t alpha, psb_c_zvector *xh, psb_z_t beta, psb_c_zvector *yh, psb_c_descriptor *cdh); psb_i_t psb_c_zspmm(psb_z_t alpha, psb_c_zspmat *ah, psb_c_zvector *xh, psb_z_t beta, psb_c_zvector *yh, psb_c_descriptor *cdh); +psb_i_t psb_c_zspmm_opt(psb_z_t alpha, psb_c_zspmat *ah, psb_c_zvector *xh, + psb_z_t beta, psb_c_zvector *yh, psb_c_descriptor *cdh, + char *trans, bool doswap); psb_i_t psb_c_zspsm(psb_z_t alpha, psb_c_zspmat *th, psb_c_zvector *xh, psb_z_t beta, psb_c_zvector *yh, psb_c_descriptor *cdh); #ifdef __cplusplus diff --git a/cbind/base/psb_d_psblas_cbind_mod.f90 b/cbind/base/psb_d_psblas_cbind_mod.f90 index 2557069e..76bdfb18 100644 --- a/cbind/base/psb_d_psblas_cbind_mod.f90 +++ b/cbind/base/psb_d_psblas_cbind_mod.f90 @@ -241,6 +241,58 @@ contains end function psb_c_dspmm + function psb_c_dspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) + use psb_base_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + implicit none + integer(psb_c_int) :: res + + type(psb_c_dspmat) :: ah + type(psb_c_dvector) :: xh,yh + type(psb_c_descriptor) :: cdh + real(c_double), value :: alpha, beta + character(c_char) :: trans + logical(c_bool), value :: doswap + + type(psb_desc_type), pointer :: descp + type(psb_d_vect_type), pointer :: xp,yp + type(psb_dspmat_type), pointer :: ap + character :: ftrans + logical :: fdoswap + integer :: info + + res = -1 + if (c_associated(cdh%item)) then + call c_f_pointer(cdh%item,descp) + else + return + end if + if (c_associated(xh%item)) then + call c_f_pointer(xh%item,xp) + else + return + end if + if (c_associated(yh%item)) then + call c_f_pointer(yh%item,yp) + else + return + end if + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + fdoswap = doswap + ftrans = trans + call psb_spmm(alpha,ap,xp,beta,yp,descp,info,trans=ftrans,doswap=fdoswap) + + res = info + + end function psb_c_dspmm_opt + + function psb_c_dspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) use psb_base_mod use psb_objhandle_mod diff --git a/cbind/base/psb_s_psblas_cbind_mod.f90 b/cbind/base/psb_s_psblas_cbind_mod.f90 index 5cef1b1c..ea964ea7 100644 --- a/cbind/base/psb_s_psblas_cbind_mod.f90 +++ b/cbind/base/psb_s_psblas_cbind_mod.f90 @@ -241,6 +241,58 @@ contains end function psb_c_sspmm + function psb_c_sspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) + use psb_base_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + implicit none + integer(psb_c_int) :: res + + type(psb_c_sspmat) :: ah + type(psb_c_svector) :: xh,yh + type(psb_c_descriptor) :: cdh + real(c_float), value :: alpha, beta + character(c_char) :: trans + logical(c_bool), value :: doswap + + type(psb_desc_type), pointer :: descp + type(psb_s_vect_type), pointer :: xp,yp + type(psb_sspmat_type), pointer :: ap + character :: ftrans + logical :: fdoswap + integer :: info + + res = -1 + if (c_associated(cdh%item)) then + call c_f_pointer(cdh%item,descp) + else + return + end if + if (c_associated(xh%item)) then + call c_f_pointer(xh%item,xp) + else + return + end if + if (c_associated(yh%item)) then + call c_f_pointer(yh%item,yp) + else + return + end if + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + fdoswap = doswap + ftrans = trans + call psb_spmm(alpha,ap,xp,beta,yp,descp,info,trans=ftrans,doswap=fdoswap) + + res = info + + end function psb_c_sspmm_opt + + function psb_c_sspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) use psb_base_mod use psb_objhandle_mod diff --git a/cbind/base/psb_z_psblas_cbind_mod.f90 b/cbind/base/psb_z_psblas_cbind_mod.f90 index 43cb6d8f..0a3cad53 100644 --- a/cbind/base/psb_z_psblas_cbind_mod.f90 +++ b/cbind/base/psb_z_psblas_cbind_mod.f90 @@ -241,6 +241,58 @@ contains end function psb_c_zspmm + function psb_c_zspmm_opt(alpha,ah,xh,beta,yh,cdh,trans,doswap) bind(c) result(res) + use psb_base_mod + use psb_objhandle_mod + use psb_base_string_cbind_mod + implicit none + integer(psb_c_int) :: res + + type(psb_c_zspmat) :: ah + type(psb_c_zvector) :: xh,yh + type(psb_c_descriptor) :: cdh + complex(c_double_complex), value :: alpha, beta + character(c_char) :: trans + logical(c_bool), value :: doswap + + type(psb_desc_type), pointer :: descp + type(psb_z_vect_type), pointer :: xp,yp + type(psb_zspmat_type), pointer :: ap + character :: ftrans + logical :: fdoswap + integer :: info + + res = -1 + if (c_associated(cdh%item)) then + call c_f_pointer(cdh%item,descp) + else + return + end if + if (c_associated(xh%item)) then + call c_f_pointer(xh%item,xp) + else + return + end if + if (c_associated(yh%item)) then + call c_f_pointer(yh%item,yp) + else + return + end if + if (c_associated(ah%item)) then + call c_f_pointer(ah%item,ap) + else + return + end if + + fdoswap = doswap + ftrans = trans + call psb_spmm(alpha,ap,xp,beta,yp,descp,info,trans=ftrans,doswap=fdoswap) + + res = info + + end function psb_c_zspmm_opt + + function psb_c_zspsm(alpha,ah,xh,beta,yh,cdh) bind(c) result(res) use psb_base_mod use psb_objhandle_mod