From b41af4a30a2ae4f3b362b73dc59802d5405f51e8 Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Sun, 5 Feb 2012 16:28:30 +0000 Subject: [PATCH] psblas3-integer8: Fixed bldext. --- base/comm/psb_dhalo.f90 | 8 ++++---- base/tools/psb_ccdbldext.F90 | 4 ++-- base/tools/psb_csphalo.F90 | 9 +++++---- base/tools/psb_dcdbldext.F90 | 4 ++-- base/tools/psb_dsphalo.F90 | 9 +++++---- base/tools/psb_scdbldext.F90 | 4 ++-- base/tools/psb_ssphalo.F90 | 9 +++++---- base/tools/psb_zcdbldext.F90 | 4 ++-- base/tools/psb_zsphalo.F90 | 9 +++++---- test/kernel/pdgenspmv.f90 | 1 - 10 files changed, 32 insertions(+), 29 deletions(-) diff --git a/base/comm/psb_dhalo.f90 b/base/comm/psb_dhalo.f90 index e875aa57..2a17ec94 100644 --- a/base/comm/psb_dhalo.f90 +++ b/base/comm/psb_dhalo.f90 @@ -499,12 +499,12 @@ subroutine psb_dhalo_vect(x,desc_a,info,alpha,work,tran,mode,data) call psb_errpush(info,name) end if - err=info + err = info call psb_errcomm(ictxt,err) - if(err /= 0) goto 9999 + if (err /= 0) goto 9999 - if(present(alpha)) then - if(alpha /= done) then + if (present(alpha)) then + if (alpha /= done) then call x%scal(alpha) end if end if diff --git a/base/tools/psb_ccdbldext.F90 b/base/tools/psb_ccdbldext.F90 index e04802da..94b18c80 100644 --- a/base/tools/psb_ccdbldext.F90 +++ b/base/tools/psb_ccdbldext.F90 @@ -94,7 +94,7 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) integer(psb_ipk_),allocatable :: halo(:),works(:),workr(:),t_halo_in(:),& & t_halo_out(:),temp(:),maskr(:) - integer(psb_ipk_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) + integer(psb_mpik_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -467,7 +467,7 @@ Subroutine psb_ccdbldext(a,desc_a,novr,desc_ov,info, extype) ! accumulated RECV requests, we have an all-to-all to build ! matchings SENDs. ! - call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,minfo) + call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,minfo) if (minfo /= psb_success_) then info=psb_err_from_subroutine_ call psb_errpush(info,name,a_err='mpi_alltoall') diff --git a/base/tools/psb_csphalo.F90 b/base/tools/psb_csphalo.F90 index 8c1c8b43..74dba4f1 100644 --- a/base/tools/psb_csphalo.F90 +++ b/base/tools/psb_csphalo.F90 @@ -80,8 +80,9 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr integer(psb_ipk_) :: l1, icomm, err_act - integer(psb_ipk_), allocatable :: sdid(:,:), brvindx(:),rvid(:,:), & - & rvsz(:), bsdindx(:),sdsz(:), iasnd(:), jasnd(:) + integer(psb_mpik_), allocatable :: brvindx(:), & + & rvsz(:), bsdindx(:),sdsz(:) + integer(psb_ipk_), allocatable :: iasnd(:), jasnd(:) complex(psb_spk_), allocatable :: valsnd(:) type(psb_c_coo_sparse_mat), allocatable :: acoo integer(psb_ipk_), pointer :: idxv(:) @@ -137,7 +138,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& outfmt_ = 'CSR' endif - Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& + Allocate(brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1), acoo,stat=info) if (info /= psb_success_) then @@ -350,7 +351,7 @@ Subroutine psb_csphalo(a,desc_a,blk,info,rowcnv,colcnv,& goto 9999 end if - Deallocate(sdid,brvindx,rvid,bsdindx,rvsz,sdsz,& + Deallocate(brvindx,bsdindx,rvsz,sdsz,& & iasnd,jasnd,valsnd,stat=info) if (debug_level >= psb_debug_outer_)& & write(debug_unit,*) me,' ',trim(name),': Done' diff --git a/base/tools/psb_dcdbldext.F90 b/base/tools/psb_dcdbldext.F90 index 94510cec..1db79939 100644 --- a/base/tools/psb_dcdbldext.F90 +++ b/base/tools/psb_dcdbldext.F90 @@ -94,7 +94,7 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) integer(psb_ipk_),allocatable :: halo(:),works(:),workr(:),t_halo_in(:),& & t_halo_out(:),temp(:),maskr(:) - integer(psb_ipk_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) + integer(psb_mpik_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -467,7 +467,7 @@ Subroutine psb_dcdbldext(a,desc_a,novr,desc_ov,info, extype) ! accumulated RECV requests, we have an all-to-all to build ! matchings SENDs. ! - call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,minfo) + call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,minfo) if (minfo /= psb_success_) then info=psb_err_from_subroutine_ call psb_errpush(info,name,a_err='mpi_alltoall') diff --git a/base/tools/psb_dsphalo.F90 b/base/tools/psb_dsphalo.F90 index c2636280..72fef4ec 100644 --- a/base/tools/psb_dsphalo.F90 +++ b/base/tools/psb_dsphalo.F90 @@ -80,8 +80,9 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr integer(psb_ipk_) :: l1, icomm, err_act - integer(psb_ipk_), allocatable :: sdid(:,:), brvindx(:),rvid(:,:), & - & rvsz(:), bsdindx(:),sdsz(:), iasnd(:), jasnd(:) + integer(psb_mpik_), allocatable :: brvindx(:), & + & rvsz(:), bsdindx(:),sdsz(:) + integer(psb_ipk_), allocatable :: iasnd(:), jasnd(:) real(psb_dpk_), allocatable :: valsnd(:) type(psb_d_coo_sparse_mat), allocatable :: acoo integer(psb_ipk_), pointer :: idxv(:) @@ -137,7 +138,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& outfmt_ = 'CSR' endif - Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& + Allocate(brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1), acoo,stat=info) if (info /= psb_success_) then @@ -350,7 +351,7 @@ Subroutine psb_dsphalo(a,desc_a,blk,info,rowcnv,colcnv,& goto 9999 end if - Deallocate(sdid,brvindx,rvid,bsdindx,rvsz,sdsz,& + Deallocate(brvindx,bsdindx,rvsz,sdsz,& & iasnd,jasnd,valsnd,stat=info) if (debug_level >= psb_debug_outer_)& & write(debug_unit,*) me,' ',trim(name),': Done' diff --git a/base/tools/psb_scdbldext.F90 b/base/tools/psb_scdbldext.F90 index 92012a91..c0c29386 100644 --- a/base/tools/psb_scdbldext.F90 +++ b/base/tools/psb_scdbldext.F90 @@ -94,7 +94,7 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) integer(psb_ipk_),allocatable :: halo(:),works(:),workr(:),t_halo_in(:),& & t_halo_out(:),temp(:),maskr(:) - integer(psb_ipk_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) + integer(psb_mpik_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -467,7 +467,7 @@ Subroutine psb_scdbldext(a,desc_a,novr,desc_ov,info, extype) ! accumulated RECV requests, we have an all-to-all to build ! matchings SENDs. ! - call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,minfo) + call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,minfo) if (minfo /= psb_success_) then info=psb_err_from_subroutine_ call psb_errpush(info,name,a_err='mpi_alltoall') diff --git a/base/tools/psb_ssphalo.F90 b/base/tools/psb_ssphalo.F90 index 9368ce2a..d9058369 100644 --- a/base/tools/psb_ssphalo.F90 +++ b/base/tools/psb_ssphalo.F90 @@ -80,8 +80,9 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr integer(psb_ipk_) :: l1, icomm, err_act - integer(psb_ipk_), allocatable :: sdid(:,:), brvindx(:),rvid(:,:), & - & rvsz(:), bsdindx(:),sdsz(:), iasnd(:), jasnd(:) + integer(psb_mpik_), allocatable :: brvindx(:), & + & rvsz(:), bsdindx(:),sdsz(:) + integer(psb_ipk_), allocatable :: iasnd(:), jasnd(:) real(psb_spk_), allocatable :: valsnd(:) type(psb_s_coo_sparse_mat), allocatable :: acoo integer(psb_ipk_), pointer :: idxv(:) @@ -137,7 +138,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& outfmt_ = 'CSR' endif - Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& + Allocate(brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1), acoo,stat=info) if (info /= psb_success_) then @@ -350,7 +351,7 @@ Subroutine psb_ssphalo(a,desc_a,blk,info,rowcnv,colcnv,& goto 9999 end if - Deallocate(sdid,brvindx,rvid,bsdindx,rvsz,sdsz,& + Deallocate(brvindx,bsdindx,rvsz,sdsz,& & iasnd,jasnd,valsnd,stat=info) if (debug_level >= psb_debug_outer_)& & write(debug_unit,*) me,' ',trim(name),': Done' diff --git a/base/tools/psb_zcdbldext.F90 b/base/tools/psb_zcdbldext.F90 index b2bbd3da..42d3f96f 100644 --- a/base/tools/psb_zcdbldext.F90 +++ b/base/tools/psb_zcdbldext.F90 @@ -94,7 +94,7 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) integer(psb_ipk_), allocatable :: tmp_halo(:),tmp_ovr_idx(:), orig_ovr(:) integer(psb_ipk_),allocatable :: halo(:),works(:),workr(:),t_halo_in(:),& & t_halo_out(:),temp(:),maskr(:) - integer(psb_ipk_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) + integer(psb_mpik_),allocatable :: brvindx(:),rvsz(:), bsdindx(:),sdsz(:) integer(psb_ipk_) :: debug_level, debug_unit integer(psb_ipk_) :: ierr(5) character(len=20) :: name, ch_err @@ -467,7 +467,7 @@ Subroutine psb_zcdbldext(a,desc_a,novr,desc_ov,info, extype) ! accumulated RECV requests, we have an all-to-all to build ! matchings SENDs. ! - call mpi_alltoall(sdsz,1,psb_mpi_integer,rvsz,1,psb_mpi_integer,icomm,minfo) + call mpi_alltoall(sdsz,1,mpi_integer,rvsz,1,mpi_integer,icomm,minfo) if (minfo /= psb_success_) then info=psb_err_from_subroutine_ call psb_errpush(info,name,a_err='mpi_alltoall') diff --git a/base/tools/psb_zsphalo.F90 b/base/tools/psb_zsphalo.F90 index 74bcbcb6..e190e5d7 100644 --- a/base/tools/psb_zsphalo.F90 +++ b/base/tools/psb_zsphalo.F90 @@ -80,8 +80,9 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& & n_elem, j, ipx,mat_recv, iszs, iszr,idxs,idxr,nz,& & irmin,icmin,irmax,icmax,data_,ngtz,totxch,nxs, nxr integer(psb_ipk_) :: l1, icomm, err_act - integer(psb_ipk_), allocatable :: sdid(:,:), brvindx(:),rvid(:,:), & - & rvsz(:), bsdindx(:),sdsz(:), iasnd(:), jasnd(:) + integer(psb_mpik_), allocatable :: brvindx(:), & + & rvsz(:), bsdindx(:),sdsz(:) + integer(psb_ipk_), allocatable :: iasnd(:), jasnd(:) complex(psb_dpk_), allocatable :: valsnd(:) type(psb_z_coo_sparse_mat), allocatable :: acoo integer(psb_ipk_), pointer :: idxv(:) @@ -137,7 +138,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& outfmt_ = 'CSR' endif - Allocate(sdid(np,3),rvid(np,3),brvindx(np+1),& + Allocate(brvindx(np+1),& & rvsz(np),sdsz(np),bsdindx(np+1), acoo,stat=info) if (info /= psb_success_) then @@ -350,7 +351,7 @@ Subroutine psb_zsphalo(a,desc_a,blk,info,rowcnv,colcnv,& goto 9999 end if - Deallocate(sdid,brvindx,rvid,bsdindx,rvsz,sdsz,& + Deallocate(brvindx,bsdindx,rvsz,sdsz,& & iasnd,jasnd,valsnd,stat=info) if (debug_level >= psb_debug_outer_)& & write(debug_unit,*) me,' ',trim(name),': Done' diff --git a/test/kernel/pdgenspmv.f90 b/test/kernel/pdgenspmv.f90 index 74059912..3ed80ac7 100644 --- a/test/kernel/pdgenspmv.f90 +++ b/test/kernel/pdgenspmv.f90 @@ -157,7 +157,6 @@ program pdgen call psb_barrier(ictxt) t1 = psb_wtime() do i=1,times - write(0,*) 'Iteration ',i,' of ',times call psb_spmm(done,a,xxv,dzero,bv,desc_a,info,'n') end do call psb_barrier(ictxt)