zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffr: fix mpi programs to use mpi compiler wrapper. (#16948)

Browse Source
This commit is contained in:
Toyohisa Kameyama 2020-06-07 06:30:43 +09:00 committed by GitHub
parent 8f291c7e95
commit 7bc44fa165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/spack/repos/builtin/packages/ffr/package.py
View File

@ -42,7 +42,8 @@ def edit(self, spec, prefix):
elif spec.satisfies('%fj'): elif spec.satisfies('%fj'):
fflags.append('-Fwide') fflags.append('-Fwide')
d = find('.', 'src_main', recursive=True) d = find('.', 'src_main', recursive=True)
root_dir = os.path.dirname(d[0]) src_main = d[0]
root_dir = os.path.dirname(src_main)
make = join_path(root_dir, 'src_pre', 'src', 'Makefile') make = join_path(root_dir, 'src_pre', 'src', 'Makefile')
os.chmod(make, 0o644) os.chmod(make, 0o644)
filter_file('#CSRCS =.*$', 'CSRCS = kmetis_main.c io.c', make) filter_file('#CSRCS =.*$', 'CSRCS = kmetis_main.c io.c', make)
@ -51,9 +52,17 @@ def edit(self, spec, prefix):
'LIBPRE = ' + spec['metis'].libs.ld_flags, 'LIBPRE = ' + spec['metis'].libs.ld_flags,
make make
) )
make = join_path(src_main, 'src', 'Makefile')
os.chmod(make, 0o644)
with open(make, 'a') as m:
m.write('module_hpc.o: module_hpc.f\n')
m.write('\t$(MPI_F90) $(FFLAGS) -c $<\n')
m.write('\n')
m.write('hpc.o: hpc.f\n')
m.write('\t$(MPI_F90) $(FFLAGS) -c $<\n')
if spec.satisfies('@3.0_000'): if spec.satisfies('@3.0_000'):
d = find('.', 'src_main', recursive=True)
root_dir = os.path.dirname(d[0])
for d in ['src_pre', 'FFR2VIZ']: for d in ['src_pre', 'FFR2VIZ']:
workdir = join_path(root_dir, d, 'src') workdir = join_path(root_dir, d, 'src')
make = join_path(workdir, 'Makefile') make = join_path(workdir, 'Makefile')