LCPQ/irpf90
10
0
Fork 0
mirror of https://gitlab.com/scemama/irpf90.git synced 2025-01-03 10:05:40 +01:00
Code Releases Activity

Merge pull request #7 from scemama/master

Browse Source 
Ninja
This commit is contained in:
Anthony Scemama 2015-06-02 16:30:11 +02:00
commit 539f2c6a20
6 changed files with 159 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/command_line.py
View File

@ -50,6 +50,7 @@ options['r'] = [ 'no_directives', 'Ignore all compiler directives !DEC$ and !DIR
options['s'] = [ 'substitute' , 'Substitute values in do loops for generating specific optimized code.', 1 ] options['s'] = [ 'substitute' , 'Substitute values in do loops for generating specific optimized code.', 1 ]
options['t'] = [ 'touch' , 'Display which entities are touched when touching the variable given as an argument.', 1 ] options['t'] = [ 'touch' , 'Display which entities are touched when touching the variable given as an argument.', 1 ]
options['v'] = [ 'version' , 'Prints version of irpf90', 0 ] options['v'] = [ 'version' , 'Prints version of irpf90', 0 ]
options['w'] = [ 'warnings' , 'Activate Warnings', 0 ]
options['z'] = [ 'openmp' , 'Activate for OpenMP code', 0 ] options['z'] = [ 'openmp' , 'Activate for OpenMP code', 0 ]
class CommandLine(object): class CommandLine(object):
@ -161,6 +162,15 @@ or
return self._coarray return self._coarray
coarray = property(fget=coarray) coarray = property(fget=coarray)
def warnings(self):
if '_warnings' not in self.__dict__:
self._warnings= False
for o,a in self.opts:
if o in [ "-w", '--'+options['w'][0] ]:
self._warnings= True
return self._warnings
do_warnings = property(fget=warnings)
def openmp(self): def openmp(self):
if '_openmp' not in self.__dict__: if '_openmp' not in self.__dict__:
self._openmp = False self._openmp = False

4
src/error.py
View File

@ -27,6 +27,8 @@
import sys import sys
from irpf90_t import * from irpf90_t import *
from command_line import command_line
do_warnings = command_line.do_warnings
###################################################################### ######################################################################
def fail(line,message): def fail(line,message):
@ -43,6 +45,8 @@ Error:
###################################################################### ######################################################################
def warn(line,message): def warn(line,message):
if not command_line.do_warnings:
return
if line is not None: if line is not None:
assert isinstance(line,Line) assert isinstance(line,Line)
print """ print """

3
src/init.py
View File

@ -75,7 +75,8 @@ def init():
try: try:
file = open(filename,"r") file = open(filename,"r")
except IOError: except IOError:
print "Warning : Unable to read file %s."%(filename) if command_line.do_warnings:
print "Warning : Unable to read file %s."%(filename)
else: else:
buffer = file.read() buffer = file.read()
file.close() file.close()

30
src/makefile.py
View File

@ -46,9 +46,11 @@ def create():
return return
file = open(FILENAME,"w") file = open(FILENAME,"w")
t = """IRPF90 = irpf90 #-a -d t = """IRPF90 = irpf90 #-a -d
NINJA = ninja
FC = gfortran FC = gfortran
FCFLAGS= -O2 -ffree-line-length-none -I . FCFLAGS= -O2 -ffree-line-length-none -I .
NINJA = ninja
AR = ar
RANLIB = ranlib
SRC= SRC=
OBJ= OBJ=
@ -134,21 +136,21 @@ def run_make():
print >>file, "ALL_OBJ1 = $(patsubst %%, %s%%,$(notdir $(ALL_OBJ)))"%(irpdir) print >>file, "ALL_OBJ1 = $(patsubst %%, %s%%,$(notdir $(ALL_OBJ)))"%(irpdir)
print >>file, "all:$(ALL)" print >>file, "all:$(ALL)"
print >>file, "\t@$(MAKE) -s move" print >>file, "\t@$(MAKE) -s move"
print >>file, "ifdef USE_IRPF90_A" # print >>file, "ifdef USE_IRPF90_A"
for m in mod: for m in mod:
if m.is_main: if m.is_main:
exe = m.filename exe = m.filename
print >>file, "%s: %s%s.irp.o %s%s.irp.module.o irpf90.a"%(exe,irpdir,exe,irpdir,exe) print >>file, "%s: %s%s.irp.o %s%s.irp.module.o IRPF90_temp/irpf90.a"%(exe,irpdir,exe,irpdir,exe)
print >>file, "\t$(FC) -o $@ %s$@.irp.o %s$@.irp.module.o irpf90.a $(LIB)"%(irpdir,irpdir) print >>file, "\t$(FC) -o $@ %s$@.irp.o %s$@.irp.module.o IRPF90_temp/irpf90.a $(LIB)"%(irpdir,irpdir)
print >>file, "\t@$(MAKE) -s move" print >>file, "\t@$(MAKE) -s move"
print >>file, "else" # print >>file, "else"
for m in mod: # for m in mod:
if m.is_main: # if m.is_main:
exe = m.filename # exe = m.filename
print >>file, "%s: %s%s.irp.o %s%s.irp.module.o $(OBJ1)"%(exe,irpdir,exe,irpdir,exe) # print >>file, "%s: %s%s.irp.o %s%s.irp.module.o $(OBJ1)"%(exe,irpdir,exe,irpdir,exe)
print >>file, "\t$(FC) -o $@ %s$@.irp.o %s$@.irp.module.o $(OBJ1) $(LIB)"%(irpdir,irpdir) # print >>file, "\t$(FC) -o $@ %s$@.irp.o %s$@.irp.module.o $(OBJ1) $(LIB)"%(irpdir,irpdir)
print >>file, "\t@$(MAKE) -s move" # print >>file, "\t@$(MAKE) -s move"
print >>file, "endif" # print >>file, "endif"
buffer = "" buffer = ""
for m in mod: for m in mod:
@ -186,8 +188,8 @@ def run_make():
print >>file, dir+"%.o: %.F\n\t$(FC) $(FCFLAGS) -c $*.F -o "+dir+"$*.o" print >>file, dir+"%.o: %.F\n\t$(FC) $(FCFLAGS) -c $*.F -o "+dir+"$*.o"
print >>file, dir+"%.irp.F90: "+IRPF90_MAKE+"\n" print >>file, dir+"%.irp.F90: "+IRPF90_MAKE+"\n"
print >>file, "move:\n\t@mv -f *.mod IRPF90_temp/ 2> /dev/null | DO_NOTHING=\n" print >>file, "move:\n\t@mv -f *.mod IRPF90_temp/ 2> /dev/null | DO_NOTHING=\n"
print >>file, "irpf90.a: $(OBJ) $(OBJ1)\n\t$(AR) crf irpf90.a $(OBJ1)\n" print >>file, "IRPF90_temp/irpf90.a: $(OBJ) $(OBJ1)\n\t$(AR) crf IRPF90_temp/irpf90.a $(OBJ1)\n"
print >>file, "clean:\n\trm -rf $(EXE) $(OBJ1) irpf90.a $(ALL_OBJ1) $(ALL)\n" print >>file, "clean:\n\trm -rf $(EXE) $(OBJ1) IRPF90_temp/irpf90.a $(ALL_OBJ1) $(ALL)\n"
print >>file, "veryclean:\n\t- $(MAKE) clean\n" print >>file, "veryclean:\n\t- $(MAKE) clean\n"
print >>file, "\t- rm -rf "+irpdir+" "+mandir+" "+IRPF90_MAKE+" irpf90_entities dist tags\n" print >>file, "\t- rm -rf "+irpdir+" "+mandir+" "+IRPF90_MAKE+" irpf90_entities dist tags\n"

4
src/modules.py
View File

@ -46,7 +46,7 @@ def write_module(m):
text = m.header + m.head text = m.header + m.head
text = map(lambda x: "%s\n"%(x),text) text = map(lambda x: "%s\n"%(x),text)
if not same_file(filename,text): if not same_file(filename,text):
print filename # print filename
file = open(filename,"w") file = open(filename,"w")
file.writelines(text) file.writelines(text)
file.close() file.close()
@ -56,7 +56,7 @@ def write_module(m):
text = m.header + m.generated_text + m.residual_text text = m.header + m.generated_text + m.residual_text
text = map(lambda x: "%s\n"%(x),text) text = map(lambda x: "%s\n"%(x),text)
if not same_file(filename,text): if not same_file(filename,text):
print filename # print filename
file = open(filename,"w") file = open(filename,"w")
file.writelines(text) file.writelines(text)
file.close() file.close()

179
src/ninja.py
View File

@ -31,11 +31,14 @@ from command_line import command_line
from modules import modules from modules import modules
irpdir = irpf90_t.irpdir irpdir = irpf90_t.irpdir
mandir = irpf90_t.mandir mandir = irpf90_t.mandir
irp_id = irpf90_t.irp_id
FILENAME = os.path.join(irpdir,"build.ninja") FILENAME = os.path.join(irpdir,"build.ninja")
cwd = os.getcwd() cwd = os.getcwd()
PRINT_WIDTH=50
def dress(f,in_root=False): def dress(f,in_root=False):
""" """
Transfoms the filename f into $PWD/IRPF90_temp/f Transfoms the filename f into $PWD/IRPF90_temp/f
@ -49,26 +52,41 @@ def dress(f,in_root=False):
def create_build_touches(list_of_other_o): def create_build_touches(list_of_other_o):
""" """
Create the build command for the irp_touches.o file. Create the build command for the irp_touches.o file and the irpf90.a library.
""" """
name = "irp_touches" name = "irp_touches"
target_o = dress("%s.irp.o"%name) short_lib = "irpf90.a"
target_F90 = dress("%s.irp.F90"%name) short_target_o = "%s.irp.o"%name
short_target_F90 = "%s.irp.F90"%name
lib = dress(short_lib)
target_o = dress(short_target_o)
target_F90 = dress(short_target_F90)
needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules ] needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules ]
list_of_modules = map(dress, needed_modules) + list_of_other_o list_of_modules = map(dress, needed_modules) + list_of_other_o
list_of_modules = ' '.join(list_of_modules) list_of_modules = ' '.join(list_of_modules)
result = '\n\n'.join( result = '\n'.join(
[ [
"build {target_o}: compile_touches {target_F90} | {list_of_modules}", "build {target_o}: compile_touches_{id} {target_F90} | {list_of_modules}",
" short_in = {short_target_F90}",
" short_out = {short_target_o}",
"",
"build {lib}: link_lib_{id} {target_o} {list_of_modules}",
" short_out = {short_lib}",
"",
] ) ] )
result = result.format( result = result.format(
target_o = target_o , id = irp_id ,
lib = lib ,
list_of_modules = list_of_modules ,
short_lib = short_lib ,
short_target_F90 = os.path.split(target_F90)[1] ,
short_target_o = os.path.split(target_o)[1] ,
target_F90 = target_F90 , target_F90 = target_F90 ,
list_of_modules = list_of_modules target_o = target_o
) )
return result return result
@ -78,16 +96,21 @@ def create_build_target(t,list_of_other_o):
""" """
name = t.filename name = t.filename
irp_lib = dress("irpf90.a")
target = dress(name,in_root=True) target = dress(name,in_root=True)
target_o = dress("%s.irp.o"%name) short_target_o = "%s.irp.o"%name
target_F90 = dress("%s.irp.F90"%name) short_target_F90 = "%s.irp.F90"%name
target_module_o = dress("%s.irp.module.o"%name) short_target_module_F90 = "%s.irp.module.F90"%name
target_module_F90 = dress("%s.irp.module.F90"%name) short_target_module_o = "%s.irp.module.o"%name
target_o = dress(short_target_o)
target_F90 = dress(short_target_F90)
target_module_o = dress(short_target_module_o)
target_module_F90 = dress(short_target_module_F90)
needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules \ needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules \
if modules[x].name in t.needed_modules ] + [ target_module_o ] if modules[x].name in t.needed_modules ] + [ target_module_o ]
list_of_o = [ target_o, target_module_o ] + list_of_other_o list_of_o = [ target_o, target_module_o, irp_lib ]
list_of_o = ' '.join(list_of_o) list_of_o = ' '.join(list_of_o)
list_of_modules = map(dress, needed_modules) + list_of_other_o list_of_modules = map(dress, needed_modules) + list_of_other_o
@ -95,21 +118,35 @@ def create_build_target(t,list_of_other_o):
list_of_includes = ' '.join(map(lambda x: dress(x,in_root=True), t.includes)) list_of_includes = ' '.join(map(lambda x: dress(x,in_root=True), t.includes))
result = '\n\n'.join( result = '\n'.join(
[ "build {target}: link {list_of_o}", [ "build {target}: link_{id} {list_of_o}",
"build {target_o}: compile_fortran {target_F90} | {list_of_modules} {list_of_includes}", " short_out = {short_target}",
"build {target_module_o}: compile_fortran {target_module_F90}" "",
"build {target_o}: compile_fortran_{id} {target_F90} | {list_of_modules} {list_of_includes}",
" short_in = {short_target_F90}",
" short_out = {short_target_o}",
"",
"build {target_module_o}: compile_fortran_{id} {target_module_F90}",
" short_in = {short_target_module_F90}",
" short_out = {short_target_module_o}",
"",
] ) ] )
result = result.format( result = result.format(
target = target , id = irp_id ,
target_o = target_o , list_of_includes = list_of_includes ,
target_F90 = target_F90 , list_of_modules = list_of_modules ,
target_module_o = target_module_o , list_of_o = list_of_o ,
target_module_F90 = target_module_F90 , short_target_F90 = os.path.split(target_F90)[1] ,
list_of_o = list_of_o , short_target_module_F90 = os.path.split(target_module_F90)[1] ,
list_of_modules = list_of_modules , short_target_module_o = os.path.split(target_module_o)[1] ,
list_of_includes = list_of_includes short_target = name ,
short_target_o = os.path.split(target_o)[1] ,
target_F90 = target_F90 ,
target_module_F90 = target_module_F90 ,
target_module_o = target_module_o ,
target_o = target_o ,
target = target
) )
return result return result
@ -120,10 +157,15 @@ def create_build_non_target(t,list_of_other_o):
""" """
name = t.filename name = t.filename
target_o = dress("%s.irp.o"%name) target = dress(name,in_root=True)
target_F90 = dress("%s.irp.F90"%name) short_target_o = "%s.irp.o"%name
target_module_o = dress("%s.irp.module.o"%name) short_target_F90 = "%s.irp.F90"%name
target_module_F90 = dress("%s.irp.module.F90"%name) short_target_module_F90 = "%s.irp.module.F90"%name
short_target_module_o = "%s.irp.module.o"%name
target_o = dress(short_target_o)
target_F90 = dress(short_target_F90)
target_module_o = dress(short_target_module_o)
target_module_F90 = dress(short_target_module_F90)
needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules \ needed_modules = [ "%s.irp.module.o"%(modules[x].filename) for x in modules \
if modules[x].name in t.needed_modules ] + [ target_module_o ] if modules[x].name in t.needed_modules ] + [ target_module_o ]
@ -133,20 +175,30 @@ def create_build_non_target(t,list_of_other_o):
list_of_externals = ' '.join([ dress(x,in_root=True) for x in list_of_other_o ]) list_of_externals = ' '.join([ dress(x,in_root=True) for x in list_of_other_o ])
list_of_includes = ' '.join(map(lambda x: dress(x,in_root=True), t.includes)) list_of_includes = ' '.join(map(lambda x: dress(x,in_root=True), t.includes))
result = '\n\n'.join( result = '\n'.join(
[ [
"build {target_o}: compile_fortran {target_F90} | {list_of_modules} {list_of_externals}", "build {target_o}: compile_fortran_{id} {target_F90} | {list_of_modules} {list_of_externals}",
"build {target_module_o}: compile_fortran {target_module_F90} | {list_of_externals} {list_of_includes}" " short_in = {short_target_F90}",
" short_out = {short_target}",
"",
"build {target_module_o}: compile_fortran_{id} {target_module_F90} | {list_of_externals} {list_of_includes}",
" short_in = {short_target_F90}",
" short_out = {short_target_o}",
"",
] ) ] )
result = result.format( result = result.format(
target_o = target_o , id = irp_id ,
target_F90 = target_F90 ,
target_module_o = target_module_o ,
target_module_F90 = target_module_F90 ,
list_of_modules = list_of_modules ,
list_of_externals = list_of_externals , list_of_externals = list_of_externals ,
list_of_includes = list_of_includes list_of_includes = list_of_includes ,
list_of_modules = list_of_modules ,
short_target_F90 = os.path.split(target_F90)[1] ,
short_target = name ,
short_target_o = os.path.split(target_o)[1] ,
target_F90 = target_F90 ,
target_module_F90 = target_module_F90 ,
target_module_o = target_module_o ,
target_o = target_o
) )
return result return result
@ -164,15 +216,20 @@ def create_build_remaining(f):
target_o = target_o.replace(cwd,os.path.join(cwd,irpdir)) target_o = target_o.replace(cwd,os.path.join(cwd,irpdir))
if extension.lower() in [ 'f', 'f90' ]: if extension.lower() in [ 'f', 'f90' ]:
result = "build {target_o}: compile_fortran {target_i}" result = [ "build {target_o}: compile_fortran_{id} {target_i}" ]
elif extension.lower() in [ 'c' ]: elif extension.lower() in [ 'c' ]:
result = "build {target_o}: compile_c {target_i}" result = [ "build {target_o}: compile_c_{id} {target_i}" ]
elif extension.lower() in [ 'cxx', 'cpp' ]: elif extension.lower() in [ 'cxx', 'cpp' ]:
result = "build {target_o}: compile_cxx {target_i}" result = [ "build {target_o}: compile_cxx_{id} {target_i}" ]
result = result.format( result += [ " short_in = {short_target_i}",
" short_out = {short_target_o}", "" ]
result = '\n'.join(result).format(
target_o = target_o, target_o = target_o,
target_i = target_i target_i = target_i,
short_target_o = os.path.split(target_o)[1],
short_target_i = os.path.split(target_i)[1],
id = irp_id
) )
return result return result
@ -214,6 +271,9 @@ def run():
try: FC = os.environ["FC"] try: FC = os.environ["FC"]
except KeyError: FC="gfortran -ffree-line-length-none -I ." except KeyError: FC="gfortran -ffree-line-length-none -I ."
try: AR = os.environ["AR"]
except KeyError: AR="ar"
try: CC = os.environ["CC"] try: CC = os.environ["CC"]
except KeyError: CC="gcc -I ." except KeyError: CC="gcc -I ."
@ -253,22 +313,32 @@ def run():
# Rules # Rules
t = [ "rule compile_fortran" , t = [ "rule compile_fortran_{id}",
" command = {FC} {FCFLAGS} -c $in -o $out".format(FC=FC, FCFLAGS=FCFLAGS), " command = {FC} {FCFLAGS} -c $in -o $out",
" description = F : $short_in -> $short_out",
"", "",
"rule compile_touches" , "rule compile_touches_{id}",
" command = {FC} -c $in -o $out".format(FC=FC, FCFLAGS=FCFLAGS), " command = {FC} -c $in -o $out",
" description = F : $short_in -> $short_out",
"", "",
"rule compile_c" ,
" command = {CC} {CFLAGS} -c $in -o $out".format(CC=CC, CFLAGS=CFLAGS),
"", "",
"rule compile_cxx" , "rule compile_c_{id}" ,
" command = {CXX} {CXXFLAGS} -c $in -o $out".format(CXX=CXX, CXXFLAGS=CXXFLAGS), " command = {CC} {CFLAGS} -c $in -o $out",
" description = C : $short_in -> $short_out",
"", "",
"rule link", "rule compile_cxx_{id}",
" command = {FC} $in {LIB} -o $out".format(FC=FC, LIB=LIB) ] " command = {CXX} {CXXFLAGS} -c $in -o $out",
" description = C++ : $short_in -> $short_out",
"",
"rule link_lib_{id}",
" command = {AR} crf $out $in" ,
" description = Link: $short_out",
"",
"rule link_{id}",
" command = {FC} $in {LIB} -o $out" ,
" description = Link: $short_out"]
output = [ '\n'.join(t) ] output = [ '\n'.join(t).format(id=irp_id, FC=FC, FCFLAGS=FCFLAGS, LIB=LIB, CXX=CXX, CXXFLAGS=CXXFLAGS, CC=CC, CFLAGS=CFLAGS, AR=AR) ]
# All modules : list of Fmodule objects # All modules : list of Fmodule objects
@ -323,6 +393,7 @@ def run():
for i in l_targets: for i in l_targets:
output.append(create_build_target(i, l_common_o)) output.append(create_build_target(i, l_common_o))
# output.append(create_build_target(i))
# Remaining files # Remaining files
for i in l_common_s: for i in l_common_s:
@ -333,7 +404,7 @@ def run():
f.write('\n\n'.join(output)) f.write('\n\n'.join(output))
f.write('\n') f.write('\n')
create_irpf90_make([ x.filename for x in l_targets ]) create_irpf90_make([ x.filename for x in l_targets ] + [ os.path.join(irpdir,'irpf90.a') ] )
return return