Merge pull request #1442 from suraia/update-scorep-2.0

Update Score-P to 2.0

Most likely this can be generalized to link against older versions of dependencies, but it looks good for now.

3 files changed, 39 insertions, 21 deletions

diff --git a/var/spack/repos/builtin/packages/cube/package.py b/var/spack/repos/builtin/packages/cube/package.py
index 40c2cc6893..09237f87c3 100644
--- a/var/spack/repos/builtin/packages/cube/package.py
+++ b/var/spack/repos/builtin/packages/cube/package.py
@@ -28,8 +28,8 @@ from spack import *
 
 class Cube(Package):
     """
-    Cube the profile viewer for Score-P and Scalasca profiles. It displays a multi-dimensional performance space
-    consisting of the dimensions:
+    Cube the profile viewer for Score-P and Scalasca profiles. It displays a
+    multi-dimensional performance space consisting of the dimensions:
     - performance metric
     - call path
     - system resource
@@ -38,14 +38,17 @@ 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")
 
     # TODO : add variant that builds GUI on top of Qt
 
+    depends_on('zlib')
+
     def install(self, spec, prefix):
         configure_args = ["--prefix=%s" % prefix,
                           "--without-paraver",
diff --git a/var/spack/repos/builtin/packages/opari2/package.py b/var/spack/repos/builtin/packages/opari2/package.py
index 510fff9fc2..e901f8ed39 100644
--- a/var/spack/repos/builtin/packages/opari2/package.py
+++ b/var/spack/repos/builtin/packages/opari2/package.py
@@ -25,18 +25,24 @@
 
 from spack import *
 
+
 class Opari2(Package):
     """
-    OPARI2 is a source-to-source instrumentation tool for OpenMP and hybrid codes. It surrounds OpenMP directives and
-    runtime library calls with calls to the POMP2 measurement interface. OPARI2 will provide you with a new
-    initialization method that allows for multi-directory and parallel builds as well as the usage of pre-instrumented
-    libraries. Furthermore, an efficient way of tracking parent-child relationships was added. Additionally, we extended
-    OPARI2 to support instrumentation of OpenMP 3.0 tied tasks.
+    OPARI2 is a source-to-source instrumentation tool for OpenMP and hybrid
+    codes. It surrounds OpenMP directives and runtime library calls with calls
+    to the POMP2 measurement interface. OPARI2 will provide you with a new
+    initialization method that allows for multi-directory and parallel builds
+    as well as the usage of pre-instrumented libraries. Furthermore, an
+    efficient way of tracking parent-child relationships was added.
+    Additionally, we extended OPARI2 to support instrumentation of OpenMP 3.0
+    tied tasks.
     """
 
     homepage = "http://www.vi-hps.org/projects/score-p"
     url      = "http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.2.tar.gz"
 
+    version('2.0', '72350dbdb6139f2e68a5055a4f0ba16c',
+            url='http://www.vi-hps.org/upload/packages/opari2/opari2-2.0.tar.gz')
     version('1.1.4', '245d3d11147a06de77909b0805f530c0',
             url='http://www.vi-hps.org/upload/packages/opari2/opari2-1.1.4.tar.gz')
     version('1.1.2', '9a262c7ca05ff0ab5f7775ae96f3539e')
diff --git a/var/spack/repos/builtin/packages/scorep/package.py b/var/spack/repos/builtin/packages/scorep/package.py
index 633511a15a..d40e08740f 100644
--- a/var/spack/repos/builtin/packages/scorep/package.py
+++ b/var/spack/repos/builtin/packages/scorep/package.py
@@ -28,20 +28,28 @@ from spack import *
 
 class Scorep(Package):
     """
-    The Score-P measurement infrastructure is a highly scalable and easy-to-use tool suite for profiling, event
-    tracing, and online analysis of HPC applications.
+    The Score-P measurement infrastructure is a highly scalable and easy-to-use
+    tool suite for profiling, event tracing, and online analysis of HPC
+    applications.
     """
 
     homepage = "http://www.vi-hps.org/projects/score-p"
     url      = "http://www.vi-hps.org/upload/packages/scorep/scorep-1.2.3.tar.gz"
 
+    version('2.0.2', '8f00e79e1b5b96e511c5ebecd10b2888',
+            url='http://www.vi-hps.org/upload/packages/scorep/scorep-2.0.2.tar.gz')
     version('1.4.2', '3b9a042b13bdd5836452354e6567f71e',
             url='http://www.vi-hps.org/upload/packages/scorep/scorep-1.4.2.tar.gz')
     version('1.3', '9db6f957b7f51fa01377a9537867a55c',
             url='http://www.vi-hps.org/upload/packages/scorep/scorep-1.3.tar.gz')
 
     ##########
-    # Dependencies for SCORE-P are quite tight. See the homepage for more information.
+    # Dependencies for SCORE-P are quite tight. See the homepage for more
+    # information.
+    # SCOREP 2.0.2
+    depends_on('otf2@2.0', when='@2.0.2')
+    depends_on('opari2@2.0', when='@2.0.2')
+    depends_on('cube@4.3:4.4', when='@2.0.2')
     # SCOREP 1.4.2
     depends_on('otf2@1.5:1.6', when='@1.4.2')
     depends_on('opari2@1.1.4', when='@1.4.2')
@@ -56,17 +64,18 @@ class Scorep(Package):
     depends_on("papi")
 
     def install(self, spec, prefix):
-        configure = Executable( join_path(self.stage.source_path, 'configure') )
+        configure = Executable(join_path(self.stage.source_path, 'configure'))
         with working_dir('spack-build', create=True):
-            configure_args = ["--prefix=%s" % prefix,
-                              "--with-otf2=%s" % spec['otf2'].prefix.bin,
-                              "--with-opari2=%s" % spec['opari2'].prefix.bin,
-                              "--with-cube=%s" % spec['cube'].prefix.bin,
-                              "--with-papi-header=%s" % spec['papi'].prefix.include,
-                              "--with-papi-lib=%s" % spec['papi'].prefix.lib,
-                              "--enable-shared",
-                              "CFLAGS=-fPIC",
-                              "CXXFLAGS=-fPIC"]
+            configure_args = [
+                "--prefix=%s" % prefix,
+                "--with-otf2=%s" % spec['otf2'].prefix.bin,
+                "--with-opari2=%s" % spec['opari2'].prefix.bin,
+                "--with-cube=%s" % spec['cube'].prefix.bin,
+                "--with-papi-header=%s" % spec['papi'].prefix.include,
+                "--with-papi-lib=%s" % spec['papi'].prefix.lib,
+                "--enable-shared",
+                "CFLAGS=-fPIC",
+                "CXXFLAGS=-fPIC"]
             configure(*configure_args)
             make()
             make("install")