From 1da39b8bbf93262584887a46c3e74f327bf08fc7 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 3 Nov 2019 14:24:04 +0000 Subject: [PATCH] Factored symmetrization of del_list into its own routine. --- base/internals/Makefile | 2 +- base/internals/psi_adjcncy_fnd_owner.F90 | 15 +-- base/internals/psi_symm_dep_list.F90 | 162 +++++++++++++++++++++++ base/modules/desc/psb_indx_map_mod.f90 | 14 ++ 4 files changed, 179 insertions(+), 14 deletions(-) create mode 100644 base/internals/psi_symm_dep_list.F90 diff --git a/base/internals/Makefile b/base/internals/Makefile index ea3f438b..1ebdbcc0 100644 --- a/base/internals/Makefile +++ b/base/internals/Makefile @@ -7,7 +7,7 @@ FOBJS = psi_compute_size.o psi_crea_bnd_elem.o psi_crea_index.o \ psi_desc_impl.o psi_hash_impl.o psi_list_search.o psi_srtlist.o MPFOBJS = psi_desc_index.o psi_extrct_dl.o psi_fnd_owner.o psi_a2a_fnd_owner.o \ - psi_graph_fnd_owner.o psi_adjcncy_fnd_owner.o + psi_graph_fnd_owner.o psi_adjcncy_fnd_owner.o psi_symm_dep_list.o LIBDIR=.. INCDIR=.. diff --git a/base/internals/psi_adjcncy_fnd_owner.F90 b/base/internals/psi_adjcncy_fnd_owner.F90 index a599cc05..56f208d8 100644 --- a/base/internals/psi_adjcncy_fnd_owner.F90 +++ b/base/internals/psi_adjcncy_fnd_owner.F90 @@ -125,10 +125,8 @@ subroutine psi_adjcncy_fnd_owner(idx,iprc,adj,idxmap,info) call mpi_alltoall(sdsz,1,psb_mpi_mpk_,& & rvsz,1,psb_mpi_mpk_,icomm,minfo) - nrecv = 0 hidx(0) = 0 do i=0, np-1 - if (rvsz(i)>0) nrecv = nrecv + 1 hidx(i+1) = hidx(i) + rvsz(i) end do hsize = hidx(np) @@ -184,17 +182,8 @@ subroutine psi_adjcncy_fnd_owner(idx,iprc,adj,idxmap,info) ! ! Now fix adj to be symmetric ! - call psb_realloc(nadj+nrecv,ladj,info) - ladj(1:nadj) = adj(1:nadj) - do i=0, np-1 - if (rvsz(i)>0) then - nadj = nadj + 1 - ladj(nadj+1:nadj+nrecv) = i - end if - end do - call psb_msort_unique(ladj,nadj) - call psb_realloc(nadj,adj,info) - adj(1:nadj) = ladj(1:nadj) + call psi_symm_dep_list(rvsz,adj,idxmap,info,flag=psi_symm_flag_inrv_) + if (info /= 0) goto 9999 call psb_erractionrestore(err_act) return diff --git a/base/internals/psi_symm_dep_list.F90 b/base/internals/psi_symm_dep_list.F90 new file mode 100644 index 00000000..ade82958 --- /dev/null +++ b/base/internals/psi_symm_dep_list.F90 @@ -0,0 +1,162 @@ +! +! Parallel Sparse BLAS version 3.5 +! (C) Copyright 2006-2018 +! Salvatore Filippone +! Alfredo Buttari +! +! 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 PSBLAS 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 PSBLAS 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: psi_fnd_owner.f90 +! +! Subroutine: psi_fnd_owner +! Figure out who owns global indices. +! +! Arguments: +! +subroutine psi_symm_dep_list(rvsz,adj,idxmap,info,flag) + use psb_serial_mod + use psb_const_mod + use psb_error_mod + use psb_penv_mod + use psb_realloc_mod + use psb_indx_map_mod, psb_protect_name => psi_symm_dep_list +#ifdef MPI_MOD + use mpi +#endif + + implicit none +#ifdef MPI_H + include 'mpif.h' +#endif + integer(psb_mpk_), intent(inout) :: rvsz(0:) + integer(psb_ipk_), allocatable, intent(inout) :: adj(:) + class(psb_indx_map), intent(in) :: idxmap + integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(in), optional :: flag + + ! + integer(psb_ipk_), allocatable :: ladj(:) + integer(psb_mpk_), allocatable :: sdsz(:) + integer(psb_mpk_) :: icomm, minfo, iictxt + integer(psb_ipk_) :: i,n_row,n_col,err_act,hsize,ip,& + & last_ih, last_j, nidx, nrecv, nadj, flag_ + integer(psb_lpk_) :: mglob, ih + integer(psb_ipk_) :: ictxt,np,me + character(len=20) :: name + + info = psb_success_ + name = 'psi_symm_dep_list' + call psb_erractionsave(err_act) + + ictxt = idxmap%get_ctxt() + icomm = idxmap%get_mpic() + mglob = idxmap%get_gr() + n_row = idxmap%get_lr() + n_col = idxmap%get_lc() + iictxt = ictxt + + call psb_info(ictxt, me, np) + + if (np == -1) then + info = psb_err_context_error_ + call psb_errpush(info,name) + goto 9999 + endif + + if (.not.(idxmap%is_valid())) then + call psb_errpush(psb_err_from_subroutine_,name,a_err='invalid idxmap') + goto 9999 + end if + + + nadj = size(adj) + if (size(rvsz) 0) nrecv = nrecv + 1 + end do + + ! + ! Now fix adj to be symmetric + ! + call psb_realloc(nadj+nrecv,ladj,info) + ladj(1:nadj) = adj(1:nadj) + do ip=0, np-1 + if (rvsz(ip)>0) then + nadj = nadj + 1 + ladj(nadj+1:nadj+nrecv) = ip + end if + end do + call psb_msort_unique(ladj,nadj) + call psb_realloc(nadj,adj,info) + adj(1:nadj) = ladj(1:nadj) + + call psb_erractionrestore(err_act) + return + +9999 call psb_error_handler(ictxt,err_act) + + return + +end subroutine psi_symm_dep_list diff --git a/base/modules/desc/psb_indx_map_mod.f90 b/base/modules/desc/psb_indx_map_mod.f90 index dfb660fc..35cca97a 100644 --- a/base/modules/desc/psb_indx_map_mod.f90 +++ b/base/modules/desc/psb_indx_map_mod.f90 @@ -311,6 +311,20 @@ module psb_indx_map_mod end subroutine psi_graph_fnd_owner end interface + integer, parameter :: psi_symm_flag_norv_ = 0 + integer, parameter :: psi_symm_flag_inrv_ = 1 + interface + subroutine psi_symm_dep_list(rvsz,adj,idxmap,info,flag) + import :: psb_indx_map, psb_ipk_, psb_lpk_, psb_mpk_ + implicit none + integer(psb_mpk_), intent(inout) :: rvsz(:) + integer(psb_ipk_), allocatable, intent(inout) :: adj(:) + class(psb_indx_map), intent(in) :: idxmap + integer(psb_ipk_), intent(out) :: info + integer(psb_ipk_), intent(in), optional :: flag + end subroutine psi_symm_dep_list + end interface + contains