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

More fixes based on comments from reviewers. Switch using extend to using append, remove additional setting of PATH and LD_LIBRARY_PATH that should not be required due to RPATH.

Browse Source
This commit is contained in:
Jim Galarowicz 2016-10-13 20:37:55 -07:00
parent b57375977a
commit eb9e2a2c24
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/cbtf-krell/package.py
View File

@ -138,32 +138,32 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions):
# openmpi # openmpi
if '+openmpi' in spec: if '+openmpi' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DOPENMPI_DIR=%s' % spec['openmpi'].prefix '-DOPENMPI_DIR=%s' % spec['openmpi'].prefix
]) ])
# mpich # mpich
if '+mpich' in spec: if '+mpich' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DMPICH_DIR=%s' % spec['mpich'].prefix '-DMPICH_DIR=%s' % spec['mpich'].prefix
]) ])
# mpich2 # mpich2
if '+mpich2' in spec: if '+mpich2' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DMPICH2_DIR=%s' % spec['mpich2'].prefix '-DMPICH2_DIR=%s' % spec['mpich2'].prefix
]) ])
# mvapich # mvapich
if '+mvapich' in spec: if '+mvapich' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DMVAPICH_DIR=%s' % spec['mvapich'].prefix '-DMVAPICH_DIR=%s' % spec['mvapich'].prefix
]) ])
# mvapich2 # mvapich2
if '+mvapich2' in spec: if '+mvapich2' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix '-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix
]) ])
# mpt # mpt
if '+mpt' in spec: if '+mpt' in spec:
MPIOptions.extend([ MPIOptions.append([
'-DMPT_DIR=%s' % spec['mpt'].prefix '-DMPT_DIR=%s' % spec['mpt'].prefix
]) ])

23
var/spack/repos/builtin/packages/openspeedshop/package.py
View File

@ -176,22 +176,22 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions):
# openmpi # openmpi
if '+openmpi' in spec: if '+openmpi' in spec:
MPIOptions.extend(['-DOPENMPI_DIR=%s' % spec['openmpi'].prefix]) MPIOptions.append(['-DOPENMPI_DIR=%s' % spec['openmpi'].prefix])
# mpich # mpich
if '+mpich' in spec: if '+mpich' in spec:
MPIOptions.extend(['-DMPICH_DIR=%s' % spec['mpich'].prefix]) MPIOptions.append(['-DMPICH_DIR=%s' % spec['mpich'].prefix])
# mpich2 # mpich2
if '+mpich2' in spec: if '+mpich2' in spec:
MPIOptions.extend(['-DMPICH2_DIR=%s' % spec['mpich2'].prefix]) MPIOptions.append(['-DMPICH2_DIR=%s' % spec['mpich2'].prefix])
# mvapich # mvapich
if '+mvapich' in spec: if '+mvapich' in spec:
MPIOptions.extend(['-DMVAPICH_DIR=%s' % spec['mvapich'].prefix]) MPIOptions.append(['-DMVAPICH_DIR=%s' % spec['mvapich'].prefix])
# mvapich2 # mvapich2
if '+mvapich2' in spec: if '+mvapich2' in spec:
MPIOptions.extend(['-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix]) MPIOptions.append(['-DMVAPICH2_DIR=%s' % spec['mvapich2'].prefix])
# mpt # mpt
if '+mpt' in spec: if '+mpt' in spec:
MPIOptions.extend(['-DMPT_DIR=%s' % spec['mpt'].prefix]) MPIOptions.append(['-DMPT_DIR=%s' % spec['mpt'].prefix])
cmakeOptions.extend(MPIOptions) cmakeOptions.extend(MPIOptions)
@ -202,13 +202,10 @@ def setup_environment(self, spack_env, run_env):
# of OpenSpeedShop # of OpenSpeedShop
run_env.prepend_path('PATH', self.prefix.bin) run_env.prepend_path('PATH', self.prefix.bin)
# sqlite3 path # Find Dyninst library path, this is needed to
run_env.prepend_path('PATH', self.spec['sqlite'].prefix.bin) # set the DYNINSTAPI_RT_LIB library which is
# required for OpenSpeedShop to find loop level
# python path # performance information
run_env.prepend_path('PATH', self.spec['python'].prefix.bin)
# Find Dyninst library path
dyninst_libdir = find_libraries(['libdyninstAPI_RT'], dyninst_libdir = find_libraries(['libdyninstAPI_RT'],
root=self.spec['dyninst'].prefix, root=self.spec['dyninst'].prefix,
shared=True, recurse=True) shared=True, recurse=True)