fdurastante
/
psblas3
mirror of https://github.com/sfilippone/psblas3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final fix for COO on OMP

Browse Source
master
sfilippone 1 year ago
parent 26bf4c5d69
commit f001ebbad3
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File

14
base/serial/impl/psb_c_coo_impl.F90
Unescape Escape View File

@ -2864,7 +2864,9 @@ subroutine psb_c_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
if (nz == 0) return if (nz == 0) return
if (a%is_bld()) then if (a%is_bld()) then
! Structure here is peculiar, because this function can be called
! either within a parallel region, or outside.
! Hence the call to set_nzeros done here.
!$omp critical !$omp critical
nza = a%get_nzeros() nza = a%get_nzeros()
isza = a%get_size() isza = a%get_size()
@ -2875,14 +2877,15 @@ subroutine psb_c_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
isza = a%get_size() isza = a%get_size()
if (isza < (nza+nz)) then if (isza < (nza+nz)) then
info = psb_err_alloc_dealloc_; call psb_errpush(info,name) info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
else
nzaold = nza
nza = nza + nz
call a%set_nzeros(nza)
end if end if
!$omp end critical !$omp end critical
if (info /= 0) goto 9999 if (info /= 0) goto 9999
call psb_inner_ins(nz,ia,ja,val,nza,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
& imin,imax,jmin,jmax,info) & imin,imax,jmin,jmax,info)
!write(0,*) 'From CSPUT :',nza,nzaold
call a%set_nzeros(nza)
call a%set_sorted(.false.) call a%set_sorted(.false.)
else if (a%is_upd()) then else if (a%is_upd()) then
@ -2956,7 +2959,6 @@ contains
end if end if
end do end do
!$OMP END PARALLEL DO !$OMP END PARALLEL DO
nza = nza + nz nza = nza + nz
#else #else
do i=1, nz do i=1, nz

14
base/serial/impl/psb_d_coo_impl.F90
Unescape Escape View File

@ -2864,7 +2864,9 @@ subroutine psb_d_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
if (nz == 0) return if (nz == 0) return
if (a%is_bld()) then if (a%is_bld()) then
! Structure here is peculiar, because this function can be called
! either within a parallel region, or outside.
! Hence the call to set_nzeros done here.
!$omp critical !$omp critical
nza = a%get_nzeros() nza = a%get_nzeros()
isza = a%get_size() isza = a%get_size()
@ -2875,14 +2877,15 @@ subroutine psb_d_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
isza = a%get_size() isza = a%get_size()
if (isza < (nza+nz)) then if (isza < (nza+nz)) then
info = psb_err_alloc_dealloc_; call psb_errpush(info,name) info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
else
nzaold = nza
nza = nza + nz
call a%set_nzeros(nza)
end if end if
!$omp end critical !$omp end critical
if (info /= 0) goto 9999 if (info /= 0) goto 9999
call psb_inner_ins(nz,ia,ja,val,nza,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
& imin,imax,jmin,jmax,info) & imin,imax,jmin,jmax,info)
!write(0,*) 'From CSPUT :',nza,nzaold
call a%set_nzeros(nza)
call a%set_sorted(.false.) call a%set_sorted(.false.)
else if (a%is_upd()) then else if (a%is_upd()) then
@ -2956,7 +2959,6 @@ contains
end if end if
end do end do
!$OMP END PARALLEL DO !$OMP END PARALLEL DO
nza = nza + nz nza = nza + nz
#else #else
do i=1, nz do i=1, nz

14
base/serial/impl/psb_s_coo_impl.F90
Unescape Escape View File

@ -2864,7 +2864,9 @@ subroutine psb_s_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
if (nz == 0) return if (nz == 0) return
if (a%is_bld()) then if (a%is_bld()) then
! Structure here is peculiar, because this function can be called
! either within a parallel region, or outside.
! Hence the call to set_nzeros done here.
!$omp critical !$omp critical
nza = a%get_nzeros() nza = a%get_nzeros()
isza = a%get_size() isza = a%get_size()
@ -2875,14 +2877,15 @@ subroutine psb_s_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
isza = a%get_size() isza = a%get_size()
if (isza < (nza+nz)) then if (isza < (nza+nz)) then
info = psb_err_alloc_dealloc_; call psb_errpush(info,name) info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
else
nzaold = nza
nza = nza + nz
call a%set_nzeros(nza)
end if end if
!$omp end critical !$omp end critical
if (info /= 0) goto 9999 if (info /= 0) goto 9999
call psb_inner_ins(nz,ia,ja,val,nza,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
& imin,imax,jmin,jmax,info) & imin,imax,jmin,jmax,info)
!write(0,*) 'From CSPUT :',nza,nzaold
call a%set_nzeros(nza)
call a%set_sorted(.false.) call a%set_sorted(.false.)
else if (a%is_upd()) then else if (a%is_upd()) then
@ -2956,7 +2959,6 @@ contains
end if end if
end do end do
!$OMP END PARALLEL DO !$OMP END PARALLEL DO
nza = nza + nz nza = nza + nz
#else #else
do i=1, nz do i=1, nz

14
base/serial/impl/psb_z_coo_impl.F90
Unescape Escape View File

@ -2864,7 +2864,9 @@ subroutine psb_z_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
if (nz == 0) return if (nz == 0) return
if (a%is_bld()) then if (a%is_bld()) then
! Structure here is peculiar, because this function can be called
! either within a parallel region, or outside.
! Hence the call to set_nzeros done here.
!$omp critical !$omp critical
nza = a%get_nzeros() nza = a%get_nzeros()
isza = a%get_size() isza = a%get_size()
@ -2875,14 +2877,15 @@ subroutine psb_z_coo_csput_a(nz,ia,ja,val,a,imin,imax,jmin,jmax,info)
isza = a%get_size() isza = a%get_size()
if (isza < (nza+nz)) then if (isza < (nza+nz)) then
info = psb_err_alloc_dealloc_; call psb_errpush(info,name) info = psb_err_alloc_dealloc_; call psb_errpush(info,name)
else
nzaold = nza
nza = nza + nz
call a%set_nzeros(nza)
end if end if
!$omp end critical !$omp end critical
if (info /= 0) goto 9999 if (info /= 0) goto 9999
call psb_inner_ins(nz,ia,ja,val,nza,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nzaold,a%ia,a%ja,a%val,isza,&
& imin,imax,jmin,jmax,info) & imin,imax,jmin,jmax,info)
!write(0,*) 'From CSPUT :',nza,nzaold
call a%set_nzeros(nza)
call a%set_sorted(.false.) call a%set_sorted(.false.)
else if (a%is_upd()) then else if (a%is_upd()) then
@ -2956,7 +2959,6 @@ contains
end if end if
end do end do
!$OMP END PARALLEL DO !$OMP END PARALLEL DO
nza = nza + nz nza = nza + nz
#else #else
do i=1, nz do i=1, nz

Write Preview
Loading…
Cancel
Save