diff options
| author | David Böhme <boehme3@llnl.gov> | 2018-06-27 15:21:23 -0700 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-06-27 17:21:23 -0500 |
| commit | 51bd319fcf71f3182fd5fe4775a86bc5d0011a88 (patch) | |
| tree | 584d32fd8224c8d0ca6779e4a4b71cc428541bd3 | |
| parent | e3f208e4cbf443976e6557cb2e1adfba2e15c814 (diff) | |
| download | spack-51bd319fcf71f3182fd5fe4775a86bc5d0011a88.tar.gz spack-51bd319fcf71f3182fd5fe4775a86bc5d0011a88.tar.bz2 spack-51bd319fcf71f3182fd5fe4775a86bc5d0011a88.tar.xz spack-51bd319fcf71f3182fd5fe4775a86bc5d0011a88.zip | |
Add Caliper 1.7.0 and Gotcha 1.0.2 (#8572)
* Update Gotcha and Caliper versions
* caliper: Use spack-built gotcha
* caliper: Enable sampling support on Linux
* More robust check for Linux
| -rw-r--r-- | var/spack/repos/builtin/packages/caliper/package.py | 12 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/gotcha/package.py | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py index 07528a2ca8..6c9a5a4064 100644 --- a/var/spack/repos/builtin/packages/caliper/package.py +++ b/var/spack/repos/builtin/packages/caliper/package.py @@ -39,8 +39,12 @@ class Caliper(CMakePackage): url = "" version('master', git='https://github.com/LLNL/Caliper.git') + version('1.7.0', git='https://github.com/LLNL/Caliper.git', tag='v1.7.0') + # version 1.6.0 is broken b/c it downloads the wrong gotcha version version('1.6.0', git='https://github.com/LLNL/Caliper.git', tag='v1.6.0') + is_linux = sys.platform.startswith('linux') + variant('mpi', default=True, description='Enable MPI wrappers') variant('dyninst', default=False, @@ -51,14 +55,17 @@ 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', + variant('libpfm', default=is_linux, description='Enable libpfm (perf_events) service') # gotcha doesn't work on Mac variant('gotcha', default=sys.platform != 'darwin', description='Enable GOTCHA support') + variant('sampler', default=is_linux, + description='Enable sampling support on Linux') variant('sosflow', default=False, description='Enable SOSflow support') + depends_on('gotcha@1.0:', when='+gotcha') depends_on('dyninst', when='+dyninst') depends_on('papi', when='+papi') depends_on('libpfm4', when='+libpfm') @@ -81,10 +88,13 @@ class Caliper(CMakePackage): '-DWITH_PAPI=%s' % ('On' if '+papi' 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_SAMPLER=%s' % ('On' if '+sampler' 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 '+gotcha' in spec: + args.append('-DUSE_EXTERNAL_GOTCHA=True') if '+papi' in spec: args.append('-DPAPI_PREFIX=%s' % spec['papi'].prefix) if '+libpfm' in spec: diff --git a/var/spack/repos/builtin/packages/gotcha/package.py b/var/spack/repos/builtin/packages/gotcha/package.py index 7842b9bec0..acfff70415 100644 --- a/var/spack/repos/builtin/packages/gotcha/package.py +++ b/var/spack/repos/builtin/packages/gotcha/package.py @@ -38,6 +38,7 @@ class Gotcha(CMakePackage): branch="develop") version('master', git='https://github.com/LLNL/gotcha.git', branch="master") + version('1.0.2', git='https://github.com/LLNL/gotcha.git', tag="1.0.2") version('0.0.2', git='https://github.com/LLNL/gotcha.git', tag="0.0.2") def configure_args(self): |