diff options
| author | David Böhme <boehme3@llnl.gov> | 2017-12-16 18:39:52 -0800 |
|---|---|---|
| committer | Christoph Junghans <christoph.junghans@gmail.com> | 2017-12-16 19:39:52 -0700 |
| commit | 3467c207c8ee96bbbfbc911ac97cc03b89acbee5 (patch) | |
| tree | 9ac3de24f65a77f823a9a1f8ae272b0c7cb50b82 | |
| parent | dac09dd5fb56e9d7da554eeb98dcf86b1fde45fc (diff) | |
| download | spack-3467c207c8ee96bbbfbc911ac97cc03b89acbee5.tar.gz spack-3467c207c8ee96bbbfbc911ac97cc03b89acbee5.tar.bz2 spack-3467c207c8ee96bbbfbc911ac97cc03b89acbee5.tar.xz spack-3467c207c8ee96bbbfbc911ac97cc03b89acbee5.zip | |
Caliper update, add version 1.6.0 (#6680)
| -rw-r--r-- | var/spack/repos/builtin/packages/caliper/package.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index e3fff54e6f..540f31a44b 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -39,6 +39,7 @@ class Caliper(CMakePackage): url = "" version('master', git='https://github.com/LLNL/Caliper.git') + version('1.6.0', git='https://github.com/LLNL/Caliper.git', tag='v1.6.0') variant('mpi', default=True, description='Enable MPI wrappers') @@ -50,14 +51,20 @@ class Caliper(CMakePackage): # pthread_self() signature is incompatible with PAPI_thread_init() on Mac variant('papi', default=sys.platform != 'darwin', description='Enable PAPI service') + variant('libpfm', default=sys.platform == 'linux2', + description='Enable libpfm (perf_events) service') # gotcha doesn't work on Mac variant('gotcha', default=sys.platform != 'darwin', description='Enable GOTCHA support') + variant('sosflow', default=False, + description='Enable SOSflow support') depends_on('dyninst', when='+dyninst') depends_on('papi', when='+papi') + depends_on('libpfm4', when='+libpfm') depends_on('mpi', when='+mpi') depends_on('libunwind', when='+callpath') + depends_on('sosflow', when='+sosflow') depends_on('cmake', type='build') depends_on('python', type='build') @@ -67,17 +74,23 @@ class Caliper(CMakePackage): args = [ '-DBUILD_TESTING=Off', - '-DWITH_DOCS=Off', - '-DWITH_TEST_APPS=Off', + '-DBUILD_DOCS=Off', '-DWITH_DYNINST=%s' % ('On' if '+dyninst' in spec else 'Off'), '-DWITH_CALLPATH=%s' % ('On' if '+callpath' in spec else 'Off'), '-DWITH_GOTCHA=%s' % ('On' if '+gotcha' in spec else 'Off'), '-DWITH_PAPI=%s' % ('On' if '+papi' in spec else 'Off'), - '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off') + '-DWITH_LIBPFM=%s' % ('On' if '+libpfm' in spec else 'Off'), + '-DWITH_SOSFLOW=%s' % ('On' if '+sosflow' in spec else 'Off'), + '-DWITH_MPI=%s' % ('On' if '+mpi' in spec else 'Off'), + '-DWITH_MPIT=%s' % ('On' if spec.satisfies('^mpi@3:') else 'Off') ] if '+papi' in spec: - args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) + args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) + if '+libpfm' in spec: + args.append('-DLIBPFM_INSTALL=%s' % spec['libpfm4'].prefix) + if '+sosflow' in spec: + args.append('-DSOS_PREFIX=%s' % spec['sosflow'].prefix) if '+mpi' in spec: args.append('-DMPI_C_COMPILER=%s' % spec['mpi'].mpicc) |