summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Böhme <boehme3@llnl.gov>2019-11-13 16:11:09 -0800
committerAdam J. Stewart <ajstewart426@gmail.com>2019-11-13 18:11:09 -0600
commit1ed8de8757a6e664c78fb700cab9655059161b83 (patch)
treefd31c5b020de9a3040bd5bdfc6204ac095e6b0d0
parent43b0356e14a8227f33040302cf948d3c98508d59 (diff)
downloadspack-1ed8de8757a6e664c78fb700cab9655059161b83.tar.gz
spack-1ed8de8757a6e664c78fb700cab9655059161b83.tar.bz2
spack-1ed8de8757a6e664c78fb700cab9655059161b83.tar.xz
spack-1ed8de8757a6e664c78fb700cab9655059161b83.zip
Add Caliper v2.2.0 and v2.1.1 (#13723)
* Add Caliper v2.2.0 and v2.1.1 * Add conflict for adiak when for versions <2.2 * Trim trailing whitespace
-rw-r--r--var/spack/repos/builtin/packages/caliper/package.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/caliper/package.py b/var/spack/repos/builtin/packages/caliper/package.py
index 9d45640eb1..5dd651181d 100644
--- a/var/spack/repos/builtin/packages/caliper/package.py
+++ b/var/spack/repos/builtin/packages/caliper/package.py
@@ -10,16 +10,17 @@ import sys
class Caliper(CMakePackage):
"""Caliper is a program instrumentation and performance measurement
- framework. It provides data collection mechanisms and a source-code
- annotation API for a variety of performance engineering use cases,
- e.g., performance profiling, tracing, monitoring, and
- auto-tuning.
+ framework. It is designed as a performance analysis toolbox in a
+ library, allowing one to bake performance analysis capabilities
+ directly into applications and activate them at runtime.
"""
homepage = "https://github.com/LLNL/Caliper"
git = "https://github.com/LLNL/Caliper.git"
version('master')
+ version('2.2.0', tag='v2.2.0')
+ version('2.1.1', tag='v2.1.1')
version('2.0.1', tag='v2.0.1')
version('1.9.1', tag='v1.9.1')
version('1.9.0', tag='v1.9.0')
@@ -29,6 +30,8 @@ class Caliper(CMakePackage):
is_linux = sys.platform.startswith('linux')
variant('shared', default=True,
description='Build shared libraries')
+ variant('adiak', default=True,
+ description='Enable Adiak support')
variant('mpi', default=True,
description='Enable MPI wrappers')
variant('dyninst', default=False,
@@ -49,6 +52,8 @@ class Caliper(CMakePackage):
variant('sosflow', default=False,
description='Enable SOSflow support')
+ depends_on('adiak@0.1:', when='@2.2: +adiak')
+
depends_on('gotcha@1.0.2:1.0.99', when='+gotcha')
depends_on('dyninst@9.3.0:9.99', when='@:1.99 +dyninst')
@@ -67,7 +72,8 @@ class Caliper(CMakePackage):
depends_on('python', type='build')
# sosflow support not yet in 2.0
- conflicts('+sosflow', '@2.0.0:2.0.99')
+ conflicts('+sosflow', '@2.0.0:2.2.99')
+ conflicts('+adiak', '@:2.1.99')
def cmake_args(self):
spec = self.spec
@@ -76,6 +82,7 @@ class Caliper(CMakePackage):
'-DBUILD_TESTING=Off',
'-DBUILD_DOCS=Off',
'-DBUILD_SHARED_LIBS=%s' % ('On' if '+shared' in spec else 'Off'),
+ '-DWITH_ADIAK=%s' % ('On' if '+adiak' in spec else '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'),