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

Rework build

Browse Source
omp-threadsafe
Salvatore Filippone 3 years ago
parent 344d118051
commit d0a5ff9893
9 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File

10
base/modules/serial/psb_c_base_vect_mod.F90
Unescape Escape View File

@ -1208,7 +1208,7 @@ contains
if (beta == cone) then if (beta == cone) then
return return
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) z%v(i) = beta*z%v(i)
end do end do
@ -1243,24 +1243,24 @@ contains
z%v(i) = z%v(i) - y(i)*x(i) z%v(i) = z%v(i) - y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) - y(i)*x(i) z%v(i) = beta*z%v(i) - y(i)*x(i)
end do end do
end if end if
else else
if (beta == czero) then if (beta == czero) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = alpha*y(i)*x(i) z%v(i) = alpha*y(i)*x(i)
end do end do
else if (beta == cone) then else if (beta == cone) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = z%v(i) + alpha*y(i)*x(i) z%v(i) = z%v(i) + alpha*y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha, beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) + alpha*y(i)*x(i) z%v(i) = beta*z%v(i) + alpha*y(i)*x(i)
end do end do

10
base/modules/serial/psb_d_base_vect_mod.F90
Unescape Escape View File

@ -1215,7 +1215,7 @@ contains
if (beta == done) then if (beta == done) then
return return
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) z%v(i) = beta*z%v(i)
end do end do
@ -1250,24 +1250,24 @@ contains
z%v(i) = z%v(i) - y(i)*x(i) z%v(i) = z%v(i) - y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) - y(i)*x(i) z%v(i) = beta*z%v(i) - y(i)*x(i)
end do end do
end if end if
else else
if (beta == dzero) then if (beta == dzero) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = alpha*y(i)*x(i) z%v(i) = alpha*y(i)*x(i)
end do end do
else if (beta == done) then else if (beta == done) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = z%v(i) + alpha*y(i)*x(i) z%v(i) = z%v(i) + alpha*y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha, beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) + alpha*y(i)*x(i) z%v(i) = beta*z%v(i) + alpha*y(i)*x(i)
end do end do

10
base/modules/serial/psb_s_base_vect_mod.F90
Unescape Escape View File

@ -1215,7 +1215,7 @@ contains
if (beta == sone) then if (beta == sone) then
return return
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) z%v(i) = beta*z%v(i)
end do end do
@ -1250,24 +1250,24 @@ contains
z%v(i) = z%v(i) - y(i)*x(i) z%v(i) = z%v(i) - y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) - y(i)*x(i) z%v(i) = beta*z%v(i) - y(i)*x(i)
end do end do
end if end if
else else
if (beta == szero) then if (beta == szero) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = alpha*y(i)*x(i) z%v(i) = alpha*y(i)*x(i)
end do end do
else if (beta == sone) then else if (beta == sone) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = z%v(i) + alpha*y(i)*x(i) z%v(i) = z%v(i) + alpha*y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha, beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) + alpha*y(i)*x(i) z%v(i) = beta*z%v(i) + alpha*y(i)*x(i)
end do end do

10
base/modules/serial/psb_z_base_vect_mod.F90
Unescape Escape View File

@ -1208,7 +1208,7 @@ contains
if (beta == zone) then if (beta == zone) then
return return
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) z%v(i) = beta*z%v(i)
end do end do
@ -1243,24 +1243,24 @@ contains
z%v(i) = z%v(i) - y(i)*x(i) z%v(i) = z%v(i) - y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) - y(i)*x(i) z%v(i) = beta*z%v(i) - y(i)*x(i)
end do end do
end if end if
else else
if (beta == zzero) then if (beta == zzero) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = alpha*y(i)*x(i) z%v(i) = alpha*y(i)*x(i)
end do end do
else if (beta == zone) then else if (beta == zone) then
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha)
do i=1, n do i=1, n
z%v(i) = z%v(i) + alpha*y(i)*x(i) z%v(i) = z%v(i) + alpha*y(i)*x(i)
end do end do
else else
!$omp parallel do private(i) !$omp parallel do private(i) shared(alpha, beta)
do i=1, n do i=1, n
z%v(i) = beta*z%v(i) + alpha*y(i)*x(i) z%v(i) = beta*z%v(i) + alpha*y(i)*x(i)
end do end do

8
base/serial/impl/psb_c_csr_impl.f90
Unescape Escape View File

@ -2871,7 +2871,7 @@ subroutine psb_c_cp_csr_from_coo(a,b,info)
call move_alloc(tmp%ia,itemp) call move_alloc(tmp%ia,itemp)
call move_alloc(tmp%ja,a%ja) call move_alloc(tmp%ja,a%ja)
call move_alloc(tmp%val,a%val) call move_alloc(tmp%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call tmp%free() call tmp%free()
else else
@ -2889,8 +2889,8 @@ subroutine psb_c_cp_csr_from_coo(a,b,info)
call psb_safe_ab_cpy(b%ia,itemp,info) call psb_safe_ab_cpy(b%ia,itemp,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info) if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info) if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info)
if (info == psb_success_) call psb_realloc(nr+1,a%irp,info) if (info == psb_success_) call psb_realloc(max(nr+1,nc+1),a%irp,info)
endif endif
a%irp(:) = 0 a%irp(:) = 0
@ -3040,7 +3040,7 @@ subroutine psb_c_mv_csr_from_coo(a,b,info)
call move_alloc(b%ia,itemp) call move_alloc(b%ia,itemp)
call move_alloc(b%ja,a%ja) call move_alloc(b%ja,a%ja)
call move_alloc(b%val,a%val) call move_alloc(b%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call b%free() call b%free()

8
base/serial/impl/psb_d_csr_impl.f90
Unescape Escape View File

@ -2871,7 +2871,7 @@ subroutine psb_d_cp_csr_from_coo(a,b,info)
call move_alloc(tmp%ia,itemp) call move_alloc(tmp%ia,itemp)
call move_alloc(tmp%ja,a%ja) call move_alloc(tmp%ja,a%ja)
call move_alloc(tmp%val,a%val) call move_alloc(tmp%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call tmp%free() call tmp%free()
else else
@ -2889,8 +2889,8 @@ subroutine psb_d_cp_csr_from_coo(a,b,info)
call psb_safe_ab_cpy(b%ia,itemp,info) call psb_safe_ab_cpy(b%ia,itemp,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info) if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info) if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info)
if (info == psb_success_) call psb_realloc(nr+1,a%irp,info) if (info == psb_success_) call psb_realloc(max(nr+1,nc+1),a%irp,info)
endif endif
a%irp(:) = 0 a%irp(:) = 0
@ -3040,7 +3040,7 @@ subroutine psb_d_mv_csr_from_coo(a,b,info)
call move_alloc(b%ia,itemp) call move_alloc(b%ia,itemp)
call move_alloc(b%ja,a%ja) call move_alloc(b%ja,a%ja)
call move_alloc(b%val,a%val) call move_alloc(b%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call b%free() call b%free()

8
base/serial/impl/psb_s_csr_impl.f90
Unescape Escape View File

@ -2871,7 +2871,7 @@ subroutine psb_s_cp_csr_from_coo(a,b,info)
call move_alloc(tmp%ia,itemp) call move_alloc(tmp%ia,itemp)
call move_alloc(tmp%ja,a%ja) call move_alloc(tmp%ja,a%ja)
call move_alloc(tmp%val,a%val) call move_alloc(tmp%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call tmp%free() call tmp%free()
else else
@ -2889,8 +2889,8 @@ subroutine psb_s_cp_csr_from_coo(a,b,info)
call psb_safe_ab_cpy(b%ia,itemp,info) call psb_safe_ab_cpy(b%ia,itemp,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info) if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info) if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info)
if (info == psb_success_) call psb_realloc(nr+1,a%irp,info) if (info == psb_success_) call psb_realloc(max(nr+1,nc+1),a%irp,info)
endif endif
a%irp(:) = 0 a%irp(:) = 0
@ -3040,7 +3040,7 @@ subroutine psb_s_mv_csr_from_coo(a,b,info)
call move_alloc(b%ia,itemp) call move_alloc(b%ia,itemp)
call move_alloc(b%ja,a%ja) call move_alloc(b%ja,a%ja)
call move_alloc(b%val,a%val) call move_alloc(b%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call b%free() call b%free()

8
base/serial/impl/psb_z_csr_impl.f90
Unescape Escape View File

@ -2871,7 +2871,7 @@ subroutine psb_z_cp_csr_from_coo(a,b,info)
call move_alloc(tmp%ia,itemp) call move_alloc(tmp%ia,itemp)
call move_alloc(tmp%ja,a%ja) call move_alloc(tmp%ja,a%ja)
call move_alloc(tmp%val,a%val) call move_alloc(tmp%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call tmp%free() call tmp%free()
else else
@ -2889,8 +2889,8 @@ subroutine psb_z_cp_csr_from_coo(a,b,info)
call psb_safe_ab_cpy(b%ia,itemp,info) call psb_safe_ab_cpy(b%ia,itemp,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info) if (info == psb_success_) call psb_safe_ab_cpy(b%ja,a%ja,info)
if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info) if (info == psb_success_) call psb_safe_ab_cpy(b%val,a%val,info)
if (info == psb_success_) call psb_realloc(nr+1,a%irp,info) if (info == psb_success_) call psb_realloc(max(nr+1,nc+1),a%irp,info)
endif endif
a%irp(:) = 0 a%irp(:) = 0
@ -3040,7 +3040,7 @@ subroutine psb_z_mv_csr_from_coo(a,b,info)
call move_alloc(b%ia,itemp) call move_alloc(b%ia,itemp)
call move_alloc(b%ja,a%ja) call move_alloc(b%ja,a%ja)
call move_alloc(b%val,a%val) call move_alloc(b%val,a%val)
call psb_realloc(nr+1,a%irp,info) call psb_realloc(max(nr+1,nc+1),a%irp,info)
call b%free() call b%free()

33
cbind/base/psb_c_serial_cbind_mod.F90
Unescape Escape View File

@ -204,38 +204,5 @@ contains
end function psb_c_cvect_set_vect end function psb_c_cvect_set_vect
function psb_c_g2l(cdh,gindex,cowned) bind(c) result(lindex)
use psb_base_mod
implicit none
integer(psb_c_lpk_), value :: gindex
logical(c_bool), value :: cowned
type(psb_c_descriptor) :: cdh
integer(psb_c_ipk_) :: lindex
type(psb_desc_type), pointer :: descp
integer(psb_ipk_) :: info, localindex, ixb, iam, np
logical :: owned
ixb = psb_c_get_index_base()
owned = cowned
lindex = -1
if (c_associated(cdh%item)) then
call c_f_pointer(cdh%item,descp)
else
return
end if
call psb_info(descp%get_context(),iam,np)
if (ixb == 1) then
call descp%indxmap%g2l(gindex,localindex,info,owned=owned)
lindex = localindex
else
call descp%indxmap%g2l(gindex+(1-ixb),localindex,info,owned=owned)
lindex = localindex-(1-ixb)
endif
end function psb_c_g2l
end module psb_c_serial_cbind_mod end module psb_c_serial_cbind_mod

Write Preview
Loading…
Cancel
Save