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

openspeedshop and cbtf packages: new versions and dependency updates (#23254)

Browse Source 
* Add versions 1.9.4 and 1.9.4.1 for cbtf-* packages
* Add versions 2.4.2 and 2.4.2.1 for openspeedshop packages
* Remove older versions
* Switch from generic dependency on elf to a dependency on the
  elfutils implementation for cbtf-* and openspeedshop packages
* For llvm-openmp-ompt, relax dependency on libelf to elf (cbtf-krell
  now depends on elfutils, and llvm-openmp-ompt, so unless this
  dependency is relaxed there would be a conflict)
* Update CMake build_type to support Debug, Release, RelWithDebInfo
  in cbtf-* and openspeedshop packages
* Update libmonitor patches when building as a dependency of
  cbtf-krell
This commit is contained in:
Jim Galarowicz 2021-05-18 11:40:01 -05:00 committed by GitHub
parent 319f20d94f
commit 977dad4c93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 267 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/spack/repos/builtin/packages/cbtf-argonavis-gui/package.py
View File

@ -29,18 +29,18 @@ class CbtfArgonavisGui(QMakePackage):
# Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop')
depends_on("cbtf@1.9.1.0:9999", when='@1.3.0.0:9999')
depends_on("cbtf@1.9.3:9999", when='@1.3.0.0:9999')
depends_on("cbtf-krell@develop", when='@develop')
depends_on("cbtf-krell@1.9.1.0:9999", when='@1.3.0.0:9999')
depends_on("cbtf-krell@1.9.3:9999", when='@1.3.0.0:9999')
depends_on("cbtf-argonavis@develop", when='@develop')
depends_on("cbtf-argonavis@1.9.1.0:9999", when='@1.3.0.0:9999')
depends_on("cbtf-argonavis@1.9.3:9999", when='@1.3.0.0:9999')
depends_on("cuda")
depends_on("openspeedshop-utils+cuda@develop", when='@develop')
depends_on("openspeedshop-utils@2.3.1.3:+cuda", when='@1.3.0.0:9999')
depends_on("openspeedshop-utils@2.4.0:+cuda", when='@1.3.0.0:9999')
# For Xerces-C
depends_on("xerces-c")

67
var/spack/repos/builtin/packages/cbtf-argonavis/package.py
View File

@ -14,11 +14,9 @@ class CbtfArgonavis(CMakePackage):
git = "https://github.com/OpenSpeedShop/cbtf-argonavis.git"
version('develop', branch='master')
version('1.9.4.1', branch='1.9.4.1')
version('1.9.4', branch='1.9.4')
version('1.9.3', branch='1.9.3')
version('1.9.2', branch='1.9.2')
version('1.9.1.2', branch='1.9.1.2')
version('1.9.1.1', branch='1.9.1.1')
version('1.9.1.0', branch='1.9.1.0')
variant('cti', default=False,
description="Build MRNet with the CTI startup option")
@ -27,52 +25,54 @@ class CbtfArgonavis(CMakePackage):
to point to target build.")
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
depends_on("cmake@3.0.2:", type='build')
# To specify ^elfutils@0.170 on the command line spack
# apparently needs/wants this dependency explicity here
# even though it is referenced downstream
depends_on("elf", type="link")
depends_on("elfutils", type="link")
# For boost
depends_on("boost@1.66.0:1.69.0")
depends_on("boost@1.70.0:")
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop~cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999~cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999~cti', type=('build', 'link', 'run'))
# For CBTF
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999", when='@1.9.3:9999', type=('build', 'link', 'run'))
# For CBTF with cti
depends_on("cbtf@develop+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run'))
# For CBTF with runtime
depends_on("cbtf@develop+runtime", when='@develop+runtime', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999+runtime", when='@1.9.3:9999+runtime', type=('build', 'link', 'run'))
# For libmonitor
depends_on("libmonitor@2013.02.18+krellpatch", type=('build', 'link', 'run'))
depends_on("libmonitor@2013.02.18+commrank", type=('build', 'link', 'run'))
# For PAPI
depends_on("papi@5.4.1:", type=('build', 'link', 'run'))
# For CBTF-KRELL
depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.1.0:9999", when='@1.9.1.0:9999', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.3:9999", when='@1.9.3:9999', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@1.9.1.0:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+cti', when='@1.9.3:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+runtime', when='@develop+runtime', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+runtime', when='@1.9.1.0:9999+runtime', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+runtime', when='@1.9.3:9999+runtime', type=('build', 'link', 'run'))
# For CUDA
depends_on("cuda")
@ -83,25 +83,26 @@ class CbtfArgonavis(CMakePackage):
def cmake_args(self):
spec = self.spec
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
cmake_args = [
'-DCMAKE_CXX_FLAGS=%s' % compile_flags,
'-DCMAKE_C_FLAGS=%s' % compile_flags,
'-DCUDA_DIR=%s' % spec['cuda'].prefix,
'-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
'-DCMAKE_CXX_FLAGS=%s' % compile_flags,
'-DCMAKE_C_FLAGS=%s' % compile_flags,
'-DCUDA_DIR=%s' % spec['cuda'].prefix,
'-DCUDA_INSTALL_PATH=%s' % spec['cuda'].prefix,
'-DCUDA_TOOLKIT_ROOT_DIR=%s' % spec['cuda'].prefix,
'-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI,
'-DCUPTI_ROOT=%s' % spec['cuda'].prefix.extras.CUPTI,
'-DPAPI_ROOT=%s' % spec['papi'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DBoost_DIR=%s' % spec['boost'].prefix,
'-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
'-DBoost_NO_SYSTEM_PATHS=ON']
'-DCUPTI_DIR=%s' % spec['cuda'].prefix.extras.CUPTI,
'-DCUPTI_ROOT=%s' % spec['cuda'].prefix.extras.CUPTI,
'-DPAPI_ROOT=%s' % spec['papi'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DBoost_NO_SYSTEM_PATHS=TRUE',
'-DBoost_NO_BOOST_CMAKE=TRUE',
'-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DBoost_DIR=%s' % spec['boost'].prefix,
'-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix]
return cmake_args

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

@ -9,20 +9,18 @@
class CbtfKrell(CMakePackage):
"""CBTF Krell project contains the Krell Institute contributions to the
CBTF project. These contributions include many performance data
collectors and support libraries as well as some example tools
"""CBTF Krell project contains collector and runtime contributions
to the CBTF project. These contributions include many performance
data collectors and support libraries as well as some example tools
that drive the data collection at HPC levels of scale.
"""
homepage = "http://sourceforge.net/p/cbtf/wiki/Home/"
git = "https://github.com/OpenSpeedShop/cbtf-krell.git"
version('develop', branch='master')
version('1.9.4.1', branch='1.9.4.1')
version('1.9.4', branch='1.9.4')
version('1.9.3', branch='1.9.3')
version('1.9.2', branch='1.9.2')
version('1.9.1.2', branch='1.9.1.2')
version('1.9.1.1', branch='1.9.1.1')
version('1.9.1.0', branch='1.9.1.0')
# MPI variants
variant('openmpi', default=False,
@ -39,8 +37,9 @@ class CbtfKrell(CMakePackage):
description="Build mpi experiment collector for mpich MPI.")
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
variant('cti', default=False,
description="Build MRNet with the CTI startup option")
variant('crayfe', default=False,
@ -51,48 +50,48 @@ class CbtfKrell(CMakePackage):
depends_on("cmake@3.0.2:", type='build')
# For rpcgen
depends_on("rpcsvc-proto")
depends_on("rpcsvc-proto", type='build')
# For rpc
depends_on("libtirpc", type='link')
# For binutils
depends_on("binutils")
depends_on("binutils+plugins~gold@2.32")
# For boost
depends_on("boost@1.66.0:1.69.0")
depends_on("boost@1.70.0:")
# For Dyninst
depends_on("dyninst@develop", when='@develop')
depends_on("dyninst@10:", when='@1.9.1.0:9999')
depends_on("dyninst@10.1.0", when='@develop')
depends_on("dyninst@10.1.0", when='@1.9.3:9999')
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999', type=('build', 'link', 'run'))
# For Xerces-C
depends_on("xerces-c")
# For CBTF
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999", when='@1.9.3:9999', type=('build', 'link', 'run'))
# For CBTF with cti
depends_on("cbtf@develop+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999+cti", when='@1.9.3:9999+cti', type=('build', 'link', 'run'))
# For CBTF with runtime
depends_on("cbtf@develop+runtime", when='@develop+runtime', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999+runtime", when='@1.9.3:9999+runtime', type=('build', 'link', 'run'))
# for services and collectors
depends_on("libmonitor@2013.02.18+krellpatch", type=('build', 'link', 'run'))
depends_on("libmonitor@2013.02.18+commrank", type=('build', 'link', 'run'))
depends_on("libunwind", when='@develop')
depends_on("libunwind@1.2.1", when='@1.9.1.0:9999')
depends_on("libunwind@1.2.1", when='@1.9.3:9999')
depends_on("papi@5.4.1:", type=('build', 'link', 'run'))
@ -203,7 +202,7 @@ def set_cray_login_node_cmake_options(self, spec, cmake_options):
def cmake_args(self):
spec = self.spec
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
# Add in paths for finding package config files that tell us
# where to find these packages
@ -215,7 +214,11 @@ def cmake_args(self):
'-DLIBMONITOR_DIR=%s' % spec['libmonitor'].prefix,
'-DLIBUNWIND_DIR=%s' % spec['libunwind'].prefix,
'-DPAPI_DIR=%s' % spec['papi'].prefix,
'-DBOOST_DIR=%s' % spec['boost'].prefix,
'-DBoost_NO_SYSTEM_PATHS=TRUE',
'-DBoost_NO_BOOST_CMAKE=TRUE',
'-DBOOST_ROOT=%s' % spec['boost'].prefix,
'-DBoost_DIR=%s' % spec['boost'].prefix,
'-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix,
'-DDYNINST_DIR=%s' % spec['dyninst'].prefix,
'-DLIBIOMP_DIR=%s' % spec['llvm-openmp-ompt'].prefix,

29
var/spack/repos/builtin/packages/cbtf-lanl/package.py
View File

@ -14,14 +14,13 @@ class CbtfLanl(CMakePackage):
git = "https://github.com/OpenSpeedShop/cbtf-lanl.git"
version('develop', branch='master')
version('1.9.4.1', branch='1.9.4.1')
version('1.9.4', branch='1.9.4')
version('1.9.3', branch='1.9.3')
version('1.9.2', branch='1.9.2')
version('1.9.1.2', branch='1.9.1.2')
version('1.9.1.1', branch='1.9.1.1')
version('1.9.1.0', branch='1.9.1.0')
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
@ -34,33 +33,33 @@ class CbtfLanl(CMakePackage):
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.3:9999+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999')
# For Xerces-C
depends_on("xerces-c")
# For CBTF
depends_on("cbtf@develop", when='@develop')
depends_on("cbtf@1.9.1.0:9999", when='@1.9.1.0:9999')
depends_on("cbtf@1.9.3:9999", when='@1.9.3:9999')
# For CBTF with cti
depends_on("cbtf@develop+cti", when='@develop+cti')
depends_on("cbtf@1.9.1.0:9999+cti", when='@1.9.1.0:9999+cti')
depends_on("cbtf@1.9.3:9999+cti", when='@1.9.3:9999+cti')
# For CBTF with runtime
depends_on("cbtf@develop+runtime", when='@develop+runtime')
depends_on("cbtf@1.9.1.0:9999+runtime", when='@1.9.1.0:9999+runtime')
depends_on("cbtf@1.9.3:9999+runtime", when='@1.9.3:9999+runtime')
# For CBTF-KRELL
depends_on("cbtf-krell@develop", when='@develop')
depends_on("cbtf-krell@1.9.1.0:9999", when='@1.9.1.0:9999')
depends_on("cbtf-krell@1.9.3:9999", when='@1.9.3:9999')
depends_on('cbtf-krell@develop+cti', when='@develop+cti')
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@1.9.1.0:9999+cti')
depends_on('cbtf-krell@1.9.3:9999+cti', when='@1.9.3:9999+cti')
depends_on('cbtf-krell@develop+runtime', when='@develop+runtime')
depends_on('cbtf-krell@1.9.1.0:9999+runtime', when='@1.9.1.0:9999+runtime')
depends_on('cbtf-krell@1.9.3:9999+runtime', when='@1.9.3:9999+runtime')
parallel = False
@ -69,7 +68,7 @@ class CbtfLanl(CMakePackage):
def cmake_args(self):
spec = self.spec
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
cmake_args = [
'-DCMAKE_CXX_FLAGS=%s' % compile_flags,

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

@ -17,11 +17,9 @@ class Cbtf(CMakePackage):
git = "https://github.com/OpenSpeedShop/cbtf.git"
version('develop', branch='master')
version('1.9.4.1', branch='1.9.4.1')
version('1.9.4', branch='1.9.4')
version('1.9.3', branch='1.9.3')
version('1.9.2', branch='1.9.2')
version('1.9.1.2', branch='1.9.1.2')
version('1.9.1.1', branch='1.9.1.1')
version('1.9.1.0', branch='1.9.1.0')
variant('cti', default=False,
description="Build MRNet with the CTI startup option")
@ -29,8 +27,9 @@ class Cbtf(CMakePackage):
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
depends_on("cmake@3.0.2:", type='build')
@ -40,13 +39,13 @@ class Cbtf(CMakePackage):
# for rpc
depends_on("libtirpc", type='link')
depends_on("boost@1.66.0:1.69.0")
depends_on("boost@1.70.0:")
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti')
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.1.0:9999+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.1.0:9999')
depends_on("mrnet@5.0.1-3+cti", when='@1.9.3:9999+cti')
depends_on("mrnet@5.0.1-3+lwthreads", when='@1.9.3:9999')
# For Xerces-C
depends_on("xerces-c")
@ -67,7 +66,7 @@ def cmake_args(self):
# or BOOST_INCLUDEDIR). Useful when specifying BOOST_ROOT.
# Defaults to OFF.
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
if spec.satisfies('+runtime'):

77
var/spack/repos/builtin/packages/libmonitor/add-monitor-comm-rank-notification.patch Normal file
View File

@ -0,0 +1,77 @@
--- libmonitor/src/callback.c 2021-04-14 16:48:48.829169067 -0500
+++ libmonitor.fixes1/src/callback.c 2021-04-14 16:54:27.034918247 -0500
@@ -179,3 +179,10 @@
MONITOR_DEBUG1("(default callback)\n");
return 0;
}
+
+void __attribute__ ((weak))
+monitor_mpi_post_comm_rank(void)
+{
+ MONITOR_DEBUG1("(default callback)\n");
+}
+
--- libmonitor/src/monitor.h 2021-04-14 16:48:48.829169067 -0500
+++ libmonitor.fixes1/src/monitor.h 2021-04-14 16:55:21.539716667 -0500
@@ -78,6 +78,7 @@
extern void monitor_init_mpi(int *argc, char ***argv);
extern void monitor_fini_mpi(void);
extern void monitor_mpi_post_fini(void);
+extern void monitor_mpi_post_comm_rank(void);
/*
* Monitor support functions.
--- libmonitor/src/mpi_comm_c.c 2021-04-14 16:48:48.853168977 -0500
+++ libmonitor.fixes1/src/mpi_comm_c.c 2021-04-14 16:56:42.468417362 -0500
@@ -35,6 +35,7 @@
ret = (*real_mpi_comm_size)(comm, &size);
ret = (*real_mpi_comm_rank)(comm, rank);
monitor_set_mpi_size_rank(size, *rank);
+ monitor_mpi_post_comm_rank();
return (ret);
}
--- libmonitor/src/mpi_comm_f0.c 2021-04-14 16:48:48.853168977 -0500
+++ libmonitor.fixes1/src/mpi_comm_f0.c 2021-04-14 17:04:22.915714717 -0500
@@ -34,4 +34,5 @@
(*real_mpi_comm_size)(comm, &size, ierror);
(*real_mpi_comm_rank)(comm, rank, ierror);
monitor_set_mpi_size_rank(size, *rank);
+ monitor_mpi_post_comm_rank();
}
--- libmonitor/src/mpi_comm_f1.c 2021-04-14 16:48:48.853168977 -0500
+++ libmonitor.fixes1/src/mpi_comm_f1.c 2021-04-14 17:04:28.016695854 -0500
@@ -34,4 +34,5 @@
(*real_mpi_comm_size)(comm, &size, ierror);
(*real_mpi_comm_rank)(comm, rank, ierror);
monitor_set_mpi_size_rank(size, *rank);
+ monitor_mpi_post_comm_rank();
}
--- libmonitor/src/mpi_comm_f2.c 2021-04-14 16:48:48.853168977 -0500
+++ libmonitor.fixes1/src/mpi_comm_f2.c 2021-04-14 17:04:35.276669009 -0500
@@ -34,4 +34,5 @@
(*real_mpi_comm_size)(comm, &size, ierror);
(*real_mpi_comm_rank)(comm, rank, ierror);
monitor_set_mpi_size_rank(size, *rank);
+ monitor_mpi_post_comm_rank();
}
--- libmonitor/src/pmpi.c 2021-04-14 16:48:48.853168977 -0500
+++ libmonitor.fixes1/src/pmpi.c 2021-04-15 16:54:08.532018684 -0500
@@ -297,6 +297,7 @@
ret = (*real_pmpi_comm_size)(comm, &size);
ret = (*real_pmpi_comm_rank)(comm, rank);
monitor_set_mpi_size_rank(size, *rank);
+ monitor_mpi_post_comm_rank();
return (ret);
}
@@ -308,7 +309,8 @@
MONITOR_GET_REAL_NAME_WRAP(rank_var, rank_fcn); \
(*size_var)(comm, &size, ierror); \
(*rank_var)(comm, rank, ierror); \
- monitor_set_mpi_size_rank(size, *rank);
+ monitor_set_mpi_size_rank(size, *rank); \
+ monitor_mpi_post_comm_rank();
/*
* In Fortran, MPI_Comm is always int.

18
var/spack/repos/builtin/packages/libmonitor/libmonitorkrell-0000.patch
View File

@ -1,18 +0,0 @@
--- libmonitor-20130218/configure 2013-02-17 23:08:32.000000000 -0800
+++ libmonitor-20130218-fixes/configure 2013-02-18 10:34:05.237918411 -0800
@@ -3600,13 +3600,13 @@
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
if test "$GCC" = yes; then
- CFLAGS="-g -O2"
+ CFLAGS="-g -O0"
else
CFLAGS="-g"
fi
else
if test "$GCC" = yes; then
- CFLAGS="-O2"
+ CFLAGS="-O0"
else
CFLAGS=
fi

14
var/spack/repos/builtin/packages/libmonitor/package.py
View File

@ -26,16 +26,18 @@ class Libmonitor(AutotoolsPackage):
variant('hpctoolkit', default=False,
description='Configure for HPCToolkit')
# Configure for Krell and OpenSpeedshop.
variant('krellpatch', default=False,
description="Build with openspeedshop based patch.")
# Configure for OpenSpeedshop and Survey.
# Configure for adding MPI Post Comm Rank support
variant('commrank', default=False,
description="Build with MPI Post Comm Rank support patch.")
variant('dlopen', default=True,
description='Override dlopen and dlclose')
patch('libmonitorkrell-0000.patch', when='@2013.02.18+krellpatch')
patch('libmonitorkrell-0001.patch', when='@2013.02.18+krellpatch')
patch('libmonitorkrell-0002.patch', when='@2013.02.18+krellpatch')
patch('libmonitorkrell-0001.patch', when='@2013.02.18+commrank')
patch('libmonitorkrell-0002.patch', when='@2013.02.18+commrank')
patch('add-monitor-comm-rank-notification.patch', when='@2020.10.15+commrank')
signals = 'SIGBUS, SIGSEGV, SIGPROF, 36, 37, 38'

2
var/spack/repos/builtin/packages/llvm-openmp-ompt/package.py
View File

@ -38,7 +38,7 @@ class LlvmOpenmpOmpt(CMakePackage):
depends_on('llvm', when='~standalone')
depends_on('ninja@1.5:', type='build')
depends_on('perl@5.22.0:', type='build')
depends_on('libelf', when='+libomptarget')
depends_on('elf', when='+libomptarget')
depends_on('libffi', when='+libomptarget')
generator = 'Ninja'

72
var/spack/repos/builtin/packages/openspeedshop-utils/package.py
View File

@ -13,33 +13,30 @@
class OpenspeedshopUtils(CMakePackage):
"""OpenSpeedShop is a community effort by The Krell Institute with
current direct funding from DOEs NNSA. It builds on top of a
broad list of community infrastructures, most notably Dyninst
and MRNet from UW, libmonitor from Rice, and PAPI from UTK.
OpenSpeedShop is an open source multi platform Linux performance
tool which is targeted to support performance analysis of
applications running on both single node and large scale IA64,
IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue Gene and
Cray platforms. OpenSpeedShop development is hosted by the Krell
Institute. The infrastructure and base components of OpenSpeedShop
"""OpenSpeedShop is a community effort led by Trenza, Inc.
It builds on top of a broad list of community infrastructures,
most notably Dyninst and MRNet from UW, libmonitor from Rice,
and PAPI from UTK. OpenSpeedShop is an open source multi platform
Linux performance tool which is targeted to support performance
analysis of applications running on both single node and large
scale IA64, IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue
Gene and Cray platforms. OpenSpeedShop development is hosted by
Trenza Inc.. The infrastructure and base components of OpenSpeedShop
are released as open source code primarily under LGPL.
openspeedshop-utils is a package that does not have the
qt3 gui. It was created to avoid a conflict between
openspeedshop and cbtf-argonavis-gui based on the fact
that spack will not allow a qt3 and qt4/qt5 dependency in a packages
dependency tree.
that spack will not allow a qt3 and qt4/qt5 dependency in a
packages dependency tree.
"""
homepage = "http://www.openspeedshop.org"
git = "https://github.com/OpenSpeedShop/openspeedshop.git"
version('develop', branch='master')
version('2.4.2.1', branch='2.4.2.1')
version('2.4.2', branch='2.4.2')
version('2.4.1', branch='2.4.1')
version('2.4.0', branch='2.4.0')
version('2.3.1.5', branch='2.3.1.5')
version('2.3.1.4', branch='2.3.1.4')
version('2.3.1.3', branch='2.3.1.3')
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
@ -51,8 +48,9 @@ class OpenspeedshopUtils(CMakePackage):
variant('cuda', default=False,
description="build with cuda packages included.")
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
# MPI variants
variant('openmpi', default=False,
@ -83,9 +81,9 @@ class OpenspeedshopUtils(CMakePackage):
depends_on("flex@2.6.1", type='build')
# For binutils
depends_on("binutils", type='build')
depends_on("binutils+plugins~gold@2.32", type='build')
depends_on("elf", type="link")
depends_on("elfutils", type="link")
depends_on("libdwarf")
depends_on("sqlite")
@ -94,7 +92,7 @@ class OpenspeedshopUtils(CMakePackage):
depends_on("boost@1.66.0:1.69.0")
depends_on("dyninst@develop", when='@develop')
depends_on("dyninst@10:", when='@2.3.1.3:9999')
depends_on("dyninst@10:", when='@2.4.0:9999')
depends_on("python@2.7.14:2.7.99", type=('build', 'run'))
@ -102,44 +100,44 @@ class OpenspeedshopUtils(CMakePackage):
# Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999", when='@2.4.0:9999', type=('build', 'link', 'run'))
depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.3:9999", when='@2.4.0:9999', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+crayfe', when='@2.4.0:9999+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+cti', when='@2.4.0:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich', when='@2.4.0:9999+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich2', when='@2.4.0:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpt', when='@2.4.0:9999+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich', when='@2.4.0:9999+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich2', when='@2.4.0:9999+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+openmpi', when='@2.4.0:9999+openmpi', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@develop", when='@develop+cuda', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@1.9.3:9999", when='@2.4.0:9999+cuda', type=('build', 'link', 'run'))
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+cti", when='@2.4.0:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.4.0:9999', type=('build', 'link', 'run'))
patch('arm.patch', when='target=aarch64:')
parallel = False
@ -162,7 +160,7 @@ def set_cray_login_node_cmake_options(self, spec, cmake_options):
# Equivalent to install-tool cmake arg:
# '-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
# % <base dir>/cbtf_v2.3.1.release/compute)
# % <base dir>/cbtf_v2.4.0elease/compute)
cray_login_node_options.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
% be_ck.prefix)
cray_login_node_options.append('-DRUNTIME_PLATFORM=%s'
@ -174,7 +172,7 @@ def cmake_args(self):
# Appends base options to cmake_args
spec = self.spec
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
cmake_args = []
@ -227,7 +225,7 @@ def set_defaultbase_cmake_options(self, spec, cmake_options):
base_options = []
base_options.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix)
base_options.append('-DLIBELF_DIR=%s' % spec['elf'].prefix)
base_options.append('-DLIBELF_DIR=%s' % spec['elfutils'].prefix)
base_options.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix)
base_options.append('-DPYTHON_EXECUTABLE=%s' % python_exe)
base_options.append('-DPYTHON_INCLUDE_DIR=%s' % python_include)

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

@ -10,16 +10,15 @@
class Openspeedshop(CMakePackage):
"""OpenSpeedShop is a community effort by The Krell Institute with
current direct funding from DOEs NNSA. It builds on top of a
broad list of community infrastructures, most notably Dyninst
and MRNet from UW, libmonitor from Rice, and PAPI from UTK.
OpenSpeedShop is an open source multi platform Linux performance
tool which is targeted to support performance analysis of
applications running on both single node and large scale IA64,
IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue Gene and
Cray platforms. OpenSpeedShop development is hosted by the Krell
Institute. The infrastructure and base components of OpenSpeedShop
"""OpenSpeedShop is a community effort led by Trenza, Inc.
It builds on top of a broad list of community infrastructures,
most notably Dyninst and MRNet from UW, libmonitor from Rice,
and PAPI from UTK. OpenSpeedShop is an open source multi platform
Linux performance tool which is targeted to support performance
analysis of applications running on both single node and large
scale IA64, IA32, EM64T, AMD64, PPC, ARM, Power8, Intel Phi, Blue
Gene and Cray platforms. OpenSpeedShop development is hosted by
Trenza Inc.. The infrastructure and base components of OpenSpeedShop
are released as open source code primarily under LGPL.
"""
@ -27,11 +26,9 @@ class Openspeedshop(CMakePackage):
git = "https://github.com/OpenSpeedShop/openspeedshop.git"
version('develop', branch='master')
version('2.4.2.1', branch='2.4.2.1')
version('2.4.2', branch='2.4.2')
version('2.4.1', branch='2.4.1')
version('2.4.0', branch='2.4.0')
version('2.3.1.5', branch='2.3.1.5')
version('2.3.1.4', branch='2.3.1.4')
version('2.3.1.3', branch='2.3.1.3')
variant('runtime', default=False,
description="build only the runtime libraries and collectors.")
@ -43,11 +40,12 @@ class Openspeedshop(CMakePackage):
variant('cuda', default=False,
description="build with cuda packages included.")
variant('gui', default='qt3', values=('none', 'qt3', 'qt4'),
variant('gui', default='none', values=('none', 'qt3', 'qt4'),
description='Build or not build a GUI of choice')
variant('build_type', default='None', values=('None',),
description='CMake build type')
variant('build_type', default='RelWithDebInfo',
description='The build type to build',
values=('Debug', 'Release', 'RelWithDebInfo'))
# MPI variants
variant('openmpi', default=False,
@ -78,19 +76,18 @@ class Openspeedshop(CMakePackage):
depends_on("flex@2.6.1", type='build')
# For binutils
depends_on("binutils")
depends_on("binutils+plugins~gold@2.32")
depends_on("elf", type="link")
depends_on("elfutils", type="link")
depends_on("libdwarf")
depends_on("sqlite")
# For boost
# depends_on("boost@1.66.0:")
depends_on("boost@1.66.0:1.69.0")
depends_on("boost@1.70.0:")
depends_on("dyninst@develop", when='@develop')
depends_on("dyninst@10:", when='@2.3.1.3:9999')
depends_on("dyninst@10:", when='@2.4.0:9999')
depends_on("python@2.7.14:2.7.99", type=('build', 'run'))
@ -100,44 +97,44 @@ class Openspeedshop(CMakePackage):
# Dependencies for the openspeedshop cbtf packages.
depends_on("cbtf@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("cbtf@1.9.3:9999", when='@2.4.0:9999', type=('build', 'link', 'run'))
depends_on("cbtf-krell@develop", when='@develop', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.1.0:9999", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("cbtf-krell@1.9.3:9999", when='@2.4.0:9999', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+crayfe', when='@develop+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+crayfe', when='@2.3.1.3:9999+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+crayfe', when='@2.4.0:9999+crayfe', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+cti', when='@develop+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+cti', when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+cti', when='@2.4.0:9999+cti', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpich', when='@develop+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpich', when='@2.3.1.3:9999+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich', when='@2.4.0:9999+mpich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpich2', when='@develop+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpich2', when='@2.3.1.3:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpich2', when='@2.4.0:9999+mpich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mpt', when='@develop+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mpt', when='@2.3.1.3:9999+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mpt', when='@2.4.0:9999+mpt', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mvapich', when='@develop+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mvapich', when='@2.3.1.3:9999+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich', when='@2.4.0:9999+mvapich', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+mvapich2', when='@develop+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+mvapich2', when='@2.3.1.3:9999+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+mvapich2', when='@2.4.0:9999+mvapich2', type=('build', 'link', 'run'))
depends_on('cbtf-krell@develop+openmpi', when='@develop+openmpi', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.1.0:9999+openmpi', when='@2.3.1.3:9999+openmpi', type=('build', 'link', 'run'))
depends_on('cbtf-krell@1.9.3:9999+openmpi', when='@2.4.0:9999+openmpi', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@develop", when='@develop+cuda', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@1.9.1.0:9999", when='@2.3.1.3:9999+cuda', type=('build', 'link', 'run'))
depends_on("cbtf-argonavis@1.9.3:9999", when='@2.4.0:9999+cuda', type=('build', 'link', 'run'))
# For MRNet
depends_on("mrnet@5.0.1-3:+cti", when='@develop+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@develop', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+cti", when='@2.3.1.3:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.3.1.3:9999', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+cti", when='@2.4.0:9999+cti', type=('build', 'link', 'run'))
depends_on("mrnet@5.0.1-3:+lwthreads", when='@2.4.0:9999', type=('build', 'link', 'run'))
patch('arm.patch', when='target=aarch64:')
parallel = False
@ -161,7 +158,7 @@ def set_cray_login_node_cmake_options(self, spec, cmake_options):
# Equivalent to install-tool cmake arg:
# '-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
# % <base dir>/cbtf_v2.3.1.release/compute)
# % <base dir>/cbtf_v2.4.0.release/compute)
cray_login_node_options.append('-DCBTF_KRELL_CN_RUNTIME_DIR=%s'
% be_ck.prefix)
cray_login_node_options.append('-DRUNTIME_PLATFORM=%s'
@ -173,7 +170,7 @@ def cmake_args(self):
spec = self.spec
compile_flags = "-O2 -g"
compile_flags = "-O2 -g -Wall"
cmake_args = []
@ -186,10 +183,15 @@ def cmake_args(self):
cmake_args.extend(
['-DCMAKE_CXX_FLAGS=%s' % compile_flags,
'-DCMAKE_C_FLAGS=%s' % compile_flags,
'-DINSTRUMENTOR=%s' % instrumentor_setting,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix])
'-DINSTRUMENTOR=%s' % instrumentor_setting,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix])
if spec.satisfies('+cuda'):
cmake_args.extend(
['-DCBTF_ARGONAVIS_DIR=%s'
% spec['cbtf-argonavis'].prefix])
else:
@ -198,12 +200,12 @@ def cmake_args(self):
guitype = self.spec.variants['gui'].value
cmake_args.extend(
['-DCMAKE_CXX_FLAGS=%s' % compile_flags,
'-DCMAKE_C_FLAGS=%s' % compile_flags,
'-DINSTRUMENTOR=%s' % instrumentor_setting,
'-DSQLITE3_DIR=%s' % spec['sqlite'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix])
'-DCMAKE_C_FLAGS=%s' % compile_flags,
'-DINSTRUMENTOR=%s' % instrumentor_setting,
'-DSQLITE3_DIR=%s' % spec['sqlite'].prefix,
'-DCBTF_DIR=%s' % spec['cbtf'].prefix,
'-DCBTF_KRELL_DIR=%s' % spec['cbtf-krell'].prefix,
'-DMRNET_DIR=%s' % spec['mrnet'].prefix])
if guitype == 'none':
cmake_args.extend(
@ -216,6 +218,11 @@ def cmake_args(self):
['-DQTLIB_DIR=%s'
% spec['qt'].prefix])
if spec.satisfies('+cuda'):
cmake_args.extend(
['-DCBTF_ARGONAVIS_DIR=%s'
% spec['cbtf-argonavis'].prefix])
if spec.satisfies('+crayfe'):
# We need to build target/compute node
# components/libraries first then pass
@ -232,17 +239,18 @@ def set_defaultbase_cmake_options(self, spec, cmake_options):
python_exe = spec['python'].command.path
python_library = spec['python'].libs[0]
python_include = spec['python'].headers.directories[0]
true_value = 'TRUE'
base_options = []
base_options.append('-DBINUTILS_DIR=%s' % spec['binutils'].prefix)
base_options.append('-DLIBELF_DIR=%s' % spec['elf'].prefix)
base_options.append('-DLIBELF_DIR=%s' % spec['elfutils'].prefix)
base_options.append('-DLIBDWARF_DIR=%s' % spec['libdwarf'].prefix)
base_options.append('-DPYTHON_EXECUTABLE=%s' % python_exe)
base_options.append('-DPYTHON_INCLUDE_DIR=%s' % python_include)
base_options.append('-DPYTHON_LIBRARY=%s' % python_library)
base_options.append('-DBoost_NO_SYSTEM_PATHS=TRUE')
base_options.append('-DBoost_NO_BOOST_CMAKE=TRUE')
base_options.append('-DBoost_NO_SYSTEM_PATHS=%s' % true_value)
base_options.append('-DBoost_NO_BOOST_CMAKE=%s' % true_value)
base_options.append('-DBOOST_ROOT=%s' % spec['boost'].prefix)
base_options.append('-DBoost_DIR=%s' % spec['boost'].prefix)
base_options.append('-DBOOST_LIBRARYDIR=%s' % spec['boost'].prefix.lib)
@ -298,6 +306,7 @@ def setup_run_environment(self, env):
lib_dir = self.prefix.lib64
else:
lib_dir = self.prefix.lib
plugin_path = '/openspeedshop'
oss_plugin_path = lib_dir + plugin_path
env.set('OPENSS_PLUGIN_PATH', oss_plugin_path)