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

More review related changes. Update MPIOption.append lines and take out xercesc references.

Browse Source
This commit is contained in:
Jim Galarowicz 2016-10-14 08:04:07 -07:00
parent eb9e2a2c24
commit 1eb2b445aa
2 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,34 +138,22 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions):
# openmpi # openmpi
if '+openmpi' in spec: if '+openmpi' in spec:
MPIOptions.append([ 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.append([ 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.append([ 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.append([ 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.append([ 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.append([ MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix)
'-DMPT_DIR=%s' % spec['mpt'].prefix
])
cmakeOptions.extend(MPIOptions) cmakeOptions.extend(MPIOptions)

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

@ -140,13 +140,6 @@ class Openspeedshop(Package):
depends_on("cbtf-argonavis", when='+cbtf+cuda') depends_on("cbtf-argonavis", when='+cbtf+cuda')
depends_on("mrnet@5.0.1:+lwthreads", when='+cbtf') depends_on("mrnet@5.0.1:+lwthreads", when='+cbtf')
# We don't need this for building, but to complete the
# runtime module file
# It is required in cbtf, so it will be available and not
# cause another rebuild
depends_on("xerces-c@3.1.1:", when='+cbtf')
def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions): def adjustBuildTypeParams_cmakeOptions(self, spec, cmakeOptions):
# Sets build type parameters into cmakeOptions the # Sets build type parameters into cmakeOptions the
# options that will enable the cbtf-krell built type settings # options that will enable the cbtf-krell built type settings
@ -176,22 +169,22 @@ def set_mpi_cmakeOptions(self, spec, cmakeOptions):
# openmpi # openmpi
if '+openmpi' in spec: if '+openmpi' in spec:
MPIOptions.append(['-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.append(['-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.append(['-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.append(['-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.append(['-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.append(['-DMPT_DIR=%s' % spec['mpt'].prefix]) MPIOptions.append('-DMPT_DIR=%s' % spec['mpt'].prefix)
cmakeOptions.extend(MPIOptions) cmakeOptions.extend(MPIOptions)