fdurastante/psblas3
1
0
Fork 0
mirror of https://github.com/sfilippone/psblas3.git synced 2026-10-20 21:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aux space spspmm estimate was wrong, reverted.

Browse Source
This commit is contained in:
Salvatore Filippone
2019-05-22 11:44:16 +01:00
parent 5abe99196c
commit 9a6d9ac5c4
4 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/serial/impl/psb_c_csr_impl.f90
+3 -10
View File
@@ -3264,7 +3264,7 @@ subroutine psb_ccsrspspmm(a,b,c,info)
class(psb_c_csr_sparse_mat), intent(in) :: a,b
type(psb_c_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_ipk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -3287,13 +3287,10 @@ subroutine psb_ccsrspspmm(a,b,c,info)
goto 9999
endif
! Estimate number of nonzeros on output.
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
@@ -5393,7 +5390,7 @@ subroutine psb_lccsrspspmm(a,b,c,info)
class(psb_lc_csr_sparse_mat), intent(in) :: a,b
type(psb_lc_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_lpk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_lpk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -5419,10 +5416,6 @@ subroutine psb_lccsrspspmm(a,b,c,info)
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
base/serial/impl/psb_d_csr_impl.f90
+3 -10
View File
@@ -3264,7 +3264,7 @@ subroutine psb_dcsrspspmm(a,b,c,info)
class(psb_d_csr_sparse_mat), intent(in) :: a,b
type(psb_d_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_ipk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -3287,13 +3287,10 @@ subroutine psb_dcsrspspmm(a,b,c,info)
goto 9999
endif
! Estimate number of nonzeros on output.
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
@@ -5393,7 +5390,7 @@ subroutine psb_ldcsrspspmm(a,b,c,info)
class(psb_ld_csr_sparse_mat), intent(in) :: a,b
type(psb_ld_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_lpk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_lpk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -5419,10 +5416,6 @@ subroutine psb_ldcsrspspmm(a,b,c,info)
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
base/serial/impl/psb_s_csr_impl.f90
+3 -10
View File
@@ -3264,7 +3264,7 @@ subroutine psb_scsrspspmm(a,b,c,info)
class(psb_s_csr_sparse_mat), intent(in) :: a,b
type(psb_s_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_ipk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -3287,13 +3287,10 @@ subroutine psb_scsrspspmm(a,b,c,info)
goto 9999
endif
! Estimate number of nonzeros on output.
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
@@ -5393,7 +5390,7 @@ subroutine psb_lscsrspspmm(a,b,c,info)
class(psb_ls_csr_sparse_mat), intent(in) :: a,b
type(psb_ls_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_lpk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_lpk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -5419,10 +5416,6 @@ subroutine psb_lscsrspspmm(a,b,c,info)
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
base/serial/impl/psb_z_csr_impl.f90
+3 -10
View File
@@ -3264,7 +3264,7 @@ subroutine psb_zcsrspspmm(a,b,c,info)
class(psb_z_csr_sparse_mat), intent(in) :: a,b
type(psb_z_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_ipk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_ipk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -3287,13 +3287,10 @@ subroutine psb_zcsrspspmm(a,b,c,info)
goto 9999
endif
! Estimate number of nonzeros on output.
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)
@@ -5393,7 +5390,7 @@ subroutine psb_lzcsrspspmm(a,b,c,info)
class(psb_lz_csr_sparse_mat), intent(in) :: a,b
type(psb_lz_csr_sparse_mat), intent(out) :: c
integer(psb_ipk_), intent(out) :: info
integer(psb_lpk_) :: nze, ma,na,mb,nb, nzc, nza, nzb,nzeb
integer(psb_lpk_) :: ma,na,mb,nb, nzc, nza, nzb
character(len=20) :: name
integer(psb_ipk_) :: err_act
name='psb_csrspspmm'
@@ -5419,10 +5416,6 @@ subroutine psb_lzcsrspspmm(a,b,c,info)
nza = a%get_nzeros()
nzb = b%get_nzeros()
nzc = 2*(nza+nzb)
nze = ma*(((nza+ma-1)/ma)*((nzb+mb-1)/mb) )
nzeb = (((nza+na-1)/na)*((nzb+nb-1)/nb))*nb
! Estimate number of nonzeros on output.
! Turns out this is often a large overestimate.
call c%allocate(ma,nb,nzc)
call csr_spspmm(a,b,c,info)