diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..8fb2226 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,5 @@ +default: $(wildcard %.py) + ./cython_setup.py build_ext --inplace + +clean: + rm *.c *.so *.pyc 2>/dev/null diff --git a/src/cython_setup.py b/src/cython_setup.py new file mode 100755 index 0000000..4925a95 --- /dev/null +++ b/src/cython_setup.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +from distutils.core import setup +from distutils.extension import Extension +from Cython.Distutils import build_ext +import os + +to_remove = """cython_setup.py command_line.py irpf90.py""".split() +ext_modules = [] + +files = os.listdir('.') +for file in to_remove: + files.remove(file) + +for file in files: + if file.endswith(".py"): + module = file.split('.')[0] + ext_modules += [ Extension(module,[file]) ] + + +setup( + name = 'IRPF90 extensions', + cmdclass = {'build_ext': build_ext}, + ext_modules = ext_modules +) + + diff --git a/src/parsed_text.py b/src/parsed_text.py index 95e0ab1..1f88624 100644 --- a/src/parsed_text.py +++ b/src/parsed_text.py @@ -303,8 +303,7 @@ def build_sub_needs(): if sub is not None: if type(line) == Declaration: sub._to_provide += vars - else: - sub._needs += vars + sub._needs += vars build_sub_needs() @@ -534,9 +533,10 @@ parsed_text = perform_loop_substitutions() ###################################################################### if __name__ == '__main__': for i in range(len(parsed_text)): - if parsed_text[i][0] == 'ao_oneD.irp.f': + if parsed_text[i][0] == sys.argv[1]: print '!-------- %s -----------'%(parsed_text[i][0]) for line in parsed_text[i][1]: print line[1] print line[0], line[1].filename - + for i in subroutines: + print i, subroutines[i].needs, subroutines[i].to_provide diff --git a/src/version.py b/src/version.py index 9aaf21b..e69e13e 100644 --- a/src/version.py +++ b/src/version.py @@ -1 +1 @@ -version = "1.2.7" +version = "1.2.8"