OSDN > 軟體搜索 > 軟體開發 > User Interfaces > aotus > SCM > hg > main > 提交

aotus
Fork

main: 提交

Main development repository for Aotus.

修訂	4fa673aff68204080a00c2cb952c1a84d7e58a31 (tree)
時間	2018-06-19 17:55:30
作者	Raphael Haupt <Raphael.Haupt@stud...>
Commiter	Raphael Haupt

added precompiler flagset to fotran_compiler.py

diff -r 273aa419fc33 -r 4fa673aff682 fortran_compiler.py

--- a/fortran_compiler.py Tue Apr 17 00:58:48 2018 +0200

+++ b/fortran_compiler.py Tue Jun 19 10:55:30 2018 +0200

		@@ -37,6 +37,7 @@
37	37	fcopts['BENCH', 'optimize'] = ['-O3', '-march=native']
38	38	fcopts['BENCH', 'openmp'] = ['-fopenmp']
39	39	fcopts['BENCH', 'noomp'] = []
	40	+fcopts['BENCH', 'pre'] = []
40	41	fcopts['BENCH', 'profile'] = ['-pg']
41	42	fcopts['BENCH', 'fixform'] = ['-ffixed-form']
42	43	fcopts['BENCH', 'freeform'] = ['-ffree-form']

		@@ -49,6 +50,7 @@
49	50	fcopts['GFORTRAN', 'optimize'] = ['-O3', '-march=native']
50	51	fcopts['GFORTRAN', 'openmp'] = ['-fopenmp']
51	52	fcopts['GFORTRAN', 'noomp'] = []
	53	+fcopts['GFORTRAN', 'pre'] = ['-cpp']
52	54	fcopts['GFORTRAN', 'profile'] = ['-pg']
53	55	fcopts['GFORTRAN', 'fixform'] = ['-ffixed-form']
54	56	fcopts['GFORTRAN', 'freeform'] = ['-ffree-form']

		@@ -61,6 +63,7 @@
61	63	fcopts['IFORT', 'optimize'] = '-xHost -O3 -ipo -no-prec-div'.split()
62	64	fcopts['IFORT', 'openmp'] = ['-qopenmp']
63	65	fcopts['IFORT', 'noomp'] = []
	66	+fcopts['IFORT', 'pre'] = ['-fpp']
64	67	fcopts['IFORT', 'profile'] = ['-qopt-report=5', '-pg']
65	68	fcopts['IFORT', 'fixform'] = []
66	69	fcopts['IFORT', 'freeform'] = []

		@@ -73,6 +76,7 @@
73	76	fcopts['IFORTwin', 'optimize'] = '/QxHost /O3 /Qprec-div-'.split()
74	77	fcopts['IFORTwin', 'openmp'] = ['/Qopenmp']
75	78	fcopts['IFORTwin', 'noomp'] = []
	79	+fcopts['IFORTwin', 'pre'] = ['/fpp']
76	80	fcopts['IFORTwin', 'profile'] = ['/Qopt-report:5']
77	81	fcopts['IFORTwin', 'fixform'] = []
78	82	fcopts['IFORTwin', 'freeform'] = []

		@@ -85,6 +89,7 @@
85	89	fcopts['SOL', 'optimize'] = ['-fast', '-xipo']
86	90	fcopts['SOL', 'openmp'] = []
87	91	fcopts['SOL', 'noomp'] = []
	92	+fcopts['SOL', 'pre'] = ['-cpp']
88	93	fcopts['SOL', 'profile'] = ['-pg']
89	94	fcopts['SOL', 'fixform'] = []
90	95	fcopts['SOL', 'freeform'] = []

		@@ -121,6 +128,7 @@
121	128	fcopts['CRAY', 'optimize'] = ['-O3']
122	129	fcopts['CRAY', 'openmp'] = ['-h', 'omp']
123	130	fcopts['CRAY', 'noomp'] = ['-h', 'noomp']
	131	+fcopts['CRAY', 'pre'] = ['-cpp']
124	132	fcopts['CRAY', 'profile'] = ['-h', 'profile_generate', '-h', 'func_trace', '-h', 'keepfiles']
125	133	fcopts['CRAY', 'fixform'] = []
126	134	fcopts['CRAY', 'freeform'] = []

		@@ -145,6 +154,7 @@
145	154	fcopts['NEC', 'optimize'] = ['-C,hopt']
146	155	fcopts['NEC', 'openmp'] = ['-openmp']
147	156	fcopts['NEC', 'noomp'] = []
	157	+fcopts['NEC', 'pre'] = ['-cpp']
148	158	fcopts['NEC', 'profile'] = ['-ftrace','-O,fullmsg','-pvctl,fullmsg','-R,fmtlist,diaglist,summary']
149	159	fcopts['NEC', 'fixform'] = []
150	160	fcopts['NEC', 'freeform'] = []

diff -r 273aa419fc33 -r 4fa673aff682 source/aot_fun_module.f90

--- a/source/aot_fun_module.f90 Tue Apr 17 00:58:48 2018 +0200

+++ b/source/aot_fun_module.f90 Tue Jun 19 10:55:30 2018 +0200

		@@ -110,7 +110,6 @@
110	110
111	111	!> Position of the function to look up in the table.
112	112	integer, intent(in), optional :: pos
113		-
114	113	call aot_table_push(L, parent, key, pos)
115	114	fun = aot_fun_top(L)
116	115	end subroutine aot_fun_table