From 41731b2acba9192ca716684cb1868ce7e8addcb2 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 5 Feb 2020 14:42:08 +0000 Subject: [PATCH 1/2] New spmm_bld_inner files. --- mlprec/impl/aggregator/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mlprec/impl/aggregator/Makefile b/mlprec/impl/aggregator/Makefile index 293989c4..cfa00d6e 100644 --- a/mlprec/impl/aggregator/Makefile +++ b/mlprec/impl/aggregator/Makefile @@ -14,6 +14,7 @@ mld_s_dec_aggregator_mat_bld.o \ mld_s_dec_aggregator_tprol.o \ mld_s_symdec_aggregator_tprol.o \ mld_s_map_to_tprol.o mld_s_soc1_map_bld.o mld_s_soc2_map_bld.o\ +mld_s_spmm_bld_inner.o \ mld_saggrmat_biz_bld.o mld_saggrmat_minnrg_bld.o\ mld_saggrmat_nosmth_bld.o mld_saggrmat_smth_bld.o \ mld_d_dec_aggregator_mat_asb.o \ @@ -29,6 +30,7 @@ mld_c_dec_aggregator_mat_bld.o \ mld_c_dec_aggregator_tprol.o \ mld_c_symdec_aggregator_tprol.o \ mld_c_map_to_tprol.o mld_c_soc1_map_bld.o mld_c_soc2_map_bld.o\ +mld_c_spmm_bld_inner.o \ mld_caggrmat_biz_bld.o mld_caggrmat_minnrg_bld.o\ mld_caggrmat_nosmth_bld.o mld_caggrmat_smth_bld.o \ mld_z_dec_aggregator_mat_asb.o \ @@ -36,6 +38,7 @@ mld_z_dec_aggregator_mat_bld.o \ mld_z_dec_aggregator_tprol.o \ mld_z_symdec_aggregator_tprol.o \ mld_z_map_to_tprol.o mld_z_soc1_map_bld.o mld_z_soc2_map_bld.o\ +mld_z_spmm_bld_inner.o \ mld_zaggrmat_biz_bld.o mld_zaggrmat_minnrg_bld.o\ mld_zaggrmat_nosmth_bld.o mld_zaggrmat_smth_bld.o From 8fbaa83f1096592341969e05ccfaaf3e07147ded Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Wed, 5 Feb 2020 14:42:22 +0000 Subject: [PATCH 2/2] Changes for IPK8==LPK8 --- mlprec/impl/solver/mld_c_mumps_solver_apply.F90 | 2 +- mlprec/impl/solver/mld_d_mumps_solver_apply.F90 | 2 +- mlprec/impl/solver/mld_s_mumps_solver_apply.F90 | 2 +- mlprec/impl/solver/mld_z_mumps_solver_apply.F90 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mlprec/impl/solver/mld_c_mumps_solver_apply.F90 b/mlprec/impl/solver/mld_c_mumps_solver_apply.F90 index 7424e6aa..f489dbea 100644 --- a/mlprec/impl/solver/mld_c_mumps_solver_apply.F90 +++ b/mlprec/impl/solver/mld_c_mumps_solver_apply.F90 @@ -136,7 +136,7 @@ subroutine c_mumps_solver_apply(alpha,sv,x,beta,y,desc_data,& if (sv%ipar(1) == mld_local_solver_ ) then call psb_geaxpby(alpha,gx,beta,y,desc_data,info) else - call psb_scatter(gx, ww, desc_data, info, root=0) + call psb_scatter(gx, ww, desc_data, info, root=izero) if (info == psb_success_) then call psb_geaxpby(alpha,ww,beta,y,desc_data,info) end if diff --git a/mlprec/impl/solver/mld_d_mumps_solver_apply.F90 b/mlprec/impl/solver/mld_d_mumps_solver_apply.F90 index 8b77ae6b..b6b704fe 100644 --- a/mlprec/impl/solver/mld_d_mumps_solver_apply.F90 +++ b/mlprec/impl/solver/mld_d_mumps_solver_apply.F90 @@ -136,7 +136,7 @@ subroutine d_mumps_solver_apply(alpha,sv,x,beta,y,desc_data,& if (sv%ipar(1) == mld_local_solver_ ) then call psb_geaxpby(alpha,gx,beta,y,desc_data,info) else - call psb_scatter(gx, ww, desc_data, info, root=0) + call psb_scatter(gx, ww, desc_data, info, root=izero) if (info == psb_success_) then call psb_geaxpby(alpha,ww,beta,y,desc_data,info) end if diff --git a/mlprec/impl/solver/mld_s_mumps_solver_apply.F90 b/mlprec/impl/solver/mld_s_mumps_solver_apply.F90 index 01ba296d..e252c41f 100644 --- a/mlprec/impl/solver/mld_s_mumps_solver_apply.F90 +++ b/mlprec/impl/solver/mld_s_mumps_solver_apply.F90 @@ -136,7 +136,7 @@ subroutine s_mumps_solver_apply(alpha,sv,x,beta,y,desc_data,& if (sv%ipar(1) == mld_local_solver_ ) then call psb_geaxpby(alpha,gx,beta,y,desc_data,info) else - call psb_scatter(gx, ww, desc_data, info, root=0) + call psb_scatter(gx, ww, desc_data, info, root=izero) if (info == psb_success_) then call psb_geaxpby(alpha,ww,beta,y,desc_data,info) end if diff --git a/mlprec/impl/solver/mld_z_mumps_solver_apply.F90 b/mlprec/impl/solver/mld_z_mumps_solver_apply.F90 index d39517f7..970be263 100644 --- a/mlprec/impl/solver/mld_z_mumps_solver_apply.F90 +++ b/mlprec/impl/solver/mld_z_mumps_solver_apply.F90 @@ -136,7 +136,7 @@ subroutine z_mumps_solver_apply(alpha,sv,x,beta,y,desc_data,& if (sv%ipar(1) == mld_local_solver_ ) then call psb_geaxpby(alpha,gx,beta,y,desc_data,info) else - call psb_scatter(gx, ww, desc_data, info, root=0) + call psb_scatter(gx, ww, desc_data, info, root=izero) if (info == psb_success_) then call psb_geaxpby(alpha,ww,beta,y,desc_data,info) end if