summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Böhme <boehme3@llnl.gov>2017-06-16 09:45:06 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2017-06-16 11:45:06 -0500
commit04c2a1caf46b5b3b96b76c68a96a621072c40f2b (patch)
tree70c6726c95b08c318e12cda28ebda3fe2bbfdb44
parent60db73a3f516c8cd94169700ee98295211dc5dc1 (diff)
downloadspack-04c2a1caf46b5b3b96b76c68a96a621072c40f2b.tar.gz
spack-04c2a1caf46b5b3b96b76c68a96a621072c40f2b.tar.bz2
spack-04c2a1caf46b5b3b96b76c68a96a621072c40f2b.tar.xz
spack-04c2a1caf46b5b3b96b76c68a96a621072c40f2b.zip
Update Scalasca/Score-P/Cube/OTF2 (#4485)
* 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
-rw-r--r--var/spack/repos/builtin/packages/cube/package.py35
-rw-r--r--var/spack/repos/builtin/packages/scalasca/package.py25
-rw-r--r--var/spack/repos/builtin/packages/scorep/package.py1
3 files changed, 31 insertions, 30 deletions
diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py
index 9cea3c40e8..7164aefce7 100644
--- a/var/spack/repos/builtin/packages/cube/package.py
+++ b/var/spack/repos/builtin/packages/cube/package.py
@@ -25,7 +25,7 @@
from spack import *
-class Cube(Package):
+class Cube(AutotoolsPackage):
"""Cube the profile viewer for Score-P and Scalasca profiles. It displays a
multi-dimensional performance space consisting of the dimensions:
- performance metric
@@ -36,26 +36,31 @@ class Cube(Package):
homepage = "http://www.scalasca.org/software/cube-4.x/download.html"
url = "http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.3.tar.gz"
- version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa',
- url='http://apps.fz-juelich.de/scalasca/releases/cube/4.3/dist/cube-4.3.4.tar.gz')
- version('4.3.3', '07e109248ed8ffc7bdcce614264a2909',
- url='http://apps.fz-juelich.de/scalasca/releases/cube/4.3/dist/cube-4.3.3.tar.gz')
- version('4.2.3', '8f95b9531f5a8f8134f279c2767c9b20',
- url="http://apps.fz-juelich.de/scalasca/releases/cube/4.2/dist/cube-4.2.3.tar.gz")
+ # Some versions fail with parallel builds/installs
+ parallel = False
+
+ version('4.3.5', 'e5dce986e3c6381ea3a5fcb66c553adc')
+ version('4.3.4', '50f73060f55311cb12c5b3cb354d59fa')
+ version('4.3.3', '07e109248ed8ffc7bdcce614264a2909')
+
+ version('4.2.3', '8f95b9531f5a8f8134f279c2767c9b20')
variant('gui', default=False, description='Build CUBE GUI')
depends_on('zlib')
- depends_on('qt@4.6:', when='+gui')
- def install(self, spec, prefix):
- configure_args = ["--prefix=%s" % prefix,
- "--without-paraver"]
+ depends_on('qt@5:', when='@4.3.0:4.3.999 +gui')
+ depends_on('qt@4.8:', when='@4.2.0:4.2.999 +gui')
+
+ def url_for_version(self, version):
+ return 'http://apps.fz-juelich.de/scalasca/releases/cube/{0}/dist/cube-{1}.tar.gz'.format(version.up_to(2), version)
+
+ def configure_args(self):
+ spec = self.spec
+
+ configure_args = ['--enable-shared']
- # TODO : need to handle cross compiling build
if '+gui' not in spec:
configure_args.append('--without-gui')
- configure(*configure_args)
- make()
- make("install", parallel=False)
+ return configure_args
diff --git a/var/spack/repos/builtin/packages/scalasca/package.py b/var/spack/repos/builtin/packages/scalasca/package.py
index a1f53973b7..5b1ca12665 100644
--- a/var/spack/repos/builtin/packages/scalasca/package.py
+++ b/var/spack/repos/builtin/packages/scalasca/package.py
@@ -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 @@ class Scalasca(AutotoolsPackage):
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
diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py
index f9979132b0..288a0a0cd1 100644
--- a/var/spack/repos/builtin/packages/scorep/package.py
+++ b/var/spack/repos/builtin/packages/scorep/package.py
@@ -34,6 +34,7 @@ class Scorep(AutotoolsPackage):
homepage = "http://www.vi-hps.org/projects/score-p"
url = "http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz"
+ version('3.1', '065bf8eb08398e8146c895718ddb9145')
version('3.0', '44da8beaa3f71436a5f6fe51938aab2f')
version('2.0.2', '8f00e79e1b5b96e511c5ebecd10b2888')
version('1.4.2', '3b9a042b13bdd5836452354e6567f71e')