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

Fixed COO csput for OMP/not OMP

Browse Source
master
sfilippone 1 year ago
parent 3aa748b0e3
commit 26bf4c5d69
4 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -2875,18 +2875,14 @@ 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)
#if defined(OPENMP)
!write(0,*) 'From thread ',omp_get_thread_num(),nzaold,nz,nza,a%get_nzeros()
#endif
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,nzaold,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nza,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
@ -2961,7 +2957,7 @@ contains
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
ir = ia(i) ir = ia(i)

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

@ -2875,18 +2875,14 @@ 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)
#if defined(OPENMP)
!write(0,*) 'From thread ',omp_get_thread_num(),nzaold,nz,nza,a%get_nzeros()
#endif
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,nzaold,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nza,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
@ -2961,7 +2957,7 @@ contains
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
ir = ia(i) ir = ia(i)

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

@ -2875,18 +2875,14 @@ 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)
#if defined(OPENMP)
!write(0,*) 'From thread ',omp_get_thread_num(),nzaold,nz,nza,a%get_nzeros()
#endif
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,nzaold,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nza,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
@ -2961,7 +2957,7 @@ contains
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
ir = ia(i) ir = ia(i)

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

@ -2875,18 +2875,14 @@ 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)
#if defined(OPENMP)
!write(0,*) 'From thread ',omp_get_thread_num(),nzaold,nz,nza,a%get_nzeros()
#endif
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,nzaold,a%ia,a%ja,a%val,isza,& call psb_inner_ins(nz,ia,ja,val,nza,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
@ -2961,7 +2957,7 @@ contains
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
ir = ia(i) ir = ia(i)

Write Preview
Loading…
Cancel
Save