diff --git a/mlprec/impl/aggregator/Makefile b/mlprec/impl/aggregator/Makefile index 08209d88..5f3b9b1e 100644 --- a/mlprec/impl/aggregator/Makefile +++ b/mlprec/impl/aggregator/Makefile @@ -14,8 +14,8 @@ 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_s_spmm_bld_inner.o mld_s_ptap.o \ +mld_saggrmat_minnrg_bld.o\ mld_saggrmat_nosmth_bld.o mld_saggrmat_smth_bld.o \ mld_d_dec_aggregator_mat_asb.o \ mld_d_dec_aggregator_mat_bld.o \ @@ -23,23 +23,23 @@ mld_d_dec_aggregator_tprol.o \ mld_d_symdec_aggregator_tprol.o \ mld_d_map_to_tprol.o mld_d_soc1_map_bld.o mld_d_soc2_map_bld.o \ mld_d_spmm_bld_inner.o mld_d_ptap.o \ -mld_daggrmat_biz_bld.o mld_daggrmat_minnrg_bld.o \ +mld_daggrmat_minnrg_bld.o \ mld_daggrmat_nosmth_bld.o mld_daggrmat_smth_bld.o \ mld_c_dec_aggregator_mat_asb.o \ 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_c_spmm_bld_inner.o mld_c_ptap.o \ +mld_caggrmat_minnrg_bld.o\ mld_caggrmat_nosmth_bld.o mld_caggrmat_smth_bld.o \ mld_z_dec_aggregator_mat_asb.o \ 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_z_spmm_bld_inner.o mld_z_ptap.o \ +mld_zaggrmat_minnrg_bld.o\ mld_zaggrmat_nosmth_bld.o mld_zaggrmat_smth_bld.o #mld_s_hybrid_aggregator_tprol.o \ diff --git a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 index 6057992a..add43ef0 100644 --- a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_asb.f90 @@ -99,7 +99,7 @@ subroutine mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& integer(psb_ipk_), intent(out) :: info ! integer(psb_ipk_) :: ictxt, np, me - type(psb_lc_coo_sparse_mat) :: lacoo, lbcoo + type(psb_lc_coo_sparse_mat) :: tmpcoo type(psb_c_coo_sparse_mat) :: acoo type(psb_lc_csr_sparse_mat) :: acsr1 type(psb_cspmat_type) :: tmp_ac @@ -117,70 +117,15 @@ subroutine mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& ictxt = desc_a%get_context() call psb_info(ictxt,me,np) - - ntaggr = sum(nlaggr) select case(parms%coarse_mat) case(mld_distr_mat_) - call ac%mv_to(lbcoo) - nzl = lbcoo%get_nzeros() - i_nl = nlaggr(me+1) - if (info == psb_success_) call psb_cdall(ictxt,desc_ac,info,nl=i_nl) - if (info == psb_success_) call psb_cdins(nzl,lbcoo%ia,lbcoo%ja,desc_ac,info) - if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ia(1:nzl),desc_ac,info,iact='I') - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ja(1:nzl),desc_ac,info,iact='I') - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Creating desc_ac and converting ac') - goto 9999 - end if - if (debug_level >= psb_debug_outer_) & - & write(debug_unit,*) me,' ',trim(name),& - & 'Assembld aux descr. distr.' - call ac%mv_from(lbcoo) - call ac%set_nrows(desc_ac%get_local_rows()) - call ac%set_ncols(desc_ac%get_local_cols()) - call ac%set_asb() - - if (info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_sp_free') - goto 9999 - end if - - if (np>1) then - call op_prol%mv_to(acsr1) - nzl = acsr1%get_nzeros() - call psb_glob_to_loc(acsr1%ja(1:nzl),desc_ac,info,'I') - if(info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_glob_to_loc') - goto 9999 - end if - call op_prol%mv_from(acsr1) - endif - call op_prol%set_ncols(desc_ac%get_local_cols()) - - if (np>1) then - !call op_restr%cscnv(info,type='coo',dupl=psb_dupl_add_) - call op_restr%mv_to(lacoo) - nzl = lacoo%get_nzeros() - if (info == psb_success_) call psb_glob_to_loc(lacoo%ia(1:nzl),desc_ac,info,'I') - call lacoo%set_dupl(psb_dupl_add_) - if (info == psb_success_) call op_restr%mv_from(lacoo) - if (info == psb_success_) call op_restr%cscnv(info,type='csr') - if(info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Converting op_restr to local') - goto 9999 - end if - end if - ! - ! Clip to local rows. - ! - call op_restr%set_nrows(desc_ac%get_local_rows()) + call ac%cscnv(info,type='csr') + call op_prol%cscnv(info,type='csr') + call op_restr%cscnv(info,type='csr') if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -189,22 +134,26 @@ subroutine mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& case(mld_repl_mat_) ! ! - ! If we are here, it means we assume that an IPK version of the - ! coarse matrix can hold all indices. User beware! - ! - - ! - ! op_prol/op_restr come from par_spmm_bld with local sizes - ! suitable for DIST option, fix relevant sizes - ! + call op_prol%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I') + call op_prol%mv_from(tmpcoo) + + call op_restr%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I') + call op_restr%mv_from(tmpcoo) + call op_prol%set_ncols(ntaggr) call op_restr%set_nrows(ntaggr) + + call ac%mv_to(tmpcoo) + call tmp_ac%mv_from(tmpcoo) + call psb_gather(ac,tmp_ac,desc_ac,info,root=-ione,dupl=psb_dupl_add_,keeploc=.false.) + call psb_cdall(ictxt,desc_ac,info,mg=ntaggr,repl=.true.) if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call ac%mv_to(acoo) - if (info == psb_success_) call tmp_ac%mv_from(acoo) - if (info == psb_success_) & - & call psb_gather(ac,tmp_ac,desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.) + if (info /= psb_success_) goto 9999 case default @@ -221,4 +170,19 @@ subroutine mld_c_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_c_dec_aggregator_mat_asb diff --git a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_bld.f90 b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_bld.f90 index 964bf374..72e42691 100644 --- a/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_bld.f90 +++ b/mlprec/impl/aggregator/mld_c_dec_aggregator_mat_bld.f90 @@ -133,7 +133,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_prol,op_restr,info) +subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_c_prec_type, mld_protect_name => mld_c_dec_aggregator_mat_bld use mld_c_inner_mod @@ -146,6 +147,7 @@ subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lcspmat_type), intent(inout) :: op_prol type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -177,22 +179,22 @@ subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p case (mld_no_smooth_) call mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,& - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_smooth_prol_) call mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) - case(mld_biz_prol_) - - call mld_caggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) +!!$ case(mld_biz_prol_) +!!$ +!!$ call mld_caggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & +!!$ & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_min_energy_) call mld_caggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case default info = psb_err_internal_error_ diff --git a/mlprec/impl/aggregator/mld_c_ptap.f90 b/mlprec/impl/aggregator/mld_c_ptap.f90 new file mode 100644 index 00000000..964eb5be --- /dev/null +++ b/mlprec/impl/aggregator/mld_c_ptap.f90 @@ -0,0 +1,390 @@ +! +! +! MLD2P4 Extensions +! +! (C) Copyright 2019 +! +! Salvatore Filippone Cranfield University +! Pasqua D'Ambra IAC-CNR, Naples, IT +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the MLD2P4 group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! +! File: mld_daggrmat_nosmth_bld.F90 +! +! +subroutine mld_c_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_c_inner_mod + use mld_c_base_aggregator_mod, mld_protect_name => mld_c_ptap + implicit none + + ! Arguments + type(psb_c_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lcspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_lc_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_c_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_ifmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_lcoo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_c_ptap + +subroutine mld_lc_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_c_inner_mod + use mld_c_base_aggregator_mod, mld_protect_name => mld_lc_ptap + implicit none + + ! Arguments + type(psb_lc_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lcspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_lc_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_lc_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_fmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_coo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_lc_ptap diff --git a/mlprec/impl/aggregator/mld_c_spmm_bld_inner.f90 b/mlprec/impl/aggregator/mld_c_spmm_bld_inner.f90 index 3ef031a8..76b21c40 100644 --- a/mlprec/impl/aggregator/mld_c_spmm_bld_inner.f90 +++ b/mlprec/impl/aggregator/mld_c_spmm_bld_inner.f90 @@ -36,7 +36,7 @@ ! ! subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_c_inner_mod use mld_c_base_aggregator_mod, mld_protect_name => mld_c_spmm_bld_inner @@ -48,7 +48,7 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_sml_parms), intent(inout) :: parms type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lcspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -60,7 +60,7 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_lc_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_c_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. @@ -102,16 +102,16 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -120,19 +120,20 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_lcoo(coo_restr,info) + call csr_prol%mv_to_lcoo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -141,7 +142,12 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -151,53 +157,30 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_lcoo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() call acsr3%free() - call ac_csr%mv_to_lcoo(ac_coo,info) - call ac_coo%fix(info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixed ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) - if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() - if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr - ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if + call psb_cdasb(desc_ac,info) - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -209,11 +192,26 @@ subroutine mld_c_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_c_spmm_bld_inner subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_c_inner_mod use mld_c_base_aggregator_mod, mld_protect_name => mld_lc_spmm_bld_inner @@ -225,7 +223,7 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_sml_parms), intent(inout) :: parms type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lcspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -237,7 +235,7 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_lc_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_lc_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. @@ -268,8 +266,7 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr ! - ! Here COO_PROL should be with GLOBAL indices on the cols - ! and LOCAL indices on the rows. + ! COO_PROL should arrive here with local numbering ! if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& @@ -280,16 +277,16 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -298,19 +295,20 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_fmt(coo_restr,info) + call csr_prol%mv_to_coo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -319,7 +317,12 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -329,51 +332,32 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_coo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() - call ac_csr%mv_to_coo(ac_coo,info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixing ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call ac_coo%fix(info) - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if - - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & @@ -386,5 +370,21 @@ subroutine mld_lc_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_lc_spmm_bld_inner diff --git a/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 index dc3c1b43..eac910d4 100644 --- a/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_caggrmat_nosmth_bld.f90 @@ -96,7 +96,8 @@ ! Error code. ! ! -subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_c_inner_mod, mld_protect_name => mld_caggrmat_nosmth_bld @@ -110,6 +111,7 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(mld_sml_parms), intent(inout) :: parms type(psb_lcspmat_type), intent(inout) :: op_prol type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -120,11 +122,11 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(psb_lcspmat_type) :: la type(psb_lc_coo_sparse_mat) :: ac_coo, tmpcoo, coo_prol, coo_restr type(psb_lc_csr_sparse_mat) :: acsr1, acsr2, acsr - type(psb_desc_type) :: tmp_desc integer(psb_ipk_) :: debug_level, debug_unit integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & & naggr, nzt, naggrm1, naggrp1, i, k integer(psb_ipk_) :: inaggr, nzlp + logical, parameter :: debug = .false. name = 'mld_aggrmat_nosmth_bld' info = psb_success_ @@ -148,13 +150,26 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call a%cp_to(acsr) call op_prol%mv_to(coo_prol) inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_prol:',coo_prol) + + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) + + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + call coo_prol%set_nrows(desc_a%get_local_rows()) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_restr:',coo_restr) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) @@ -164,5 +179,20 @@ subroutine mld_caggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lc_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + end subroutine check_coo end subroutine mld_caggrmat_nosmth_bld diff --git a/mlprec/impl/aggregator/mld_caggrmat_smth_bld.f90 b/mlprec/impl/aggregator/mld_caggrmat_smth_bld.f90 index 45244868..015c772c 100644 --- a/mlprec/impl/aggregator/mld_caggrmat_smth_bld.f90 +++ b/mlprec/impl/aggregator/mld_caggrmat_smth_bld.f90 @@ -102,7 +102,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_c_inner_mod, mld_protect_name => mld_caggrmat_smth_bld @@ -114,9 +115,10 @@ subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest type(psb_cspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_sml_parms), intent(inout) :: parms - type(psb_lcspmat_type), intent(inout) :: op_prol - type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(mld_sml_parms), intent(inout) :: parms + type(psb_lcspmat_type), intent(inout) :: op_prol + type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -125,7 +127,6 @@ subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest integer(psb_ipk_) :: inaggr, nzlp integer(psb_ipk_) :: ictxt, np, me character(len=20) :: name - type(psb_desc_type) :: tmp_desc type(psb_lc_coo_sparse_mat) :: coo_prol, coo_restr, tmpcoo type(psb_lc_csr_sparse_mat) :: acsr1, acsrf, csr_prol, acsr complex(psb_spk_), allocatable :: adiag(:) @@ -256,11 +257,13 @@ subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest if (info /= psb_success_) goto 9999 inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) call coo_prol%mv_to_fmt(csr_prol,info) + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) ! ! Build the smoothed prolongator using either A or Af ! acsr1 = (I-w*D*A) Prol acsr1 = (I-w*D*Af) Prol @@ -268,7 +271,7 @@ subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest ! is a bit less readable, butsaves space and one extra matrix copy ! call omega_smooth(omega,acsrf) - call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,tmp_desc,info) + call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,desc_ac,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='spspmm 1') goto 9999 @@ -281,9 +284,9 @@ subroutine mld_caggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest nzl = acsr1%get_nzeros() call acsr1%mv_to_coo(coo_prol,info) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) diff --git a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 index 1ce3417d..060c0dc4 100644 --- a/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_d_dec_aggregator_mat_asb.f90 @@ -153,11 +153,6 @@ subroutine mld_d_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& call psb_cdall(ictxt,desc_ac,info,mg=ntaggr,repl=.true.) if (info == psb_success_) call psb_cdasb(desc_ac,info) - ! - ! Now that we have the descriptors and the restrictor, we should - ! update the W. But we don't, because REPL is only valid - ! at the coarsest level, so no need to carry over. - ! if (info /= psb_success_) goto 9999 diff --git a/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 b/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 index 6a963b00..4f6a88a8 100644 --- a/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 +++ b/mlprec/impl/aggregator/mld_d_dec_aggregator_tprol.f90 @@ -122,7 +122,7 @@ subroutine mld_d_dec_aggregator_build_tprol(ag,parms,ag_data,& ! clean_zeros = ag%do_clean_zeros call ag%soc_map_bld(parms%aggr_ord,parms%aggr_thresh,clean_zeros,a,desc_a,nlaggr,ilaggr,info) - + if (info==psb_success_) call mld_map_to_tprol(desc_a,ilaggr,nlaggr,op_prol,info) if (info /= psb_success_) then info=psb_err_from_subroutine_ diff --git a/mlprec/impl/aggregator/mld_d_ptap.f90 b/mlprec/impl/aggregator/mld_d_ptap.f90 index c744181c..0c74e460 100644 --- a/mlprec/impl/aggregator/mld_d_ptap.f90 +++ b/mlprec/impl/aggregator/mld_d_ptap.f90 @@ -207,7 +207,7 @@ contains & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) end subroutine check_coo - + end subroutine mld_d_ptap subroutine mld_ld_ptap(a_csr,desc_a,nlaggr,parms,ac,& @@ -386,5 +386,5 @@ contains & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) end subroutine check_coo - + end subroutine mld_ld_ptap diff --git a/mlprec/impl/aggregator/mld_d_spmm_bld_inner.f90 b/mlprec/impl/aggregator/mld_d_spmm_bld_inner.f90 index 856a031e..5d30fa5d 100644 --- a/mlprec/impl/aggregator/mld_d_spmm_bld_inner.f90 +++ b/mlprec/impl/aggregator/mld_d_spmm_bld_inner.f90 @@ -207,7 +207,7 @@ contains & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) end subroutine check_coo - + end subroutine mld_d_spmm_bld_inner subroutine mld_ld_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& @@ -386,5 +386,5 @@ contains & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) end subroutine check_coo - + end subroutine mld_ld_spmm_bld_inner diff --git a/mlprec/impl/aggregator/mld_daggrmat_minnrg_bld.f90 b/mlprec/impl/aggregator/mld_daggrmat_minnrg_bld.f90 index 9065e3c5..dac54e8f 100644 --- a/mlprec/impl/aggregator/mld_daggrmat_minnrg_bld.f90 +++ b/mlprec/impl/aggregator/mld_daggrmat_minnrg_bld.f90 @@ -104,8 +104,7 @@ ! Error code. ! ! -subroutine mld_daggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr,parms,& - &ac,desc_ac,op_prol,op_restr,info) +subroutine mld_daggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_d_inner_mod, mld_protect_name => mld_daggrmat_minnrg_bld @@ -119,7 +118,6 @@ subroutine mld_daggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr,parms,& type(mld_dml_parms), intent(inout) :: parms type(psb_ldspmat_type), intent(inout) :: op_prol type(psb_ldspmat_type), intent(out) :: ac,op_restr - type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables diff --git a/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 index 8580c581..ff6eb6e1 100644 --- a/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_daggrmat_nosmth_bld.f90 @@ -179,6 +179,7 @@ subroutine mld_daggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,& 9999 call psb_error_handler(err_act) return + contains subroutine check_coo(me,string,coo) implicit none diff --git a/mlprec/impl/aggregator/mld_daggrmat_smth_bld.f90 b/mlprec/impl/aggregator/mld_daggrmat_smth_bld.f90 index 0b67239f..70d7e7b4 100644 --- a/mlprec/impl/aggregator/mld_daggrmat_smth_bld.f90 +++ b/mlprec/impl/aggregator/mld_daggrmat_smth_bld.f90 @@ -115,9 +115,9 @@ subroutine mld_daggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,& type(psb_dspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_dml_parms), intent(inout) :: parms - type(psb_ldspmat_type), intent(inout) :: op_prol - type(psb_ldspmat_type), intent(out) :: ac,op_restr + type(mld_dml_parms), intent(inout) :: parms + type(psb_ldspmat_type), intent(inout) :: op_prol + type(psb_ldspmat_type), intent(out) :: ac,op_restr type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info diff --git a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 index 254cc55a..721668d0 100644 --- a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_asb.f90 @@ -99,7 +99,7 @@ subroutine mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& integer(psb_ipk_), intent(out) :: info ! integer(psb_ipk_) :: ictxt, np, me - type(psb_ls_coo_sparse_mat) :: lacoo, lbcoo + type(psb_ls_coo_sparse_mat) :: tmpcoo type(psb_s_coo_sparse_mat) :: acoo type(psb_ls_csr_sparse_mat) :: acsr1 type(psb_sspmat_type) :: tmp_ac @@ -117,70 +117,15 @@ subroutine mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& ictxt = desc_a%get_context() call psb_info(ictxt,me,np) - - ntaggr = sum(nlaggr) select case(parms%coarse_mat) case(mld_distr_mat_) - call ac%mv_to(lbcoo) - nzl = lbcoo%get_nzeros() - i_nl = nlaggr(me+1) - if (info == psb_success_) call psb_cdall(ictxt,desc_ac,info,nl=i_nl) - if (info == psb_success_) call psb_cdins(nzl,lbcoo%ia,lbcoo%ja,desc_ac,info) - if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ia(1:nzl),desc_ac,info,iact='I') - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ja(1:nzl),desc_ac,info,iact='I') - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Creating desc_ac and converting ac') - goto 9999 - end if - if (debug_level >= psb_debug_outer_) & - & write(debug_unit,*) me,' ',trim(name),& - & 'Assembld aux descr. distr.' - call ac%mv_from(lbcoo) - call ac%set_nrows(desc_ac%get_local_rows()) - call ac%set_ncols(desc_ac%get_local_cols()) - call ac%set_asb() - - if (info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_sp_free') - goto 9999 - end if - - if (np>1) then - call op_prol%mv_to(acsr1) - nzl = acsr1%get_nzeros() - call psb_glob_to_loc(acsr1%ja(1:nzl),desc_ac,info,'I') - if(info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_glob_to_loc') - goto 9999 - end if - call op_prol%mv_from(acsr1) - endif - call op_prol%set_ncols(desc_ac%get_local_cols()) - - if (np>1) then - !call op_restr%cscnv(info,type='coo',dupl=psb_dupl_add_) - call op_restr%mv_to(lacoo) - nzl = lacoo%get_nzeros() - if (info == psb_success_) call psb_glob_to_loc(lacoo%ia(1:nzl),desc_ac,info,'I') - call lacoo%set_dupl(psb_dupl_add_) - if (info == psb_success_) call op_restr%mv_from(lacoo) - if (info == psb_success_) call op_restr%cscnv(info,type='csr') - if(info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Converting op_restr to local') - goto 9999 - end if - end if - ! - ! Clip to local rows. - ! - call op_restr%set_nrows(desc_ac%get_local_rows()) + call ac%cscnv(info,type='csr') + call op_prol%cscnv(info,type='csr') + call op_restr%cscnv(info,type='csr') if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -189,22 +134,26 @@ subroutine mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& case(mld_repl_mat_) ! ! - ! If we are here, it means we assume that an IPK version of the - ! coarse matrix can hold all indices. User beware! - ! - - ! - ! op_prol/op_restr come from par_spmm_bld with local sizes - ! suitable for DIST option, fix relevant sizes - ! + call op_prol%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I') + call op_prol%mv_from(tmpcoo) + + call op_restr%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I') + call op_restr%mv_from(tmpcoo) + call op_prol%set_ncols(ntaggr) call op_restr%set_nrows(ntaggr) + + call ac%mv_to(tmpcoo) + call tmp_ac%mv_from(tmpcoo) + call psb_gather(ac,tmp_ac,desc_ac,info,root=-ione,dupl=psb_dupl_add_,keeploc=.false.) + call psb_cdall(ictxt,desc_ac,info,mg=ntaggr,repl=.true.) if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call ac%mv_to(acoo) - if (info == psb_success_) call tmp_ac%mv_from(acoo) - if (info == psb_success_) & - & call psb_gather(ac,tmp_ac,desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.) + if (info /= psb_success_) goto 9999 case default @@ -221,4 +170,19 @@ subroutine mld_s_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_s_dec_aggregator_mat_asb diff --git a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_bld.f90 b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_bld.f90 index 23848360..983eb21b 100644 --- a/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_bld.f90 +++ b/mlprec/impl/aggregator/mld_s_dec_aggregator_mat_bld.f90 @@ -133,7 +133,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_prol,op_restr,info) +subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_s_prec_type, mld_protect_name => mld_s_dec_aggregator_mat_bld use mld_s_inner_mod @@ -146,6 +147,7 @@ subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lsspmat_type), intent(inout) :: op_prol type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -177,22 +179,22 @@ subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p case (mld_no_smooth_) call mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,& - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_smooth_prol_) call mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) - case(mld_biz_prol_) - - call mld_saggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) +!!$ case(mld_biz_prol_) +!!$ +!!$ call mld_saggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & +!!$ & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_min_energy_) call mld_saggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case default info = psb_err_internal_error_ diff --git a/mlprec/impl/aggregator/mld_s_ptap.f90 b/mlprec/impl/aggregator/mld_s_ptap.f90 new file mode 100644 index 00000000..b1284d28 --- /dev/null +++ b/mlprec/impl/aggregator/mld_s_ptap.f90 @@ -0,0 +1,390 @@ +! +! +! MLD2P4 Extensions +! +! (C) Copyright 2019 +! +! Salvatore Filippone Cranfield University +! Pasqua D'Ambra IAC-CNR, Naples, IT +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the MLD2P4 group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! +! File: mld_daggrmat_nosmth_bld.F90 +! +! +subroutine mld_s_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_s_inner_mod + use mld_s_base_aggregator_mod, mld_protect_name => mld_s_ptap + implicit none + + ! Arguments + type(psb_s_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lsspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_ls_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_s_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_ifmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_lcoo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_s_ptap + +subroutine mld_ls_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_s_inner_mod + use mld_s_base_aggregator_mod, mld_protect_name => mld_ls_ptap + implicit none + + ! Arguments + type(psb_ls_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lsspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_ls_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_ls_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_fmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_coo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_ls_ptap diff --git a/mlprec/impl/aggregator/mld_s_spmm_bld_inner.f90 b/mlprec/impl/aggregator/mld_s_spmm_bld_inner.f90 index 8479f7c8..7b314d8b 100644 --- a/mlprec/impl/aggregator/mld_s_spmm_bld_inner.f90 +++ b/mlprec/impl/aggregator/mld_s_spmm_bld_inner.f90 @@ -36,7 +36,7 @@ ! ! subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_s_inner_mod use mld_s_base_aggregator_mod, mld_protect_name => mld_s_spmm_bld_inner @@ -48,7 +48,7 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_sml_parms), intent(inout) :: parms type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lsspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -60,7 +60,7 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_ls_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_s_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. @@ -102,16 +102,16 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -120,19 +120,20 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_lcoo(coo_restr,info) + call csr_prol%mv_to_lcoo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -141,7 +142,12 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -151,53 +157,30 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_lcoo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() call acsr3%free() - call ac_csr%mv_to_lcoo(ac_coo,info) - call ac_coo%fix(info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixed ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) - if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() - if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr - ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if + call psb_cdasb(desc_ac,info) - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -209,11 +192,26 @@ subroutine mld_s_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_s_spmm_bld_inner subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_s_inner_mod use mld_s_base_aggregator_mod, mld_protect_name => mld_ls_spmm_bld_inner @@ -225,7 +223,7 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_sml_parms), intent(inout) :: parms type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lsspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -237,7 +235,7 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_ls_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_ls_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. @@ -268,8 +266,7 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr ! - ! Here COO_PROL should be with GLOBAL indices on the cols - ! and LOCAL indices on the rows. + ! COO_PROL should arrive here with local numbering ! if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& @@ -280,16 +277,16 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -298,19 +295,20 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_fmt(coo_restr,info) + call csr_prol%mv_to_coo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -319,7 +317,12 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -329,51 +332,32 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_coo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() - call ac_csr%mv_to_coo(ac_coo,info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixing ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call ac_coo%fix(info) - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if - - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & @@ -386,5 +370,21 @@ subroutine mld_ls_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_ls_spmm_bld_inner diff --git a/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 index e1429a5e..8f7d6d6a 100644 --- a/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_saggrmat_nosmth_bld.f90 @@ -96,7 +96,8 @@ ! Error code. ! ! -subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_s_inner_mod, mld_protect_name => mld_saggrmat_nosmth_bld @@ -110,6 +111,7 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(mld_sml_parms), intent(inout) :: parms type(psb_lsspmat_type), intent(inout) :: op_prol type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -120,11 +122,11 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(psb_lsspmat_type) :: la type(psb_ls_coo_sparse_mat) :: ac_coo, tmpcoo, coo_prol, coo_restr type(psb_ls_csr_sparse_mat) :: acsr1, acsr2, acsr - type(psb_desc_type) :: tmp_desc integer(psb_ipk_) :: debug_level, debug_unit integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & & naggr, nzt, naggrm1, naggrp1, i, k integer(psb_ipk_) :: inaggr, nzlp + logical, parameter :: debug = .false. name = 'mld_aggrmat_nosmth_bld' info = psb_success_ @@ -148,13 +150,26 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call a%cp_to(acsr) call op_prol%mv_to(coo_prol) inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_prol:',coo_prol) + + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) + + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + call coo_prol%set_nrows(desc_a%get_local_rows()) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_restr:',coo_restr) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) @@ -164,5 +179,20 @@ subroutine mld_saggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_ls_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + end subroutine check_coo end subroutine mld_saggrmat_nosmth_bld diff --git a/mlprec/impl/aggregator/mld_saggrmat_smth_bld.f90 b/mlprec/impl/aggregator/mld_saggrmat_smth_bld.f90 index 79505416..b44f59d1 100644 --- a/mlprec/impl/aggregator/mld_saggrmat_smth_bld.f90 +++ b/mlprec/impl/aggregator/mld_saggrmat_smth_bld.f90 @@ -102,7 +102,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_s_inner_mod, mld_protect_name => mld_saggrmat_smth_bld @@ -114,9 +115,10 @@ subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest type(psb_sspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_sml_parms), intent(inout) :: parms - type(psb_lsspmat_type), intent(inout) :: op_prol - type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(mld_sml_parms), intent(inout) :: parms + type(psb_lsspmat_type), intent(inout) :: op_prol + type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -125,7 +127,6 @@ subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest integer(psb_ipk_) :: inaggr, nzlp integer(psb_ipk_) :: ictxt, np, me character(len=20) :: name - type(psb_desc_type) :: tmp_desc type(psb_ls_coo_sparse_mat) :: coo_prol, coo_restr, tmpcoo type(psb_ls_csr_sparse_mat) :: acsr1, acsrf, csr_prol, acsr real(psb_spk_), allocatable :: adiag(:) @@ -256,11 +257,13 @@ subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest if (info /= psb_success_) goto 9999 inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) call coo_prol%mv_to_fmt(csr_prol,info) + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) ! ! Build the smoothed prolongator using either A or Af ! acsr1 = (I-w*D*A) Prol acsr1 = (I-w*D*Af) Prol @@ -268,7 +271,7 @@ subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest ! is a bit less readable, butsaves space and one extra matrix copy ! call omega_smooth(omega,acsrf) - call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,tmp_desc,info) + call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,desc_ac,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='spspmm 1') goto 9999 @@ -281,9 +284,9 @@ subroutine mld_saggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest nzl = acsr1%get_nzeros() call acsr1%mv_to_coo(coo_prol,info) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) diff --git a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 index fcc10cea..ab0d05e6 100644 --- a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 +++ b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_asb.f90 @@ -99,7 +99,7 @@ subroutine mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& integer(psb_ipk_), intent(out) :: info ! integer(psb_ipk_) :: ictxt, np, me - type(psb_lz_coo_sparse_mat) :: lacoo, lbcoo + type(psb_lz_coo_sparse_mat) :: tmpcoo type(psb_z_coo_sparse_mat) :: acoo type(psb_lz_csr_sparse_mat) :: acsr1 type(psb_zspmat_type) :: tmp_ac @@ -117,70 +117,15 @@ subroutine mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& ictxt = desc_a%get_context() call psb_info(ictxt,me,np) - - ntaggr = sum(nlaggr) select case(parms%coarse_mat) case(mld_distr_mat_) - call ac%mv_to(lbcoo) - nzl = lbcoo%get_nzeros() - i_nl = nlaggr(me+1) - if (info == psb_success_) call psb_cdall(ictxt,desc_ac,info,nl=i_nl) - if (info == psb_success_) call psb_cdins(nzl,lbcoo%ia,lbcoo%ja,desc_ac,info) - if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ia(1:nzl),desc_ac,info,iact='I') - if (info == psb_success_) call psb_glob_to_loc(lbcoo%ja(1:nzl),desc_ac,info,iact='I') - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Creating desc_ac and converting ac') - goto 9999 - end if - if (debug_level >= psb_debug_outer_) & - & write(debug_unit,*) me,' ',trim(name),& - & 'Assembld aux descr. distr.' - call ac%mv_from(lbcoo) - call ac%set_nrows(desc_ac%get_local_rows()) - call ac%set_ncols(desc_ac%get_local_cols()) - call ac%set_asb() - - if (info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_sp_free') - goto 9999 - end if - - if (np>1) then - call op_prol%mv_to(acsr1) - nzl = acsr1%get_nzeros() - call psb_glob_to_loc(acsr1%ja(1:nzl),desc_ac,info,'I') - if(info /= psb_success_) then - call psb_errpush(psb_err_from_subroutine_,name,a_err='psb_glob_to_loc') - goto 9999 - end if - call op_prol%mv_from(acsr1) - endif - call op_prol%set_ncols(desc_ac%get_local_cols()) - - if (np>1) then - !call op_restr%cscnv(info,type='coo',dupl=psb_dupl_add_) - call op_restr%mv_to(lacoo) - nzl = lacoo%get_nzeros() - if (info == psb_success_) call psb_glob_to_loc(lacoo%ia(1:nzl),desc_ac,info,'I') - call lacoo%set_dupl(psb_dupl_add_) - if (info == psb_success_) call op_restr%mv_from(lacoo) - if (info == psb_success_) call op_restr%cscnv(info,type='csr') - if(info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,& - & a_err='Converting op_restr to local') - goto 9999 - end if - end if - ! - ! Clip to local rows. - ! - call op_restr%set_nrows(desc_ac%get_local_rows()) + call ac%cscnv(info,type='csr') + call op_prol%cscnv(info,type='csr') + call op_restr%cscnv(info,type='csr') if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -189,22 +134,26 @@ subroutine mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& case(mld_repl_mat_) ! ! - ! If we are here, it means we assume that an IPK version of the - ! coarse matrix can hold all indices. User beware! - ! - - ! - ! op_prol/op_restr come from par_spmm_bld with local sizes - ! suitable for DIST option, fix relevant sizes - ! + call op_prol%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ja(1:nzl),desc_ac,info,'I') + call op_prol%mv_from(tmpcoo) + + call op_restr%mv_to(tmpcoo) + nzl = tmpcoo%get_nzeros() + call psb_loc_to_glob(tmpcoo%ia(1:nzl),desc_ac,info,'I') + call op_restr%mv_from(tmpcoo) + call op_prol%set_ncols(ntaggr) call op_restr%set_nrows(ntaggr) + + call ac%mv_to(tmpcoo) + call tmp_ac%mv_from(tmpcoo) + call psb_gather(ac,tmp_ac,desc_ac,info,root=-ione,dupl=psb_dupl_add_,keeploc=.false.) + call psb_cdall(ictxt,desc_ac,info,mg=ntaggr,repl=.true.) if (info == psb_success_) call psb_cdasb(desc_ac,info) - if (info == psb_success_) call ac%mv_to(acoo) - if (info == psb_success_) call tmp_ac%mv_from(acoo) - if (info == psb_success_) & - & call psb_gather(ac,tmp_ac,desc_ac,info,dupl=psb_dupl_add_,keeploc=.false.) + if (info /= psb_success_) goto 9999 case default @@ -221,4 +170,19 @@ subroutine mld_z_dec_aggregator_mat_asb(ag,parms,a,desc_a,ilaggr,nlaggr,& return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_z_dec_aggregator_mat_asb diff --git a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_bld.f90 b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_bld.f90 index 2a1dc1fa..13bca581 100644 --- a/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_bld.f90 +++ b/mlprec/impl/aggregator/mld_z_dec_aggregator_mat_bld.f90 @@ -133,7 +133,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_prol,op_restr,info) +subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_z_prec_type, mld_protect_name => mld_z_dec_aggregator_mat_bld use mld_z_inner_mod @@ -146,6 +147,7 @@ subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lzspmat_type), intent(inout) :: op_prol type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -177,22 +179,22 @@ subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,op_p case (mld_no_smooth_) call mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,& - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_smooth_prol_) call mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) - case(mld_biz_prol_) - - call mld_zaggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) +!!$ case(mld_biz_prol_) +!!$ +!!$ call mld_zaggrmat_biz_bld(a,desc_a,ilaggr,nlaggr, & +!!$ & parms,ac,desc_ac,op_prol,op_restr,info) case(mld_min_energy_) call mld_zaggrmat_minnrg_bld(a,desc_a,ilaggr,nlaggr, & - & parms,ac,op_prol,op_restr,info) + & parms,ac,desc_ac,op_prol,op_restr,info) case default info = psb_err_internal_error_ diff --git a/mlprec/impl/aggregator/mld_z_ptap.f90 b/mlprec/impl/aggregator/mld_z_ptap.f90 new file mode 100644 index 00000000..432366b5 --- /dev/null +++ b/mlprec/impl/aggregator/mld_z_ptap.f90 @@ -0,0 +1,390 @@ +! +! +! MLD2P4 Extensions +! +! (C) Copyright 2019 +! +! Salvatore Filippone Cranfield University +! Pasqua D'Ambra IAC-CNR, Naples, IT +! +! Redistribution and use in source and binary forms, with or without +! modification, are permitted provided that the following conditions +! are met: +! 1. Redistributions of source code must retain the above copyright +! notice, this list of conditions and the following disclaimer. +! 2. Redistributions in binary form must reproduce the above copyright +! notice, this list of conditions, and the following disclaimer in the +! documentation and/or other materials provided with the distribution. +! 3. The name of the MLD2P4 group or the names of its contributors may +! not be used to endorse or promote products derived from this +! software without specific written permission. +! +! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +! TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +! PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE MLD2P4 GROUP OR ITS CONTRIBUTORS +! BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +! POSSIBILITY OF SUCH DAMAGE. +! +! +! File: mld_daggrmat_nosmth_bld.F90 +! +! +subroutine mld_z_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_z_inner_mod + use mld_z_base_aggregator_mod, mld_protect_name => mld_z_ptap + implicit none + + ! Arguments + type(psb_z_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lzspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_lz_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_z_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_ifmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_lcoo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_z_ptap + +subroutine mld_lz_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + use psb_base_mod + use mld_z_inner_mod + use mld_z_base_aggregator_mod, mld_protect_name => mld_lz_ptap + implicit none + + ! Arguments + type(psb_lz_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_ac + type(psb_lzspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + + ! Local variables + integer(psb_ipk_) :: err_act + integer(psb_ipk_) :: ictxt,np,me, icomm, ndx, minfo + character(len=40) :: name + integer(psb_ipk_) :: ierr(5) + type(psb_lz_coo_sparse_mat) :: ac_coo, tmpcoo + type(psb_lz_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr + integer(psb_ipk_) :: debug_level, debug_unit, naggr + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & + & nzt, naggrm1, naggrp1, i, k + integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza + logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. + integer(psb_ipk_), save :: idx_spspmm=-1 + + name='mld_ptap' + if(psb_get_errstatus().ne.0) return + info=psb_success_ + call psb_erractionsave(err_act) + + + ictxt = desc_a%get_context() + icomm = desc_a%get_mpic() + call psb_info(ictxt, me, np) + debug_unit = psb_get_debug_unit() + debug_level = psb_get_debug_level() + nglob = desc_a%get_global_rows() + nrow = desc_a%get_local_rows() + ncol = desc_a%get_local_cols() + + if ((do_timings).and.(idx_spspmm==-1)) & + & idx_spspmm = psb_get_timer_idx("SPMM_BLD: par_spspmm") + + naggr = nlaggr(me+1) + ntaggr = sum(nlaggr) + naggrm1 = sum(nlaggr(1:me)) + naggrp1 = sum(nlaggr(1:me+1)) + !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr + + ! + ! COO_PROL should arrive here with local numbering + ! + if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& + & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& + & nrow,ntaggr,naggr + + call coo_prol%cp_to_fmt(csr_prol,info) + + if (debug) write(0,*) me,trim(name),' Product AxPROL ',& + & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & + & desc_a%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols() + if (debug) flush(0) + + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + + if (debug) write(0,*) me,trim(name),' Done AxPROL ',& + & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& + & desc_ac%get_local_rows(),desc_ac%get_local_cols() + + ! + ! Ok first product done. + ! + ! Remember that RESTR must be built from PROL after halo extension, + ! which is done above in psb_par_spspmm + if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& + & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() + call csr_prol%mv_to_coo(coo_restr,info) +!!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& +!!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + + call coo_restr%transp() + nzl = coo_restr%get_nzeros() + nrl = desc_ac%get_local_rows() + i=0 + ! + ! Only keep local rows + ! + do k=1, nzl + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then + i = i+1 + coo_restr%val(i) = coo_restr%val(k) + coo_restr%ia(i) = coo_restr%ia(k) + coo_restr%ja(i) = coo_restr%ja(k) + end if + end do + call coo_restr%set_nzeros(i) + call coo_restr%fix(info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + +!!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() + + if (info /= psb_success_) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='spcnv coo_restr') + goto 9999 + end if + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'starting sphalo/ rwxtd' + + if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& + & csr_restr%get_nrows(),csr_restr%get_ncols(), & + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& + & acsr3%get_nrows(),acsr3%get_ncols() + if (do_timings) call psb_tic(idx_spspmm) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) + if (do_timings) call psb_toc(idx_spspmm) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() + + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) + + + if (debug_level >= psb_debug_outer_) & + & write(debug_unit,*) me,' ',trim(name),& + & 'Done ptap ' + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(err_act) + + return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo + +end subroutine mld_lz_ptap diff --git a/mlprec/impl/aggregator/mld_z_spmm_bld_inner.f90 b/mlprec/impl/aggregator/mld_z_spmm_bld_inner.f90 index 7613b053..37811f5e 100644 --- a/mlprec/impl/aggregator/mld_z_spmm_bld_inner.f90 +++ b/mlprec/impl/aggregator/mld_z_spmm_bld_inner.f90 @@ -36,7 +36,7 @@ ! ! subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_z_inner_mod use mld_z_base_aggregator_mod, mld_protect_name => mld_z_spmm_bld_inner @@ -48,7 +48,7 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_dml_parms), intent(inout) :: parms type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lzspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -60,7 +60,7 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_lz_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_z_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.false., oldstyle=.false., debug=.false. @@ -102,16 +102,16 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -120,19 +120,20 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_lcoo(coo_restr,info) + call csr_prol%mv_to_lcoo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -141,7 +142,12 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_lcoo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -151,53 +157,30 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_lcoo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() call acsr3%free() - call ac_csr%mv_to_lcoo(ac_coo,info) - call ac_coo%fix(info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixed ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) - if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() - if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr - ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if + call psb_cdasb(desc_ac,info) - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() + if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),& + & ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& @@ -209,11 +192,26 @@ subroutine mld_z_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_z_spmm_bld_inner subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& - & coo_prol,desc_cprol,coo_restr,info) + & coo_prol,desc_ac,coo_restr,info) use psb_base_mod use mld_z_inner_mod use mld_z_base_aggregator_mod, mld_protect_name => mld_lz_spmm_bld_inner @@ -225,7 +223,7 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& integer(psb_lpk_), intent(inout) :: nlaggr(:) type(mld_dml_parms), intent(inout) :: parms type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr - type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_desc_type), intent(inout) :: desc_ac type(psb_lzspmat_type), intent(out) :: ac integer(psb_ipk_), intent(out) :: info @@ -237,7 +235,7 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& type(psb_lz_coo_sparse_mat) :: ac_coo, tmpcoo type(psb_lz_csr_sparse_mat) :: acsr3, csr_prol, ac_csr, csr_restr integer(psb_ipk_) :: debug_level, debug_unit, naggr - integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & + integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nrl, nzl, ip, & & nzt, naggrm1, naggrp1, i, k integer(psb_lpk_) :: nrsave, ncsave, nzsave, nza logical, parameter :: do_timings=.true., oldstyle=.false., debug=.false. @@ -268,8 +266,7 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& !write(0,*)me,' ',name,' input sizes',nlaggr(:),':',naggr ! - ! Here COO_PROL should be with GLOBAL indices on the cols - ! and LOCAL indices on the rows. + ! COO_PROL should arrive here with local numbering ! if (debug) write(0,*) me,' ',trim(name),' Size check on entry New: ',& & coo_prol%get_fmt(),coo_prol%get_nrows(),coo_prol%get_ncols(),coo_prol%get_nzeros(),& @@ -280,16 +277,16 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug) write(0,*) me,trim(name),' Product AxPROL ',& & a_csr%get_nrows(),a_csr%get_ncols(), csr_prol%get_nrows(), & & desc_a%get_local_rows(),desc_a%get_local_cols(),& - & desc_cprol%get_local_rows(),desc_a%get_local_cols() + & desc_ac%get_local_rows(),desc_a%get_local_cols() if (debug) flush(0) if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_cprol,info) + call psb_par_spspmm(a_csr,desc_a,csr_prol,acsr3,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) if (debug) write(0,*) me,trim(name),' Done AxPROL ',& & acsr3%get_nrows(),acsr3%get_ncols(), acsr3%get_nzeros(),& - & desc_cprol%get_local_rows(),desc_cprol%get_local_cols() + & desc_ac%get_local_rows(),desc_ac%get_local_cols() ! ! Ok first product done. @@ -298,19 +295,20 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& ! which is done above in psb_par_spspmm if (debug) write(0,*)me,' ',name,' No inp_restr, transposing prol ',& & csr_prol%get_nrows(),csr_prol%get_ncols(),csr_prol%get_nzeros() - call csr_prol%cp_to_fmt(coo_restr,info) + call csr_prol%mv_to_coo(coo_restr,info) !!$ write(0,*)me,' ',name,' new into transposition ',coo_restr%get_nrows(),& !!$ & coo_restr%get_ncols(),coo_restr%get_nzeros() + if (debug) call check_coo(me,trim(name)//' Check 1 (before transp) on coo_restr:',coo_restr) + call coo_restr%transp() nzl = coo_restr%get_nzeros() - call desc_cprol%l2gip(coo_restr%ia(1:nzl),info) + nrl = desc_ac%get_local_rows() i=0 ! - ! Now we have to fix this. The only rows of the restrictor that are correct - ! are those corresponding to "local" aggregates, i.e. indices in ilaggr(:) + ! Only keep local rows ! do k=1, nzl - if ((naggrm1 < coo_restr%ia(k)) .and.(coo_restr%ia(k) <= naggrp1)) then + if ((1 <= coo_restr%ia(k)) .and.(coo_restr%ia(k) <= nrl)) then i = i+1 coo_restr%val(i) = coo_restr%val(k) coo_restr%ia(i) = coo_restr%ia(k) @@ -319,7 +317,12 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& end do call coo_restr%set_nzeros(i) call coo_restr%fix(info) - call coo_restr%cp_to_coo(tmpcoo,info) + nzl = coo_restr%get_nzeros() + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 2 on coo_restr:',coo_restr) + call csr_restr%cp_from_coo(coo_restr,info) + !!$ write(0,*)me,' ',name,' after transposition ',coo_restr%get_nrows(),coo_restr%get_ncols(),coo_restr%get_nzeros() if (info /= psb_success_) then @@ -329,51 +332,32 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& if (debug_level >= psb_debug_outer_) & & write(debug_unit,*) me,' ',trim(name),& & 'starting sphalo/ rwxtd' - nzl = tmpcoo%get_nzeros() - call psb_glob_to_loc(tmpcoo%ia(1:nzl),desc_cprol,info,iact='I',owned=.true.) - call tmpcoo%clean_negidx(info) - nzl = tmpcoo%get_nzeros() - call tmpcoo%set_nrows(desc_cprol%get_local_rows()) - call tmpcoo%set_ncols(desc_a%get_local_cols()) -!!$ write(0,*)me,' ',name,' after G2L on rows ',tmpcoo%get_nrows(),tmpcoo%get_ncols(),tmpcoo%get_nzeros() - call csr_restr%mv_from_coo(tmpcoo,info) if (debug) write(0,*) me,trim(name),' Product RESTRxAP ',& & csr_restr%get_nrows(),csr_restr%get_ncols(), & - & desc_cprol%get_local_rows(),desc_a%get_local_cols(),& + & desc_ac%get_local_rows(),desc_a%get_local_cols(),& & acsr3%get_nrows(),acsr3%get_ncols() if (do_timings) call psb_tic(idx_spspmm) - call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_cprol,info) + call psb_par_spspmm(csr_restr,desc_a,acsr3,ac_csr,desc_ac,info) if (do_timings) call psb_toc(idx_spspmm) - call csr_restr%free() - call ac_csr%mv_to_coo(ac_coo,info) - nza = ac_coo%get_nzeros() - if (debug) write(0,*) me,trim(name),' Fixing ac ',& - & ac_coo%get_nrows(),ac_coo%get_ncols(), nza - call ac_coo%fix(info) - call desc_cprol%indxmap%l2gip(ac_coo%ia(1:nza),info) - call desc_cprol%indxmap%l2gip(ac_coo%ja(1:nza),info) - call ac_coo%set_nrows(ntaggr) - call ac_coo%set_ncols(ntaggr) - if (debug) write(0,*) me,' ',trim(name),' Before mv_from',psb_get_errstatus() - if (info == 0) call ac%mv_from(ac_coo) + call acsr3%free() + + call psb_cdasb(desc_ac,info) + + call ac_csr%set_nrows(desc_ac%get_local_rows()) + call ac_csr%set_ncols(desc_ac%get_local_cols()) + call ac%mv_from(ac_csr) + call ac%set_asb() + if (debug) write(0,*) me,' ',trim(name),' After mv_from',psb_get_errstatus() if (debug) write(0,*) me,' ',trim(name),' ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros(),naggr,ntaggr ! write(0,*) me,' ',trim(name),' Final AC newstyle ',ac%get_fmt(),ac%get_nrows(),ac%get_ncols(),ac%get_nzeros() - nza = coo_prol%get_nzeros() - call desc_cprol%indxmap%l2gip(coo_prol%ja(1:nza),info) - - if (debug) then - write(0,*) me,' ',trim(name),' Checkpoint at exit' - call psb_barrier(ictxt) - write(0,*) me,' ',trim(name),' Checkpoint through' - end if - - if (info /= psb_success_) then - call psb_errpush(psb_err_internal_error_,name,a_err='Build ac = coo_restr x am3') - goto 9999 - end if + call coo_prol%set_ncols(desc_ac%get_local_cols()) + !call coo_restr%mv_from_ifmt(csr_restr,info) +!!$ call coo_restr%set_nrows(desc_ac%get_local_rows()) +!!$ call coo_restr%set_ncols(desc_a%get_local_cols()) + if (debug) call check_coo(me,trim(name)//' Check 3 on coo_restr:',coo_restr) if (debug_level >= psb_debug_outer_) & @@ -386,5 +370,21 @@ subroutine mld_lz_spmm_bld_inner(a_csr,desc_a,nlaggr,parms,ac,& 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + + end subroutine check_coo end subroutine mld_lz_spmm_bld_inner diff --git a/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 b/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 index a117331d..c939ac0d 100644 --- a/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 +++ b/mlprec/impl/aggregator/mld_zaggrmat_nosmth_bld.f90 @@ -96,7 +96,8 @@ ! Error code. ! ! -subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_z_inner_mod, mld_protect_name => mld_zaggrmat_nosmth_bld @@ -110,6 +111,7 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(mld_dml_parms), intent(inout) :: parms type(psb_lzspmat_type), intent(inout) :: op_prol type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -120,11 +122,11 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re type(psb_lzspmat_type) :: la type(psb_lz_coo_sparse_mat) :: ac_coo, tmpcoo, coo_prol, coo_restr type(psb_lz_csr_sparse_mat) :: acsr1, acsr2, acsr - type(psb_desc_type) :: tmp_desc integer(psb_ipk_) :: debug_level, debug_unit integer(psb_lpk_) :: nrow, nglob, ncol, ntaggr, nzl, ip, & & naggr, nzt, naggrm1, naggrp1, i, k integer(psb_ipk_) :: inaggr, nzlp + logical, parameter :: debug = .false. name = 'mld_aggrmat_nosmth_bld' info = psb_success_ @@ -148,13 +150,26 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re call a%cp_to(acsr) call op_prol%mv_to(coo_prol) inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_prol:',coo_prol) + + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) + + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + + call coo_restr%set_nrows(desc_ac%get_local_rows()) + call coo_restr%set_ncols(desc_a%get_local_cols()) + call coo_prol%set_nrows(desc_a%get_local_rows()) + call coo_prol%set_ncols(desc_ac%get_local_cols()) + + if (debug) call check_coo(me,trim(name)//' Check 1 on coo_restr:',coo_restr) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) @@ -164,5 +179,20 @@ subroutine mld_zaggrmat_nosmth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_re 9999 call psb_error_handler(err_act) return + +contains + subroutine check_coo(me,string,coo) + implicit none + integer(psb_ipk_) :: me + type(psb_lz_coo_sparse_mat) :: coo + character(len=*) :: string + integer(psb_lpk_) :: nr,nc,nz + nr = coo%get_nrows() + nc = coo%get_ncols() + nz = coo%get_nzeros() + write(0,*) me,string,nr,nc,& + & minval(coo%ia(1:nz)),maxval(coo%ia(1:nz)),& + & minval(coo%ja(1:nz)),maxval(coo%ja(1:nz)) + end subroutine check_coo end subroutine mld_zaggrmat_nosmth_bld diff --git a/mlprec/impl/aggregator/mld_zaggrmat_smth_bld.f90 b/mlprec/impl/aggregator/mld_zaggrmat_smth_bld.f90 index f1196725..551a8a6a 100644 --- a/mlprec/impl/aggregator/mld_zaggrmat_smth_bld.f90 +++ b/mlprec/impl/aggregator/mld_zaggrmat_smth_bld.f90 @@ -102,7 +102,8 @@ ! info - integer, output. ! Error code. ! -subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) +subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod use mld_base_prec_type use mld_z_inner_mod, mld_protect_name => mld_zaggrmat_smth_bld @@ -114,9 +115,10 @@ subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest type(psb_zspmat_type), intent(in) :: a type(psb_desc_type), intent(in) :: desc_a integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_dml_parms), intent(inout) :: parms - type(psb_lzspmat_type), intent(inout) :: op_prol - type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(mld_dml_parms), intent(inout) :: parms + type(psb_lzspmat_type), intent(inout) :: op_prol + type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info ! Local variables @@ -125,7 +127,6 @@ subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest integer(psb_ipk_) :: inaggr, nzlp integer(psb_ipk_) :: ictxt, np, me character(len=20) :: name - type(psb_desc_type) :: tmp_desc type(psb_lz_coo_sparse_mat) :: coo_prol, coo_restr, tmpcoo type(psb_lz_csr_sparse_mat) :: acsr1, acsrf, csr_prol, acsr complex(psb_dpk_), allocatable :: adiag(:) @@ -256,11 +257,13 @@ subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest if (info /= psb_success_) goto 9999 inaggr = naggr - call psb_cdall(ictxt,tmp_desc,info,nl=inaggr) + call psb_cdall(ictxt,desc_ac,info,nl=inaggr) nzlp = coo_prol%get_nzeros() - call tmp_desc%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) - call coo_prol%set_ncols(tmp_desc%get_local_cols()) + call desc_ac%indxmap%g2lip_ins(coo_prol%ja(1:nzlp),info) + call coo_prol%set_ncols(desc_ac%get_local_cols()) call coo_prol%mv_to_fmt(csr_prol,info) + call psb_cdasb(desc_ac,info) + call psb_cd_reinit(desc_ac,info) ! ! Build the smoothed prolongator using either A or Af ! acsr1 = (I-w*D*A) Prol acsr1 = (I-w*D*Af) Prol @@ -268,7 +271,7 @@ subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest ! is a bit less readable, butsaves space and one extra matrix copy ! call omega_smooth(omega,acsrf) - call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,tmp_desc,info) + call psb_par_spspmm(acsrf,desc_a,csr_prol,acsr1,desc_ac,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='spspmm 1') goto 9999 @@ -281,9 +284,9 @@ subroutine mld_zaggrmat_smth_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_rest nzl = acsr1%get_nzeros() call acsr1%mv_to_coo(coo_prol,info) - call mld_spmm_bld_inner(acsr,desc_a,nlaggr,parms,ac,& - & coo_prol,tmp_desc,coo_restr,info) - + call mld_ptap(acsr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_ac,coo_restr,info) + call op_prol%mv_from(coo_prol) call op_restr%mv_from(coo_restr) diff --git a/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90 index f0c2ae53..2e091bbb 100644 --- a/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90 +++ b/mlprec/impl/level/mld_c_base_onelev_mat_asb.f90 @@ -141,7 +141,8 @@ subroutine mld_c_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info) ! the mapping defined by mld_aggrmap_bld and applying the aggregation ! algorithm specified by lv%iprcparm(mld_aggr_prol_) ! - call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,lac,op_prol,op_restr,info) + call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,& + & lac,lv%desc_ac,op_prol,op_restr,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='mld_aggrmat_asb') diff --git a/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90 index ebcf3b25..4913d795 100644 --- a/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90 +++ b/mlprec/impl/level/mld_s_base_onelev_mat_asb.f90 @@ -141,7 +141,8 @@ subroutine mld_s_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info) ! the mapping defined by mld_aggrmap_bld and applying the aggregation ! algorithm specified by lv%iprcparm(mld_aggr_prol_) ! - call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,lac,op_prol,op_restr,info) + call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,& + & lac,lv%desc_ac,op_prol,op_restr,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='mld_aggrmat_asb') diff --git a/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90 b/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90 index 15f70b01..50aaaa2c 100644 --- a/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90 +++ b/mlprec/impl/level/mld_z_base_onelev_mat_asb.f90 @@ -141,7 +141,8 @@ subroutine mld_z_base_onelev_mat_asb(lv,a,desc_a,ilaggr,nlaggr,op_prol,info) ! the mapping defined by mld_aggrmap_bld and applying the aggregation ! algorithm specified by lv%iprcparm(mld_aggr_prol_) ! - call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,lac,op_prol,op_restr,info) + call lv%aggr%mat_bld(lv%parms,a,desc_a,ilaggr,nlaggr,& + & lac,lv%desc_ac,op_prol,op_restr,info) if(info /= psb_success_) then call psb_errpush(psb_err_from_subroutine_,name,a_err='mld_aggrmat_asb') diff --git a/mlprec/mld_c_base_aggregator_mod.f90 b/mlprec/mld_c_base_aggregator_mod.f90 index 063d5684..9bee9368 100644 --- a/mlprec/mld_c_base_aggregator_mod.f90 +++ b/mlprec/mld_c_base_aggregator_mod.f90 @@ -149,6 +149,37 @@ module mld_c_base_aggregator_mod integer(psb_ipk_), intent(out) :: info end subroutine mld_lc_spmm_bld_inner end interface mld_spmm_bld_inner + + interface mld_ptap + subroutine mld_c_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_c_csr_sparse_mat, psb_lcspmat_type, psb_desc_type, & + & psb_lc_coo_sparse_mat, mld_sml_parms, psb_spk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_c_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lcspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_c_ptap + subroutine mld_lc_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_lc_csr_sparse_mat, psb_lcspmat_type, psb_desc_type, & + & psb_lc_coo_sparse_mat, mld_sml_parms, psb_spk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_lc_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lc_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lcspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_lc_ptap + end interface mld_ptap contains @@ -369,8 +400,8 @@ contains !! in many cases it is the transpose of the prolongator. !! \param info Return code !! - subroutine mld_c_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_c_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod implicit none class(mld_c_base_aggregator_type), target, intent(inout) :: ag @@ -380,6 +411,7 @@ contains integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lcspmat_type), intent(inout) :: op_prol type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: err_act character(len=20) :: name='c_base_aggregator_mat_bld' diff --git a/mlprec/mld_c_dec_aggregator_mod.f90 b/mlprec/mld_c_dec_aggregator_mod.f90 index 0a4ee348..86e7d4ca 100644 --- a/mlprec/mld_c_dec_aggregator_mod.f90 +++ b/mlprec/mld_c_dec_aggregator_mod.f90 @@ -109,8 +109,8 @@ module mld_c_dec_aggregator_mod end interface interface - subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_c_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) import :: mld_c_dec_aggregator_type, psb_desc_type, psb_cspmat_type, psb_spk_, & & psb_ipk_, psb_lpk_, psb_lcspmat_type, mld_sml_parms implicit none @@ -121,7 +121,8 @@ module mld_c_dec_aggregator_mod integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lcspmat_type), intent(inout) :: op_prol type(psb_lcspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_c_dec_aggregator_mat_bld end interface diff --git a/mlprec/mld_c_inner_mod.f90 b/mlprec/mld_c_inner_mod.f90 index fef80143..95c6f396 100644 --- a/mlprec/mld_c_inner_mod.f90 +++ b/mlprec/mld_c_inner_mod.f90 @@ -109,22 +109,23 @@ module mld_c_inner_mod end interface mld_map_to_tprol abstract interface - subroutine mld_caggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) + subroutine mld_caggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) import :: psb_cspmat_type, psb_desc_type, psb_spk_, psb_ipk_, psb_lpk_, psb_lcspmat_type import :: mld_c_onelev_type, mld_sml_parms implicit none - type(psb_cspmat_type), intent(in) :: a - type(psb_desc_type), intent(in) :: desc_a - integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_sml_parms), intent(inout) :: parms - type(psb_lcspmat_type), intent(inout) :: op_prol - type(psb_lcspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_cspmat_type), intent(in) :: a + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lcspmat_type), intent(inout) :: op_prol + type(psb_lcspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_caggrmat_var_bld end interface procedure(mld_caggrmat_var_bld) :: mld_caggrmat_nosmth_bld, & - & mld_caggrmat_smth_bld, mld_caggrmat_minnrg_bld, & - & mld_caggrmat_biz_bld + & mld_caggrmat_smth_bld, mld_caggrmat_minnrg_bld end module mld_c_inner_mod diff --git a/mlprec/mld_d_base_aggregator_mod.f90 b/mlprec/mld_d_base_aggregator_mod.f90 index bf43f074..21231e3a 100644 --- a/mlprec/mld_d_base_aggregator_mod.f90 +++ b/mlprec/mld_d_base_aggregator_mod.f90 @@ -411,7 +411,7 @@ contains integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_ldspmat_type), intent(inout) :: op_prol type(psb_ldspmat_type), intent(out) :: ac,op_restr - type(psb_desc_type), intent(inout) :: desc_ac + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: err_act character(len=20) :: name='d_base_aggregator_mat_bld' diff --git a/mlprec/mld_d_dec_aggregator_mod.f90 b/mlprec/mld_d_dec_aggregator_mod.f90 index bd2ddde2..4af5afef 100644 --- a/mlprec/mld_d_dec_aggregator_mod.f90 +++ b/mlprec/mld_d_dec_aggregator_mod.f90 @@ -122,7 +122,7 @@ module mld_d_dec_aggregator_mod type(psb_ldspmat_type), intent(inout) :: op_prol type(psb_ldspmat_type), intent(out) :: ac,op_restr type(psb_desc_type), intent(inout) :: desc_ac - integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(out) :: info end subroutine mld_d_dec_aggregator_mat_bld end interface diff --git a/mlprec/mld_d_inner_mod.f90 b/mlprec/mld_d_inner_mod.f90 index c36153d8..c839ec00 100644 --- a/mlprec/mld_d_inner_mod.f90 +++ b/mlprec/mld_d_inner_mod.f90 @@ -114,19 +114,18 @@ module mld_d_inner_mod import :: psb_dspmat_type, psb_desc_type, psb_dpk_, psb_ipk_, psb_lpk_, psb_ldspmat_type import :: mld_d_onelev_type, mld_dml_parms implicit none - type(psb_dspmat_type), intent(in) :: a - type(psb_desc_type), intent(in) :: desc_a - integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_dml_parms), intent(inout) :: parms - type(psb_ldspmat_type), intent(inout) :: op_prol - type(psb_ldspmat_type), intent(out) :: ac,op_restr - type(psb_desc_type), intent(inout) :: desc_ac - integer(psb_ipk_), intent(out) :: info + type(psb_dspmat_type), intent(in) :: a + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_ldspmat_type), intent(inout) :: op_prol + type(psb_ldspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_daggrmat_var_bld end interface procedure(mld_daggrmat_var_bld) :: mld_daggrmat_nosmth_bld, & - & mld_daggrmat_smth_bld, mld_daggrmat_minnrg_bld, & - & mld_daggrmat_biz_bld + & mld_daggrmat_smth_bld, mld_daggrmat_minnrg_bld end module mld_d_inner_mod diff --git a/mlprec/mld_s_base_aggregator_mod.f90 b/mlprec/mld_s_base_aggregator_mod.f90 index 748e7d24..e277bd10 100644 --- a/mlprec/mld_s_base_aggregator_mod.f90 +++ b/mlprec/mld_s_base_aggregator_mod.f90 @@ -149,6 +149,37 @@ module mld_s_base_aggregator_mod integer(psb_ipk_), intent(out) :: info end subroutine mld_ls_spmm_bld_inner end interface mld_spmm_bld_inner + + interface mld_ptap + subroutine mld_s_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_s_csr_sparse_mat, psb_lsspmat_type, psb_desc_type, & + & psb_ls_coo_sparse_mat, mld_sml_parms, psb_spk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_s_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lsspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_s_ptap + subroutine mld_ls_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_ls_csr_sparse_mat, psb_lsspmat_type, psb_desc_type, & + & psb_ls_coo_sparse_mat, mld_sml_parms, psb_spk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_ls_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_ls_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lsspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_ls_ptap + end interface mld_ptap contains @@ -369,8 +400,8 @@ contains !! in many cases it is the transpose of the prolongator. !! \param info Return code !! - subroutine mld_s_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_s_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod implicit none class(mld_s_base_aggregator_type), target, intent(inout) :: ag @@ -380,6 +411,7 @@ contains integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lsspmat_type), intent(inout) :: op_prol type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: err_act character(len=20) :: name='s_base_aggregator_mat_bld' diff --git a/mlprec/mld_s_dec_aggregator_mod.f90 b/mlprec/mld_s_dec_aggregator_mod.f90 index 733e080c..9620eacd 100644 --- a/mlprec/mld_s_dec_aggregator_mod.f90 +++ b/mlprec/mld_s_dec_aggregator_mod.f90 @@ -109,8 +109,8 @@ module mld_s_dec_aggregator_mod end interface interface - subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_s_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) import :: mld_s_dec_aggregator_type, psb_desc_type, psb_sspmat_type, psb_spk_, & & psb_ipk_, psb_lpk_, psb_lsspmat_type, mld_sml_parms implicit none @@ -121,7 +121,8 @@ module mld_s_dec_aggregator_mod integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lsspmat_type), intent(inout) :: op_prol type(psb_lsspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_s_dec_aggregator_mat_bld end interface diff --git a/mlprec/mld_s_inner_mod.f90 b/mlprec/mld_s_inner_mod.f90 index 92dbf154..03d7d78b 100644 --- a/mlprec/mld_s_inner_mod.f90 +++ b/mlprec/mld_s_inner_mod.f90 @@ -109,22 +109,23 @@ module mld_s_inner_mod end interface mld_map_to_tprol abstract interface - subroutine mld_saggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) + subroutine mld_saggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) import :: psb_sspmat_type, psb_desc_type, psb_spk_, psb_ipk_, psb_lpk_, psb_lsspmat_type import :: mld_s_onelev_type, mld_sml_parms implicit none - type(psb_sspmat_type), intent(in) :: a - type(psb_desc_type), intent(in) :: desc_a - integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_sml_parms), intent(inout) :: parms - type(psb_lsspmat_type), intent(inout) :: op_prol - type(psb_lsspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_sspmat_type), intent(in) :: a + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) + type(mld_sml_parms), intent(inout) :: parms + type(psb_lsspmat_type), intent(inout) :: op_prol + type(psb_lsspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_saggrmat_var_bld end interface procedure(mld_saggrmat_var_bld) :: mld_saggrmat_nosmth_bld, & - & mld_saggrmat_smth_bld, mld_saggrmat_minnrg_bld, & - & mld_saggrmat_biz_bld + & mld_saggrmat_smth_bld, mld_saggrmat_minnrg_bld end module mld_s_inner_mod diff --git a/mlprec/mld_z_base_aggregator_mod.f90 b/mlprec/mld_z_base_aggregator_mod.f90 index 471d21b9..ef5c39e1 100644 --- a/mlprec/mld_z_base_aggregator_mod.f90 +++ b/mlprec/mld_z_base_aggregator_mod.f90 @@ -149,6 +149,37 @@ module mld_z_base_aggregator_mod integer(psb_ipk_), intent(out) :: info end subroutine mld_lz_spmm_bld_inner end interface mld_spmm_bld_inner + + interface mld_ptap + subroutine mld_z_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_z_csr_sparse_mat, psb_lzspmat_type, psb_desc_type, & + & psb_lz_coo_sparse_mat, mld_dml_parms, psb_dpk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_z_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lzspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_z_ptap + subroutine mld_lz_ptap(a_csr,desc_a,nlaggr,parms,ac,& + & coo_prol,desc_cprol,coo_restr,info) + import :: psb_lz_csr_sparse_mat, psb_lzspmat_type, psb_desc_type, & + & psb_lz_coo_sparse_mat, mld_dml_parms, psb_dpk_, psb_ipk_, psb_lpk_ + implicit none + type(psb_lz_csr_sparse_mat), intent(inout) :: a_csr + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_lz_coo_sparse_mat), intent(inout) :: coo_prol, coo_restr + type(psb_desc_type), intent(inout) :: desc_cprol + type(psb_lzspmat_type), intent(out) :: ac + integer(psb_ipk_), intent(out) :: info + end subroutine mld_lz_ptap + end interface mld_ptap contains @@ -369,8 +400,8 @@ contains !! in many cases it is the transpose of the prolongator. !! \param info Return code !! - subroutine mld_z_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_z_base_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) use psb_base_mod implicit none class(mld_z_base_aggregator_type), target, intent(inout) :: ag @@ -380,6 +411,7 @@ contains integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lzspmat_type), intent(inout) :: op_prol type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac integer(psb_ipk_), intent(out) :: info integer(psb_ipk_) :: err_act character(len=20) :: name='z_base_aggregator_mat_bld' diff --git a/mlprec/mld_z_dec_aggregator_mod.f90 b/mlprec/mld_z_dec_aggregator_mod.f90 index 94abd8aa..e039d03f 100644 --- a/mlprec/mld_z_dec_aggregator_mod.f90 +++ b/mlprec/mld_z_dec_aggregator_mod.f90 @@ -109,8 +109,8 @@ module mld_z_dec_aggregator_mod end interface interface - subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,ac,& - & op_prol,op_restr,info) + subroutine mld_z_dec_aggregator_mat_bld(ag,parms,a,desc_a,ilaggr,nlaggr,& + & ac,desc_ac,op_prol,op_restr,info) import :: mld_z_dec_aggregator_type, psb_desc_type, psb_zspmat_type, psb_dpk_, & & psb_ipk_, psb_lpk_, psb_lzspmat_type, mld_dml_parms implicit none @@ -121,7 +121,8 @@ module mld_z_dec_aggregator_mod integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) type(psb_lzspmat_type), intent(inout) :: op_prol type(psb_lzspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_z_dec_aggregator_mat_bld end interface diff --git a/mlprec/mld_z_inner_mod.f90 b/mlprec/mld_z_inner_mod.f90 index 50ce73e5..c1e8632b 100644 --- a/mlprec/mld_z_inner_mod.f90 +++ b/mlprec/mld_z_inner_mod.f90 @@ -109,22 +109,23 @@ module mld_z_inner_mod end interface mld_map_to_tprol abstract interface - subroutine mld_zaggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,ac,op_prol,op_restr,info) + subroutine mld_zaggrmat_var_bld(a,desc_a,ilaggr,nlaggr,parms,& + & ac,desc_ac,op_prol,op_restr,info) import :: psb_zspmat_type, psb_desc_type, psb_dpk_, psb_ipk_, psb_lpk_, psb_lzspmat_type import :: mld_z_onelev_type, mld_dml_parms implicit none - type(psb_zspmat_type), intent(in) :: a - type(psb_desc_type), intent(in) :: desc_a - integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) - type(mld_dml_parms), intent(inout) :: parms - type(psb_lzspmat_type), intent(inout) :: op_prol - type(psb_lzspmat_type), intent(out) :: ac,op_restr - integer(psb_ipk_), intent(out) :: info + type(psb_zspmat_type), intent(in) :: a + type(psb_desc_type), intent(in) :: desc_a + integer(psb_lpk_), intent(inout) :: ilaggr(:), nlaggr(:) + type(mld_dml_parms), intent(inout) :: parms + type(psb_lzspmat_type), intent(inout) :: op_prol + type(psb_lzspmat_type), intent(out) :: ac,op_restr + type(psb_desc_type), intent(inout) :: desc_ac + integer(psb_ipk_), intent(out) :: info end subroutine mld_zaggrmat_var_bld end interface procedure(mld_zaggrmat_var_bld) :: mld_zaggrmat_nosmth_bld, & - & mld_zaggrmat_smth_bld, mld_zaggrmat_minnrg_bld, & - & mld_zaggrmat_biz_bld + & mld_zaggrmat_smth_bld, mld_zaggrmat_minnrg_bld end module mld_z_inner_mod