Merge branch 'features/automaded' into develop

4 files changed, 109 insertions, 13 deletions

diff --git a/var/spack/packages/automaded/package.py b/var/spack/packages/automaded/package.py
new file mode 100644
index 0000000000..9fbd93e3b3
--- /dev/null
+++ b/var/spack/packages/automaded/package.py
@@ -0,0 +1,51 @@
+##############################################################################
+# Copyright (c) 2013, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Written by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://scalability-llnl.github.io/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License (as published by
+# the Free Software Foundation) version 2.1 dated February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+class Automaded(Package):
+    """AutomaDeD (Automata-based Debugging for Dissimilar parallel
+       tasks) is a tool for automatic diagnosis of performance and
+       correctness problems in MPI applications. It creates
+       control-flow models of each MPI process and, when a failure
+       occurs, these models are leveraged to find the origin of
+       problems automatically. MPI calls are intercepted (using
+       wrappers) to create the models. When an MPI application hangs,
+       AutomaDeD creates a progress-dependence graph that helps
+       finding the process (or group of processes) that caused the hang.
+    """
+
+    homepage = "https://github.com/scalability-llnl/AutomaDeD"
+    url      = "https://github.com/scalability-llnl/AutomaDeD/archive/v1.0.tar.gz"
+
+    version('1.0', '16a3d4def2c4c77d0bc4b21de8b3ab03')
+
+    depends_on('mpi')
+    depends_on('boost')
+    depends_on('callpath')
+
+    def install(self, spec, prefix):
+        cmake("-DSTATE_TRACKER_WITH_CALLPATH=ON", *std_cmake_args)
+        make()
+        make("install")
diff --git a/var/spack/packages/callpath/package.py b/var/spack/packages/callpath/package.py
index 84170d9c9e..f78ddcbc0c 100644
--- a/var/spack/packages/callpath/package.py
+++ b/var/spack/packages/callpath/package.py
@@ -31,6 +31,7 @@ class Callpath(Package):
     homepage = "https://github.com/scalability-llnl/callpath"
     url      = "https://github.com/scalability-llnl/callpath/archive/v1.0.1.tar.gz"
 
+    version('1.0.2', 'b1994d5ee7c7db9d27586fc2dcf8f373')
     version('1.0.1', '0047983d2a52c5c335f8ba7f5bab2325')
 
     depends_on("dyninst")
diff --git a/var/spack/packages/mpich/package.py b/var/spack/packages/mpich/package.py
index 19a1efe9c3..57378626ab 100644
--- a/var/spack/packages/mpich/package.py
+++ b/var/spack/packages/mpich/package.py
@@ -23,6 +23,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ##############################################################################
 from spack import *
+import os
 
 class Mpich(Package):
     """MPICH is a high performance and widely portable implementation of
@@ -38,8 +39,41 @@ class Mpich(Package):
     provides('mpi@:1', when='@1:')
 
     def install(self, spec, prefix):
-        configure(
-            "--prefix=" + prefix,
-            "--enable-shared")
+        config_args = ["--prefix=" + prefix,
+                       "--enable-shared"]
+
+        # TODO: Spack should make it so that you can't actually find
+        # these compilers if they're "disabled" for the current
+        # compiler configuration.
+        if not self.compiler.f77:
+            config_args.append("--disable-f77")
+
+        if not self.compiler.fc:
+            config_args.append("--disable-fc")
+
+        configure(*config_args)
         make()
         make("install")
+
+        self.filter_compilers()
+
+
+    def filter_compilers(self):
+        """Run after install to make the MPI compilers use the
+           compilers that Spack built the package with.
+
+           If this isn't done, they'll have CC, CXX, F77, and FC set
+           to Spack's generic cc, c++, f77, and f90.  We want them to
+           be bound to whatever compiler they were built with.
+        """
+        bin = self.prefix.bin
+        mpicc  = os.path.join(bin, 'mpicc')
+        mpicxx = os.path.join(bin, 'mpicxx')
+        mpif77 = os.path.join(bin, 'mpif77')
+        mpif90 = os.path.join(bin, 'mpif90')
+
+        kwargs = { 'ignore_absent' : True, 'backup' : False, 'string' : True }
+        filter_file('CC="cc"',   'CC="%s"'  % self.compiler.cc,  mpicc,  **kwargs)
+        filter_file('CXX="c++"', 'CXX="%s"' % self.compiler.cxx, mpicxx, **kwargs)
+        filter_file('F77="f77"', 'F77="%s"' % self.compiler.f77, mpif77, **kwargs)
+        filter_file('FC="f90"',  'FC="%s"'  % self.compiler.fc,  mpif90, **kwargs)
diff --git a/var/spack/packages/openmpi/package.py b/var/spack/packages/openmpi/package.py
index 0ce09bdd8d..1ef8a8f000 100644
--- a/var/spack/packages/openmpi/package.py
+++ b/var/spack/packages/openmpi/package.py
@@ -10,22 +10,32 @@ class Openmpi(Package):
     """
 
     homepage = "http://www.open-mpi.org"
-    url      = "http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2"
 
-    version('1.6.5', '03aed2a4aa4d0b27196962a2a65fc475')
+    version('1.8.2', 'ab538ed8e328079d566fc797792e016e',
+            url='http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.2.tar.gz')
 
-    provides('mpi@:2')
+    version('1.6.5', '03aed2a4aa4d0b27196962a2a65fc475',
+            url = "http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.bz2")
+    patch('ad_lustre_rwcontig_open_source.patch', when="@1.6.5")
+    patch('llnl-platforms.patch', when="@1.6.5")
 
-    patch('ad_lustre_rwcontig_open_source.patch')
-    patch('llnl-platforms.patch')
+    provides('mpi@:2')
 
     def install(self, spec, prefix):
-        configure("--prefix=%s" % prefix,
-                  "--with-platform=contrib/platform/lanl/tlcc2/optimized-nopanasas")
+        config_args = ["--prefix=%s" % prefix]
+
+        # TODO: use variants for this, e.g. +lanl, +llnl, etc.
+        # use this for LANL builds, but for LLNL builds, we need:
+        #     "--with-platform=contrib/platform/llnl/optimized"
+        if self.version == ver("1.6.5"):
+            confg_args.append("--with-platform=contrib/platform/lanl/tlcc2/optimized-nopanasas")
 
-        # TODO: implement variants next, so we can have LLNL and LANL options.
-        # use above for LANL builds, but for LLNL builds, we need this
-        #     "--with-platform=contrib/platform/llnl/optimized")
+        # TODO: Spack should make it so that you can't actually find
+        # these compilers if they're "disabled" for the current
+        # compiler configuration.
+        if not self.compiler.f77 and not self.compiler.fc:
+            config_args.append("--enable-mpi-fortran=no")
 
+        configure(*config_args)
         make()
         make("install")