LCPQ/irpf90
10
0
Fork 0
mirror of https://gitlab.com/scemama/irpf90.git synced 2024-12-21 11:53:32 +01:00
Code Releases Activity

openmp

Browse Source
This commit is contained in:
Anthony Scemama 2015-04-07 17:25:58 +02:00
parent 9819222f25
commit c071226c1d
2 changed files with 103 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/irp_stack.py
View File

@ -31,6 +31,7 @@ from command_line import command_line
do_assert = command_line.do_assert do_assert = command_line.do_assert
do_debug = command_line.do_debug do_debug = command_line.do_debug
do_openmp = command_line.do_openmp do_openmp = command_line.do_openmp
do_memory = command_line.do_memory
import irpf90_t import irpf90_t
@ -53,34 +54,45 @@ subroutine irp_enter(irp_where)
use irp_stack_mod use irp_stack_mod
integer :: ithread integer :: ithread
character*(*) :: irp_where character*(*) :: irp_where
!$ integer, external :: omp_get_thread_num
!$ integer, external :: omp_get_num_threads
ithread = 0
!$ ithread = omp_get_thread_num()
$1
""" """
if do_openmp:
if not command_line.do_openmp:
txt += """ txt += """
integer, external :: omp_get_thread_num
integer, external :: omp_get_num_threads
ithread = omp_get_thread_num()
if (ithread /= 0) then if (ithread /= 0) then
print *, 'Error: Provider is called by thread', ithread print *, 'Error: Provider is called by thread', ithread
call irp_trace call irp_trace
stop 1 stop 1
endif endif
"""
else:
txt += """
ithread = 0
""" """
if command_line.do_memory: txt += "$1"
txt+="""
if do_memory:
txt+="""
if (.not.alloc) then if (.not.alloc) then
nthread = 1 """
if do_openmp:
txt += """
!$OMP PARALLEL !$OMP PARALLEL
!$OMP SINGLE !$OMP SINGLE
!$ nthread = omp_get_num_threads() nthread = omp_get_num_threads()
!$OMP END SINGLE !$OMP END SINGLE
!$OMP END PARALLEL !$OMP END PARALLEL
print *, 'Allocating irp_stack(',STACKMAX,',',nthread,')' """
print *, 'Allocating irp_cpu(',STACKMAX,',',nthread,')' else:
print *, 'Allocating stack_index(',nthread,')' txt += """
nthread = 1
"""
txt += """
print *, 'Allocating irp_stack(',STACKMAX,',',nthread,')'
print *, 'Allocating irp_cpu(',STACKMAX,',',nthread,')'
print *, 'Allocating stack_index(',nthread,')'
endif""" endif"""
txt +=""" txt +="""
$2 $2
@ -90,25 +102,41 @@ subroutine irp_enter_f(irp_where)
use irp_stack_mod use irp_stack_mod
integer :: ithread integer :: ithread
character*(*) :: irp_where character*(*) :: irp_where
!$ integer, external :: omp_get_thread_num """
!$ integer, external :: omp_get_num_threads if do_openmp:
ithread = 0 txt += """
!$ ithread = omp_get_thread_num() integer, external :: omp_get_thread_num
integer, external :: omp_get_num_threads
ithread = omp_get_thread_num()
"""
else:
txt += """
ithread = 0
"""
txt += """
$1 $1
""" """
if command_line.do_memory: if do_memory:
txt+=""" txt+="""
if (.not.alloc) then if (.not.alloc) then
"""
if do_openmp:
txt += """
!$OMP PARALLEL !$OMP PARALLEL
!$OMP SINGLE !$OMP SINGLE
!$ nthread = omp_get_num_threads() nthread = omp_get_num_threads()
!$OMP END SINGLE
!$OMP END PARALLEL
"""
else:
txt += """
nthread = 1
"""
txt +="""
print *, 'Allocating irp_stack(',STACKMAX,',',nthread,')' print *, 'Allocating irp_stack(',STACKMAX,',',nthread,')'
print *, 'Allocating irp_cpu(',STACKMAX,',',nthread,')' print *, 'Allocating irp_cpu(',STACKMAX,',',nthread,')'
print *, 'Allocating stack_index(',nthread,')' print *, 'Allocating stack_index(',nthread,')'
!$OMP END SINGLE endif
!$OMP END PARALLEL
endif"""
txt +="""
$2 $2
end subroutine end subroutine
@ -117,9 +145,17 @@ subroutine irp_leave (irp_where)
character*(*) :: irp_where character*(*) :: irp_where
integer :: ithread integer :: ithread
double precision :: cpu double precision :: cpu
!$ integer, external :: omp_get_thread_num """
if do_openmp:
txt += """
integer, external :: omp_get_thread_num
ithread = omp_get_thread_num()
"""
else:
txt += """
ithread = 0 ithread = 0
!$ ithread = omp_get_thread_num() """
txt += """
$3 $3
$4 $4
end subroutine end subroutine
@ -127,32 +163,49 @@ end subroutine
# $1 # $1
if do_assert or do_debug: if do_assert or do_debug:
txt = txt.replace("$1",""" s = """
if (.not.alloc) then if (.not.alloc) then
"""
if do_openmp:
s += """
!$OMP PARALLEL !$OMP PARALLEL
!$OMP SINGLE !$OMP SINGLE
!$ nthread = omp_get_num_threads() nthread = omp_get_num_threads()
!$OMP END SINGLE !$OMP END SINGLE
!$OMP END PARALLEL !$OMP END PARALLEL
!$OMP CRITICAL !$OMP CRITICAL
if (.not.alloc) then if (.not.alloc) then
allocate(irp_stack(0:STACKMAX,nthread+1)) allocate(irp_stack(0:STACKMAX,nthread))
allocate(irp_cpu(0:STACKMAX,nthread+1)) allocate(irp_cpu(0:STACKMAX,nthread))
allocate(stack_index(nthread+1)) allocate(stack_index(nthread))
stack_index = 0 stack_index = 0
alloc = .True. alloc = .True.
endif endif
!$OMP END CRITICAL !$OMP END CRITICAL
endif endif
stack_index(ithread+1) = mod(stack_index(ithread+1)+1,STACKMAX) stack_index(ithread+1) = mod(stack_index(ithread+1)+1,STACKMAX)
irp_stack(stack_index(ithread+1),ithread+1) = irp_where""") irp_stack(stack_index(ithread+1),ithread+1) = irp_where"""
# if command_line.do_memory: else:
# txt+=""" s += """
# print *, 'Allocating irp_stack(',STACKMAX,','nthread,')' nthread = 1
# print *, 'Allocating irp_cpu(',STACKMAX,','nthread,')' if (.not.alloc) then
# print *, 'Allocating stack_index(',nthread,')'""" allocate(irp_stack(0:STACKMAX,1))
allocate(irp_cpu(0:STACKMAX,1))
allocate(stack_index(2))
stack_index = 0
alloc = .True.
endif
endif
stack_index(1) = mod(stack_index(1)+1,STACKMAX)
irp_stack(stack_index(1),1) = irp_where"""
if do_memory:
txt+="""
print *, 'Allocating irp_stack(',STACKMAX,','nthread,')'
print *, 'Allocating irp_cpu(',STACKMAX,','nthread,')'
print *, 'Allocating stack_index(',nthread,')'"""
else: else:
txt = txt.replace("$1","") s = ""
txt = txt.replace("$1",s)
# $2 # $2
if do_debug: if do_debug:
@ -184,9 +237,17 @@ subroutine irp_trace
use irp_stack_mod use irp_stack_mod
integer :: ithread integer :: ithread
integer :: i integer :: i
"""
if do_openmp:
txt += """
!$ integer, external :: omp_get_thread_num !$ integer, external :: omp_get_thread_num
ithread = 0
!$ ithread = omp_get_thread_num() !$ ithread = omp_get_thread_num()
"""
else:
txt += """
ithread = 0
"""
txt += """
if (.not.alloc) return if (.not.alloc) return
print *, 'Stack trace: ', ithread print *, 'Stack trace: ', ithread
print *, '-------------------------' print *, '-------------------------'

16
src/variable.py
View File

@ -464,17 +464,6 @@ class Variable(object):
name = self.name name = self.name
same_as = self.same_as same_as = self.same_as
def check_openmp():
if not command_line.do_openmp:
result = [ "!$ nthreads = omp_get_num_threads()" ,
"!$ if (nthreads > 1) then" ,
"!$ print *, irp_here//': Error: Provider in an openMP section'" ,
"!$ stop 1",
"!$ endif" ]
else:
result = []
return result
def build_alloc(name): def build_alloc(name):
self = variables[name] self = variables[name]
if self.dim == []: if self.dim == []:
@ -547,7 +536,8 @@ class Variable(object):
result += [ "!DEC$ ATTRIBUTES FORCEINLINE :: provide_%s"%(name) ] result += [ "!DEC$ ATTRIBUTES FORCEINLINE :: provide_%s"%(name) ]
result += [ "subroutine provide_%s"%(name) ] result += [ "subroutine provide_%s"%(name) ]
result += build_use( [same_as]+self.to_provide ) result += build_use( [same_as]+self.to_provide )
result += ["!$ use omp_lib"] if command_line.do_openmp:
result += [" use omp_lib"]
result.append(" implicit none") result.append(" implicit none")
length = len("provide_%s"%(name)) length = len("provide_%s"%(name))
result += [\ result += [\
@ -557,8 +547,6 @@ class Variable(object):
"!$ integer :: nthreads"] "!$ integer :: nthreads"]
if command_line.do_openmp: if command_line.do_openmp:
result.append(" call irp_lock_%s(.True.)"%(same_as)) result.append(" call irp_lock_%s(.True.)"%(same_as))
else:
result += check_openmp()
if command_line.do_assert or command_line.do_debug: if command_line.do_assert or command_line.do_debug:
result.append(" call irp_enter(irp_here)") result.append(" call irp_enter(irp_here)")
result += call_provides(self.to_provide) result += call_provides(self.to_provide)