summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--var/spack/packages/cbtf-argonavis/package.py14
-rw-r--r--var/spack/packages/cbtf-krell/package.py12
-rw-r--r--var/spack/packages/cbtf-lanl/package.py9
-rw-r--r--var/spack/packages/cbtf/package.py11
-rw-r--r--var/spack/packages/openspeedshop/package.py42
5 files changed, 53 insertions, 35 deletions
diff --git a/var/spack/packages/cbtf-argonavis/package.py b/var/spack/packages/cbtf-argonavis/package.py
index 5f76a18dae..2dccb0e0c6 100644
--- a/var/spack/packages/cbtf-argonavis/package.py
+++ b/var/spack/packages/cbtf-argonavis/package.py
@@ -23,14 +23,13 @@ class CbtfArgonavis(Package):
libraries that was done as a result of a DOE SBIR grant."""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
- url = "http://sourceforge.net/projects/cbtf/files/cbtf-1.5/cbtf-argonavis-1.5.tar.gz/download"
- version('1.5', '8708197dbc08980fcd7b1a3a3a40a2c9')
-
# Mirror access template example
- #url = "file:/opt/spack-mirror-2015-02-27/cbtf-argonavis/cbtf-argonavis-1.5.tar.gz"
+ #url = "file:/g/g24/jeg/cbtf-argonavis-1.5.tar.gz"
#version('1.5', '1f7f6512f55409ed2135cfceabe26b82')
- depends_on("cmake")
+ version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf-argonavis/cbtf-argonavis')
+
+ depends_on("cmake@3.0.2:")
depends_on("papi")
depends_on("cbtf")
depends_on("cbtf-krell")
@@ -44,8 +43,9 @@ class CbtfArgonavis(Package):
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 = "/usr/local/cuda-6.0"
- cupti_prefix_path = "/usr/local/cuda-6.0/extras/CUPTI"
+ cuda_prefix_path = "/opt/cudatoolkit-6.5"
+ cupti_prefix_path = "/opt/cudatoolkit-6.5/extras/CUPTI"
+
with working_dir('CUDA'):
with working_dir('build', create=True):
diff --git a/var/spack/packages/cbtf-krell/package.py b/var/spack/packages/cbtf-krell/package.py
index 0661b101a1..3f486b86ce 100644
--- a/var/spack/packages/cbtf-krell/package.py
+++ b/var/spack/packages/cbtf-krell/package.py
@@ -25,13 +25,12 @@ class CbtfKrell(Package):
HPC levels of scale."""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
- url = "http://sourceforge.net/projects/cbtf/files/cbtf-1.5/cbtf-krell-1.5.tar.gz/download"
- version('1.5', '86cca5aa48a65206d3ac5502fcbd3ef6')
-
# optional mirror access template
- #url = "file:/opt/spack-mirror-2015-02-27/cbtf-krell/cbtf-krell-1.5.tar.gz"
+ #url = "file:/g/g24/jeg/cbtf-krell-1.5.tar.gz"
#version('1.5', 'b13f6df6a93c44149d977773dd776d2f')
+ version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf-krell/cbtf-krell')
+
# Dependencies for cbtf-krell
@@ -39,7 +38,7 @@ class CbtfKrell(Package):
depends_on("binutils@2.24+krellpatch")
# collectionTool
- depends_on("boost@1.41:")
+ depends_on("boost@1.42:")
depends_on("dyninst@8.2.1:+krelloptions")
depends_on("mrnet@4.1.0:+krelloptions")
depends_on("xerces-c@3.1.1:")
@@ -66,6 +65,8 @@ class CbtfKrell(Package):
# FIXME - hard code path until external package support is available
# Need to change this path and/or add additional paths for MPI experiment support on different platforms
openmpi_prefix_path = "/opt/openmpi-1.8.2"
+ mvapich_prefix_path = "/usr/local/tools/mvapich-gnu"
+
# Other possibilities, they will need a -DMVAPICH_DIR=, etc clause in the cmake command to be recognized
# mvapich_prefix_path = "<mvapich install path>"
# mvapich2_prefix_path = "<mvapich2 install path>"
@@ -106,6 +107,7 @@ class CbtfKrell(Package):
'-DCUDA_DIR=%s' % cuda_prefix_path,
'-DCUPTI_DIR=%s' % cupti_prefix_path,
'-DOPENMPI_DIR=%s' % openmpi_prefix_path,
+ '-DMVAPICH_DIR=%s' % mvapich_prefix_path,
*std_cmake_args)
make("clean")
diff --git a/var/spack/packages/cbtf-lanl/package.py b/var/spack/packages/cbtf-lanl/package.py
index b833871df7..25f91d8c2f 100644
--- a/var/spack/packages/cbtf-lanl/package.py
+++ b/var/spack/packages/cbtf-lanl/package.py
@@ -22,15 +22,16 @@ class CbtfLanl(Package):
"""CBTF LANL project contains a memory tool and data center type system command monitoring tool."""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
- url = "http://sourceforge.net/projects/cbtf/files/cbtf-1.5/cbtf-lanl-1.5.tar.gz/download"
- version('1.5', '78d42050f9ec7127e8d0a93d87a66702')
# Mirror access template example
- #url = "file:/opt/spack-mirror-2015-02-27/cbtf-lanl/cbtf-lanl-1.5.tar.gz"
+ #url = "file:/g/g24/jeg/cbtf-lanl-1.5.tar.gz"
#version('1.5', 'c3f78f967b0a42c6734ce4be0e602426')
+ version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf-lanl/cbtf-lanl')
+
+
# Dependencies for cbtf-krell
- depends_on("boost@1.41:")
+ depends_on("boost@1.42:")
depends_on("mrnet@4.1.0+krelloptions")
depends_on("xerces-c@3.1.1:")
depends_on("cbtf")
diff --git a/var/spack/packages/cbtf/package.py b/var/spack/packages/cbtf/package.py
index d2023ada85..46d47153e6 100644
--- a/var/spack/packages/cbtf/package.py
+++ b/var/spack/packages/cbtf/package.py
@@ -24,18 +24,15 @@ class Cbtf(Package):
networks into sequential and distributed network tools."""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home"
- url = "http://sourceforge.net/projects/cbtf/files/cbtf-1.5/cbtf-1.5.tar.gz/download"
- version('1.5', '75a97e0161d19b3a12305ed1ffb3d3e2')
-
# Mirror access template example
- #url = "file:/opt/spack-mirror-2015-02-27/cbtf/cbtf-1.5.tar.gz"
- #version('1.5', '1ca88a8834759c4c74452cb97fe7b70a')
+ #url = "file:/g/g24/jeg/cbtf-1.5.tar.gz"
+ #version('1.6', '1ca88a8834759c4c74452cb97fe7b70a')
# Use when the git repository is available
- #version('1.5', branch='master', git='http://git.code.sf.net/p/cbtf/cbtf')
+ version('1.6', branch='master', git='http://git.code.sf.net/p/cbtf/cbtf')
depends_on("cmake")
- depends_on("boost@1.41:")
+ depends_on("boost@1.42:")
depends_on("mrnet@4.1.0+krelloptions")
depends_on("xerces-c@3.1.1:")
depends_on("libxml2")
diff --git a/var/spack/packages/openspeedshop/package.py b/var/spack/packages/openspeedshop/package.py
index 94fec4a21c..3c24aed882 100644
--- a/var/spack/packages/openspeedshop/package.py
+++ b/var/spack/packages/openspeedshop/package.py
@@ -30,11 +30,13 @@ class Openspeedshop(Package):
homepage = "http://www.openspeedshop.org"
url = "http://sourceforge.net/projects/openss/files/openss/openspeedshop-2.1/openspeedshop-2.1.tar.gz/download"
- version('2.1', '85ab0f883f16ea23815a670b5ec8e5d6')
+ version('2.1', '64ee17166519838c7b94a1adc138e94f')
# optional mirror template
- #url = "file:/home/jeg/OpenSpeedShop_ROOT/SOURCES/openspeedshop-2.1.tar.gz"
- #version('2.1', '85ab0f883f16ea23815a670b5ec8e5d6')
+ #url = "file:/g/g24/jeg/openspeedshop-2.1.tar.gz"
+ #version('2.1', '64ee17166519838c7b94a1adc138e94f')
+
+
parallel = False
@@ -56,7 +58,7 @@ class Openspeedshop(Package):
depends_on("libelf")
depends_on("libdwarf")
depends_on("sqlite")
- depends_on("boost@1.41:")
+ depends_on("boost@1.42:")
depends_on("dyninst@8.2.1:+krelloptions")
depends_on("python")
depends_on("qt@3.3.8b+krellpatch")
@@ -72,14 +74,14 @@ 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("cbtf-argonavis", when='+cbtf')
depends_on("mrnet@4.1.0:+krelloptions", when='+cbtf')
def install(self, spec, prefix):
openmpi_prefix_path = "/opt/openmpi-1.8.2"
+ mvapich_prefix_path = "/usr/local/tools/mvapich-gnu"
#'-DOPENMPI_DIR=%s' % spec['openmpi'].prefix,
- #'-DMPICH_DIR=%s' % spec['mpich'].prefix,
# FIXME: How do we make this dynamic in spack? That is, can we specify the paths to cuda dynamically?
# WAITING for external package support.
@@ -99,6 +101,7 @@ class Openspeedshop(Package):
'-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
'-DPAPI_DIR=%s' % spec['papi'].prefix,
'-DOPENMPI_DIR=%s' % openmpi_prefix_path,
+ '-DMVAPICH_DIR=%s' % mvapich_prefix_path,
*std_cmake_args)
make("clean")
make()
@@ -106,6 +109,8 @@ class Openspeedshop(Package):
else:
cmake_prefix_path = join_path(spec['dyninst'].prefix)
with working_dir('build', create=True):
+ #python_vers=join_path(spec['python'].version[:2])
+ python_vers='%d.%d' % spec['python'].version[:2]
cmake('..',
'-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
@@ -119,10 +124,14 @@ class Openspeedshop(Package):
'-DPAPI_DIR=%s' % spec['papi'].prefix,
'-DSQLITE3_DIR=%s' % spec['sqlite'].prefix,
'-DQTLIB_DIR=%s' % spec['qt'].prefix,
- '-DPYTHON_DIR=%s' % spec['python'].prefix,
- '-DBOOST_DIR=%s' % spec['boost'].prefix,
+ '-DPYTHON_EXECUTABLE=%s' % join_path(spec['python'].prefix + '/bin/python'),
+ '-DPYTHON_INCLUDE_DIR=%s' % join_path(spec['python'].prefix.include) + '/python' + python_vers,
+ '-DPYTHON_LIBRARY=%s' % join_path(spec['python'].prefix.lib) + '/libpython' + python_vers + '.so',
+ '-DBoost_NO_SYSTEM_PATHS=TRUE',
+ '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DOPENMPI_DIR=%s' % openmpi_prefix_path,
+ '-DMVAPICH_DIR=%s' % mvapich_prefix_path,
*std_cmake_args)
make("clean")
make()
@@ -133,6 +142,7 @@ class Openspeedshop(Package):
cmake_prefix_path = join_path(spec['cbtf'].prefix) + ':' + join_path(spec['cbtf-krell'].prefix) + ':' + join_path(spec['dyninst'].prefix)
if '+runtime' in spec:
with working_dir('build_cbtf_runtime', create=True):
+ python_vers='%d.%d' % spec['python'].version[:2]
cmake('..',
'-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
@@ -143,8 +153,11 @@ class Openspeedshop(Package):
'-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
- '-DPYTHON_DIR=%s' % spec['python'].prefix,
- '-DBOOST_DIR=%s' % spec['boost'].prefix,
+ '-DPYTHON_EXECUTABLE=%s' % join_path(spec['python'].prefix + '/bin/python'),
+ '-DPYTHON_INCLUDE_DIR=%s' % join_path(spec['python'].prefix.include) + '/python' + python_vers,
+ '-DPYTHON_LIBRARY=%s' % join_path(spec['python'].prefix.lib) + '/libpython' + python_vers + '.so',
+ '-DBoost_NO_SYSTEM_PATHS=TRUE',
+ '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
*std_cmake_args)
@@ -154,6 +167,8 @@ class Openspeedshop(Package):
else:
with working_dir('build_cbtf', create=True):
+ python_vers='%d.%d' % spec['python'].version[:2]
+ #python_vers=join_path(spec['python'].version[:2])
cmake('..',
'-DCMAKE_INSTALL_PREFIX=%s' % prefix,
'-DCMAKE_LIBRARY_PATH=%s' % prefix.lib64,
@@ -166,8 +181,11 @@ class Openspeedshop(Package):
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DQTLIB_DIR=%s' % spec['qt'].prefix,
- '-DPYTHON_DIR=%s' % spec['python'].prefix,
- '-DBOOST_DIR=%s' % spec['boost'].prefix,
+ '-DPYTHON_EXECUTABLE=%s' % join_path(spec['python'].prefix + '/bin/python'),
+ '-DPYTHON_INCLUDE_DIR=%s' % join_path(spec['python'].prefix.include) + '/python' + python_vers,
+ '-DPYTHON_LIBRARY=%s' % join_path(spec['python'].prefix.lib) + '/libpython' + python_vers + '.so',
+ '-DBoost_NO_SYSTEM_PATHS=TRUE',
+ '-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
*std_cmake_args)
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 07:58:57 +0000