10
0
mirror of https://gitlab.com/scemama/irpf90.git synced 2024-12-14 16:33:32 +01:00

Merge branch 'master' of ssh://git.code.sf.net/p/irpf90/code

Conflicts:
	man/man1/irpf90.1.gz
This commit is contained in:
Anthony Scemama 2014-03-07 20:38:59 +01:00
commit a7bffaffcc
14 changed files with 106 additions and 16 deletions

View File

@ -1,10 +1,10 @@
.PHONY: all src man
all: src man
src:
$(MAKE) -C $@
man:
- $(MAKE) -C $@
all: src man

5
README
View File

@ -7,7 +7,7 @@ Dependencies
- GNU make (>= 3.81 recommended)
- Python > 2.3
- Any Fortran 90 compiler (Intel recommended, for example)
- Any Fortran 90 compiler (Intel recommended)
Installing IRPF90
-----------------
@ -21,6 +21,7 @@ ${IRPF90_HOME} is the location of your irpf90 directory::
export PATH=${IRPF90_HOME}/bin:${PATH}
export MANPATH=${IRPF90_HOME}/man:${MANPATH}
EOF
. ${HOME}/.bash_profile
Using IRPF90
@ -43,6 +44,6 @@ Author
------
| Anthony Scemama, LCPQ-IRSAMC, CNRS-Universite Paul Sabatier
| scemama@irsamc.ups-tlse.fr
| <scemama@irsamc.ups-tlse.fr>
| http://scemama.mooo.com

View File

@ -1 +1 @@
../src/irpf90.exe
../src/irpf90_python.exe

Binary file not shown.

45
src/codelet.py Normal file
View File

@ -0,0 +1,45 @@
#!/usr/bin/python
from command_line import command_line
import irpf90_t
def run():
template = """
program codelet_%(name)s
implicit none
integer :: i
double precision :: ticks_0, ticks_1, cpu_0, cpu_1
integer, parameter :: irp_imax = %(NMAX)d
%(precondition)s
call provide_%(name)s
double precision :: irp_rdtsc
call cpu_time(cpu_0)
ticks_0 = irp_rdtsc()
do i=1,irp_imax
call bld_%(name)s
enddo
ticks_1 = irp_rdtsc()
call cpu_time(cpu_1)
print *, '%(name)s'
print *, '-----------'
print *, 'Cycles:'
print *, (ticks_1-ticks_0)/dble(irp_imax)
print *, 'Seconds:'
print *, (cpu_1-cpu_0)/dble(irp_imax)
end
"""
name, NMAX, precondition, filename = command_line.codelet
if precondition is None:
precondition = ""
else:
precondition = "PROVIDE "+precondition
file = open(filename,'w')
file.write(template%locals())
file.close()

View File

@ -49,6 +49,7 @@ options['r'] = [ 'no_directives', 'Ignore all compiler directives !DEC$ and !DIR
options['n'] = [ 'inline' , 'all|providers|builders : Force inlining of providers or builders', 1 ]
options['u'] = [ 'unused' , 'Print unused providers', 0 ]
options['I'] = [ 'include' , 'Include directory', 1 ]
options['c'] = [ 'codelet' , 'entity:NMAX or entity:precondition:NMAX : Generate a codelet to profile a provider running NMAX times', 1 ]
class CommandLine(object):
@ -73,6 +74,8 @@ class CommandLine(object):
self._include_dir = []
for o,a in self.opts:
if o in [ "-I", '--'+options['I'][0] ]:
if len(a) < 1:
print "Error: -I option needs a directory"
if a[-1] != '/':
a = a+'/'
self._include_dir.append(a)
@ -100,6 +103,28 @@ class CommandLine(object):
return self._substituted
substituted = property(fget=substituted)
def codelet(self):
if '_codelet' not in self.__dict__:
self._codelet = []
for o,a in self.opts:
if o in [ "-c", '--'+options['c'][0] ]:
buffer = a.split(':')
filename = 'codelet_'+buffer[0]+'.irp.f'
if len(buffer) == 2:
self._codelet = [buffer[0], int(buffer[1]), None, filename]
elif len(buffer) == 3:
self._codelet = [buffer[0], int(buffer[2]), buffer[1], filename]
else:
print """
Error in codelet definition. Use:
--codelet=provider:NMAX
or
--codelet=provider:precondition:NMAX
"""
sys.exit(1)
return self._codelet
codelet = property(fget=codelet)
def preprocessed(self):
if '_preprocessed' not in self.__dict__:
self._preprocessed = []

View File

@ -64,9 +64,14 @@ def init():
# Copy current files in the irpdir
for dir in ['./']+command_line.include_dir:
try:
os.stat(dir)
except:
print dir,'not in dir'
continue
for filename in os.listdir(dir):
filename = dir+filename
if not filename[0].startswith(".") and not os.path.isdir(filename):
if not filename.startswith(".") and not os.path.isdir(filename):
try:
file = open(filename,"r")
except IOError:

View File

@ -35,8 +35,9 @@ except:
pass
sys.setcheckinterval(1000)
from command_line import command_line
def main():
from command_line import command_line
vim.install()
@ -72,9 +73,14 @@ def main():
for x in parents:
print "- %s"%(x,)
if not command_line.do_run:
return
if command_line.do_codelet:
import profile
profile.build_rdtsc()
import codelet
codelet.run()
if not command_line.do_run:
return
init()
@ -102,3 +108,4 @@ def main():
if __name__ == '__main__':
main()

View File

@ -350,7 +350,13 @@ def create_irpf90_files():
return filename.endswith(".irp.f") and not filename.startswith('.')
result = filter ( is_irpf90_file, os.listdir(os.getcwd()) )
for dir in command_line.include_dir:
result += map(lambda x: dir+x, filter ( is_irpf90_file, os.listdir(dir) ) )
try:
os.stat(dir)
result += map(lambda x: dir+x, filter ( is_irpf90_file, os.listdir(dir) ) )
except:
continue
if command_line.do_codelet:
result += [command_line.codelet[3]]
return result
irpf90_files = create_irpf90_files()

View File

@ -61,8 +61,7 @@ irpf90.make: $(wildcard *.irp.f)
######################################################################
def run():
from modules import modules
if os.fork() == 0:
from modules import modules
mod = []
for m in modules.values():
mod.append(m)
@ -94,6 +93,8 @@ def run():
print >>file, "OBJ1 = $(OBJ) %sirp_touches.irp.o"%(irpdir),
if command_line.do_profile:
print >>file, " %sirp_profile.irp.o"%(irpdir), " irp_rdtsc.o",
if command_line.do_codelet:
print >>file, " irp_rdtsc.o",
if command_line.do_openmp:
print >>file, " %sirp_locks.irp.o"%(irpdir),
else:
@ -191,4 +192,3 @@ def run():
print >>file, "\t- rm -rf "+irpdir+" "+mandir+" irpf90.make irpf90_variables dist\n"
file.close()
sys.exit(0)

View File

@ -47,7 +47,7 @@ class Fmodule(object):
def __init__(self,text,filename):
self.text = put_info(text,filename)
self.filename = filename[:-6]
self.name = "%s_mod"%(self.filename).replace('/','__')
self.name = "%s_mod"%(self.filename).replace('/','__').replace('.','Dot')
def is_main(self):
if '_is_main' not in self.__dict__:

View File

@ -788,6 +788,7 @@ def check_begin_end(text):
error.fail(text[begin],"Missing 'end%s'"%(x,))
def find_matching_end_subfunpro(begin,x):
line = text[begin]
for i in range(begin+1,len(text)):
line = text[i]
if type(line) == x:

View File

@ -20,7 +20,6 @@ import subprocess
import tempfile
import os
import threading
from variables import variables
def build_rdtsc():
file,filename = tempfile.mkstemp()
@ -36,6 +35,7 @@ def build_rdtsc():
threading.Thread(target=t).start()
def build_module():
from variables import variables
data = """
module irp_timer
double precision :: irp_profile(3,%(n)d)

View File

@ -1 +1 @@
version = "1.3.1"
version = "1.3.3"