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

Update Scalasca/Score-P/Cube/OTF2 (#4485)

Browse Source 
* Update Scalasca/Score-P/OTF2/Cube. Should fix #4349#

* cube: Fix flake8 warnings

* cube, scalasca: Fix version range syntax for deps

* otf2: Fix version URL generation

* cube: Remove static URLs
This commit is contained in:
David Böhme
2017-06-16 09:45:06 -07:00
committed by Adam J. Stewart
parent 60db73a3f5
commit 04c2a1caf4
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
var/spack/repos/builtin/packages/scalasca/package.py
View File

@@ -43,19 +43,14 @@ class Scalasca(AutotoolsPackage):
version('2.1', 'bab9c2b021e51e2ba187feec442b96e6')
depends_on("mpi")
##########
# Hard-code dependencies for Scalasca according to what stated in the
# release page
# The OTF2 library path should be detected automatically from SCOREP
# SCALASCA 2.2.2
depends_on("scorep@1.4:", when='@2.2.2:')
# Use same cube as scorep does
# -> depends_on("cube@4.3:", when='@2.2.2:')
# SCALASCA 2.1
depends_on("scorep@1.3", when='@2.1')
# Use same cube as scorep does
# -> depends_on("cube@4.2:", when='@2.1')
##########
# version 2.3
depends_on('cube@4.3:', when='@2.3:')
depends_on('otf2@2:', when='@2.3:')
# version 2.1+
depends_on('cube@4.2', when='@2.1:2.2.999')
depends_on('otf2@1.4', when='@2.1:2.2.999')
def url_for_version(self, version):
return 'http://apps.fz-juelich.de/scalasca/releases/scalasca/{0}/dist/scalasca-{1}.tar.gz'.format(version.up_to(2), version)
@@ -65,7 +60,7 @@ def configure_args(self):
config_args = ["--enable-shared"]
if 'cube' in spec: # From scorep dependency
config_args.append("--with-cube=%s" % spec['cube'].prefix.bin)
config_args.append("--with-cube=%s" % spec['cube'].prefix.bin)
config_args.append("--with-otf2=%s" % spec['otf2'].prefix.bin)
return config_args