mvapich2 : fixed some issues with the package. Needs further improvment with respect to network and pm

1 files changed, 82 insertions, 80 deletions

diff --git a/var/spack/packages/mvapich2/package.py b/var/spack/packages/mvapich2/package.py
index ca0b1287c1..1937564fc8 100644
--- a/var/spack/packages/mvapich2/package.py
+++ b/var/spack/packages/mvapich2/package.py
@@ -1,104 +1,106 @@
-import os
 from spack import *
 
+
 class Mvapich2(Package):
     """mvapich2 is an MPI implmenetation for infiniband networks."""
     homepage = "http://mvapich.cse.ohio-state.edu/"
 
+    version('2.2a', 'b8ceb4fc5f5a97add9b3ff1b9cbe39d2',
+            url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.2a.tar.gz')
+
+    version('2.0', '9fbb68a4111a8b6338e476dc657388b4',
+            url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.0.tar.gz')
+
     version('1.9', '5dc58ed08fd3142c260b70fe297e127c',
             url="http://mvapich.cse.ohio-state.edu/download/mvapich2/mv2/mvapich2-1.9.tgz")
     patch('ad_lustre_rwcontig_open_source.patch', when='@1.9')
 
-    version('2.0', '9fbb68a4111a8b6338e476dc657388b4',
-            url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.0.tar.gz')
+    provides('mpi@:2.2', when='@1.9')  # MVAPICH2-1.9 supports MPI 2.2
+    provides('mpi@:3.0', when='@2.0:')  # MVAPICH2-2.0 supports MPI 3.0
 
-    provides('mpi@:2.2', when='@1.9')    # MVAPICH2-1.9 supports MPI 2.2
-    provides('mpi@:3.0', when='@2.0')    # MVAPICH2-2.0 supports MPI 3.0
 
+    variant('slurm', default=True, description='Sets SLURM as the process manager')
 
-    def install(self, spec, prefix):
-        # we'll set different configure flags depending on our environment
-        configure_args = []
+    # FIXME: those variants are mutually exclusive. A variant enum would fit here.
+    variant('psm', default=False, description='Configures a build for QLogic PSM-CH3')
+    variant('sock', default=False, description='Configures a build for TCP/IP-CH3')
+    # TODO : a lot of network variants are still missing.
+    # See http://mvapich.cse.ohio-state.edu/static/media/mvapich/mvapich2-2.0-userguide.html
 
-        # TODO: The MPICH*_FLAGS have a different name for 1.9
+    def set_build_type_flags(self, spec, configure_args):
+        """
+        Appends to configure_args the flags that depends only on the build type (i.e. release or debug)
 
+        :param spec: spec
+        :param configure_args: list of current configure arguments
+        """
         if '+debug' in spec:
-            # set configure flags for debug build
-            configure_args.append("--disable-fast")
-            configure_args.append("--enable-g=dbg")
-            configure_args.append("--enable-error-checking=runtime")
-            configure_args.append("--enable-error-messages=all")
-            configure_args.append("--enable-nmpi-as-mpi")
-
-            if "%gnu" in spec:
-                # set variables for GNU compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O0"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O0"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O0 -fno-second-underscore"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O0 -fno-second-underscore"
-            elif "%intel" in spec:
-                # set variables for Inel compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O0"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O0"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O0"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O0"
-            elif "%pgi" in spec:
-                # set variables for PGI compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O0 -fPIC"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O0 -fPIC"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O0 -fPIC"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O0 -fPIC"
+            build_type_options = [
+                "--disable-fast",
+                "--enable-error-checking=runtime",
+                "--enable-error-messages=all"
+            ]
 
         else:
-            # set configure flags for normal optimizations
-            configure_args.append("--enable-fast=all")
-            configure_args.append("--enable-g=dbg")
-            configure_args.append("--enable-nmpi-as-mpi")
-
-            if "%gnu" in spec:
-                # set variables for what compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O2"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O2"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O2 -fno-second-underscore"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O2 -fno-second-underscore"
-            elif "%intel" in spec:
-                # set variables for Inel compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O2"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O2"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O2"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O2"
-            elif "%pgi" in spec:
-                # set variables for PGI compilers
-                os.environ['MPICHLIB_CFLAGS']   = "-g -O2 -fPIC"
-                os.environ['MPICHLIB_CXXFLAGS'] = "-g -O2 -fPIC"
-                os.environ['MPICHLIB_FFLAGS']   = "-g -O2 -fPIC"
-                os.environ['MPICHLIB_F90FLAGS'] = "-g -O2 -fPIC"
-
-        # determine network type by variant
-        if "+psm" in spec:
-            # throw this flag on QLogic systems to use PSM
-            configure_args.append("--with-device=ch3:psm")
+            build_type_options = ["--enable-fast=all"]
+        configure_args.extend(build_type_options)
+
+    def set_process_manager(self, spec, configure_args):
+        """
+        Appends to configure_args the flags that will select the process manager
+
+        :param spec: spec
+        :param configure_args: list of current configure arguments
+        """
+        # FIXME : supports only slurm so far
+        if '+slurm' in spec:
+            process_manager_options = [
+                "--with-pm=no",
+                "--with-pmi=slurm"
+            ]
+            configure_args.extend(process_manager_options)
+
+    def set_network_type(self, spec, configure_args):
+        # Check that at most one variant has been activated
+        # FIXME : ugly, as it does not scale at all (and is full of conditionals)
+        count = 0
+        if '+psm' in spec:
+            count += 1
+        if '+sock' in spec:
+            count += 1
+        if count > 1:
+            raise RuntimeError('MVAPICH2 variants are mutually exclusive : only one can be selected at a time')
+
+        # From here on I can suppose that ony one variant has been selected
+        if '+psm' in spec:
+            network_options = ["--with-device=ch3:psm"]
+        elif '+sock' in spec:
+            network_options = ["--with-device=ch3:sock"]
         else:
-            # throw this flag on IB systems
-            configure_args.append("--with-device=ch3:mrail", "--with-rdma=gen2")
+            network_options = ["--with-device=ch3:mrail", "--with-rdma=gen2"]
 
-        # TODO: shared-memory build
+        configure_args.extend(network_options)
 
-        # TODO: CUDA
-
-        # TODO: other file systems like panasis
-
-        configure(
-            "--prefix=" + prefix,
-            "--enable-f77", "--enable-fc", "--enable-cxx",
-            "--enable-shared", "--enable-sharedlibs=gcc",
-            "--enable-debuginfo",
-            "--with-pm=no", "--with-pmi=slurm",
-            "--enable-romio", "--with-file-system=lustre+nfs+ufs",
-            "--disable-mpe", "--without-mpe",
+    def install(self, spec, prefix):
+        # we'll set different configure flags depending on our environment
+        configure_args = [
+            "--prefix=%s" % prefix,
+            "--enable-shared",
+            "--enable-romio",
             "--disable-silent-rules",
-            *configure_args)
-
+            "--enable-debuginfo",
+            "--enable-g=dbg"
+        ]
+        if not self.compiler.f77 and not self.compiler.fc:
+            configure_args.append("--enable-fortran=none")
+
+        # Set flags that depend only on the type of the build (debug, release)
+        self.set_build_type_flags(spec, configure_args)
+        # Set the process manager
+        self.set_process_manager(spec, configure_args)
+        # Determine network type by variant
+        self.set_network_type(spec, configure_args)
+
+        configure(*configure_args)
         make()
-
         make("install")