Add Caliper 1.7.0 and Gotcha 1.0.2#8572
Merged
adamjstewart merged 4 commits intospack:developfrom Jun 27, 2018
Merged
Conversation
| # gotcha doesn't work on Mac | ||
| variant('gotcha', default=sys.platform != 'darwin', | ||
| description='Enable GOTCHA support') | ||
| variant('sampler', default=sys.platform == 'linux2', |
Member
There was a problem hiding this comment.
linux2 isn't reliable:
https://stackoverflow.com/questions/10415942/python-sys-platform-linux2-but-not-linux3
It sounds like sys.platform.startswith('linux') is more reliable.
| 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') |
Member
There was a problem hiding this comment.
I wonder if we should just remove 1.6.0 from the package if it's broken.
Contributor
Author
There was a problem hiding this comment.
I would agree, but somehow it seems one can't uninstall a version that isn't listed.
tgamblin
reviewed
Jun 26, 2018
| variant('sosflow', default=False, | ||
| description='Enable SOSflow support') | ||
|
|
||
| depends_on('[email protected]:', when='+gotcha') |
Member
There was a problem hiding this comment.
If 1.6 downloads the wrong gotcha version, why not:
depends_on('gotcha@<something>', when='@:1.6')
depends_on('[email protected]:', when='@1.7:')?
Member
There was a problem hiding this comment.
Nevermind, saw the comment on #8558. Just remove 1.6.0 if it downloads its own dependencies.
adamjstewart
approved these changes
Jun 26, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add new versions of Caliper and Gotcha. Caliper now uses spack-built gotcha instead of downloading its own.