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

Change back the previous boost change and change the mrnet variant name to lwthreads.

Browse Source
This commit is contained in:
Jim Galarowicz 2015-12-17 07:41:49 -08:00
parent 8df4fd9e94
commit c02cbaecd8
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/packages/boost/package.py
View File

@ -58,8 +58,7 @@ def url_for_version(self, version):
parts = [str(p) for p in Version(version)]
dots = ".".join(parts)
underscores = "_".join(parts)
#return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
return "http://downloads.sourceforge.net/project/boost/boost/%s.0/boost_%s_0.tar.bz2" % (
return "http://downloads.sourceforge.net/project/boost/boost/%s/boost_%s.tar.bz2" % (
dots, underscores)
def determine_toolset(self):

7
var/spack/packages/cbtf-argonavis/package.py
View File

@ -33,7 +33,7 @@ class CbtfArgonavis(Package):
depends_on("papi")
depends_on("cbtf")
depends_on("cbtf-krell")
#depends_on("cuda")
depends_on("cuda")
parallel = False
@ -43,8 +43,8 @@ def install(self, spec, prefix):
cmake_prefix_path = join_path(spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix)
# FIXME, hard coded for testing purposes, we will alter when the external package feature is available
cuda_prefix_path = "/opt/cudatoolkit-6.5"
cupti_prefix_path = "/opt/cudatoolkit-6.5/extras/CUPTI"
cuda_prefix_path = "/usr/local/cudatoolkit-6.0"
cupti_prefix_path = "/usr/local/cudatoolkit-6.0/extras/CUPTI"
with working_dir('CUDA'):
@ -56,6 +56,7 @@ def install(self, spec, prefix):
'-DCUDA_INSTALL_PATH=%s' % cuda_prefix_path,
'-DCUDA_ROOT=%s' % cuda_prefix_path,
'-DCUPTI_ROOT=%s' % cupti_prefix_path,
'-DCUDA_DIR=%s' % cuda_prefix_path,
'-DPAPI_ROOT=%s' % spec['papi'].prefix,
'-DCBTF_PREFIX=%s' % spec['cbtf'].prefix,
*std_cmake_args)

4
var/spack/packages/cbtf-krell/package.py
View File

@ -38,9 +38,9 @@ class CbtfKrell(Package):
depends_on("binutils@2.24+krellpatch")
# collectionTool
depends_on("boost@1.50")
depends_on("boost@1.50.0")
depends_on("dyninst@8.2.1")
depends_on("mrnet@4.1.0:+krelloptions")
depends_on("mrnet@4.1.0:+lwthreads")
depends_on("xerces-c@3.1.1:")
depends_on("cbtf")

2
var/spack/packages/cbtf-lanl/package.py
View File

@ -32,7 +32,7 @@ class CbtfLanl(Package):
# Dependencies for cbtf-krell
depends_on("boost@1.50")
depends_on("mrnet@4.1.0+krelloptions")
depends_on("mrnet@4.1.0:+lwthreads")
depends_on("xerces-c@3.1.1:")
depends_on("cbtf")
depends_on("cbtf-krell")

7
var/spack/packages/cbtf/package.py
View File

@ -32,9 +32,9 @@ class Cbtf(Package):
version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf/cbtf')
depends_on("cmake")
#depends_on("boost@1.42:")
depends_on("boost@1.50")
depends_on("mrnet@4.1.0+krelloptions")
#depends_on("boost@1.42.0:")
depends_on("boost@1.50.0")
depends_on("mrnet@4.1.0+lwthreads")
depends_on("xerces-c@3.1.1:")
depends_on("libxml2")
@ -43,7 +43,6 @@ class Cbtf(Package):
def install(self, spec, prefix):
with working_dir('build', create=True):
# Boost_NO_SYSTEM_PATHS Set to TRUE to suppress searching
# in system paths (or other locations outside of BOOST_ROOT
# or BOOST_INCLUDEDIR). Useful when specifying BOOST_ROOT.

4
var/spack/packages/mrnet/package.py
View File

@ -8,14 +8,14 @@ class Mrnet(Package):
version('4.0.0', 'd00301c078cba57ef68613be32ceea2f')
version('4.1.0', '5a248298b395b329e2371bf25366115c')
variant('krelloptions', default=False, description="Also build the MRNet LW threadsafe libraries")
variant('lwthreads', default=False, description="Also build the MRNet LW threadsafe libraries")
parallel = False
depends_on("boost")
def install(self, spec, prefix):
# Build the MRNet LW thread safe libraries when the krelloptions variant is present
if '+krelloptions' in spec:
if '+lwthreads' in spec:
configure("--prefix=%s" %prefix, "--enable-shared", "--enable-ltwt-threadsafe")
else:
configure("--prefix=%s" %prefix, "--enable-shared")

6
var/spack/packages/openspeedshop/package.py
View File

@ -63,7 +63,7 @@ class Openspeedshop(Package):
depends_on("libelf")
depends_on("libdwarf")
depends_on("sqlite")
depends_on("boost@1.50")
depends_on("boost@1.50.0")
depends_on("dyninst@8.2.1")
depends_on("python")
depends_on("qt@3.3.8b+krellpatch")
@ -79,8 +79,8 @@ class Openspeedshop(Package):
# Dependencies only for the openspeedshop cbtf package.
depends_on("cbtf", when='+cbtf')
depends_on("cbtf-krell", when='+cbtf')
#depends_on("cbtf-argonavis", when='+cbtf')
depends_on("mrnet@4.1.0:+krelloptions", when='+cbtf')
depends_on("cbtf-argonavis", when='+cbtf')
depends_on("mrnet@4.1.0:+lwthreads", when='+cbtf')
def install(self, spec, prefix):