hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update package to use MPI compile wrappers as specified in MPI package. (#1985)

Browse source 
+ Previouly, these strings were hard coded to 'mpicc', 'mpic++', and 'mpifort'.
This commit is contained in:
Kelly Thompson 2016-10-10 16:33:00 -06:00 committed by Todd Gamblin
parent c2ca8693e9
commit 29fc9cd22c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/hdf5/package.py
View file

@ -121,16 +121,14 @@ def install(self, spec, prefix):
# this is not actually a problem. # this is not actually a problem.
extra_args.extend([ extra_args.extend([
"--enable-parallel", "--enable-parallel",
"CC=%s" % join_path(spec['mpi'].prefix.bin, "mpicc"), "CC=%s" % spec['mpi'].mpicc
]) ])
if '+cxx' in spec: if '+cxx' in spec:
extra_args.append("CXX=%s" % join_path(spec['mpi'].prefix.bin, extra_args.append("CXX=%s" % spec['mpi'].mpicxx)
"mpic++"))
if '+fortran' in spec: if '+fortran' in spec:
extra_args.append("FC=%s" % join_path(spec['mpi'].prefix.bin, extra_args.append("FC=%s" % spec['mpi'].mpifc)
"mpifort"))
if '+szip' in spec: if '+szip' in spec:
extra_args.append("--with-szlib=%s" % spec['szip'].prefix) extra_args.append("--with-szlib=%s" % spec['szip'].prefix)
@ -173,7 +171,7 @@ def check_install(self, spec):
with open("check.c", 'w') as f: with open("check.c", 'w') as f:
f.write(source) f.write(source)
if '+mpi' in spec: if '+mpi' in spec:
cc = which(join_path(spec['mpi'].prefix.bin, "mpicc")) cc = which('%s' % spec['mpi'].mpicc)
else: else:
cc = which('cc') cc = which('cc')
# TODO: Automate these path and library settings # TODO: Automate these path and library settings