From: Jonathan Perkins <perkinjo@cse.ohio-state.edu>
Date: Sun, 12 Oct 2008 21:28:39 +0000 (-0400)
Subject: Remove process manager selection for mvapich2 from install.pl
X-Git-Tag: vofed-1.4-rc4~10
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=047ee9f3ee85e0213880a5e0e2780d0aff57bc6e;p=~vlad%2Fofed_scripts.git

Remove process manager selection for mvapich2 from install.pl

Newer versions of the mvapich2 source rpms build and install both
mpirun_rsh and mpd process managers by default thereby removing the need
for the user to be prompted for one or the other.

Signed-off-by: Jonathan Perkins <perkinjo@cse.ohio-state.edu>
---

diff --git a/install.pl b/install.pl
index 0865a8d..e965719 100755
--- a/install.pl
+++ b/install.pl
@@ -1307,7 +1307,6 @@ my %intel = ('icc' => 0, 'icpc' => 0, 'ifort' => 0);
 
 # mvapich2 environment
 my $mvapich2_conf_impl = "ofa";
-my $mvapich2_conf_pm = "mpirun";
 my $mvapich2_conf_romio = 1;
 my $mvapich2_conf_shared_libs = 1;
 my $mvapich2_conf_ckpt = 0;
@@ -1796,31 +1795,6 @@ sub mvapich2_config
         }
     }
 
-    print "\nPlease choose a process manager:\n\n";
-    print "1) New scalable mpirun_rsh framework\n";
-    print "2) Traditional mpd/mpiexec\n";
-
-    $done = 0;
-
-    while (not $done) {
-        print "Implementation [1]: ";
-        $ans = getch();
-
-        if (ord($ans) == $KEY_ENTER or $ans eq "1") {
-            $mvapich2_conf_pm = "mpirun";
-            $done = 1;
-        }
-
-        elsif ($ans eq "2") {
-            $mvapich2_conf_pm = "mpd";
-            $done = 1;
-        }
-
-        else {
-            $done = 0;
-        }
-    }
-
     print "\nEnable ROMIO support [Y/n]: ";
     $ans = getch();
 
@@ -1859,7 +1833,6 @@ sub mvapich2_config
 
                 if (-d "$tmp") {
                     $mvapich2_conf_blcr_home = $tmp;
-                    $mvapich2_conf_pm = "mpd";
                     $done = 1;
                 }
 
@@ -1961,7 +1934,6 @@ sub mvapich2_config
     flock CONFIG, $LOCK_EXCLUSIVE;
 
     print CONFIG "mvapich2_conf_impl=$mvapich2_conf_impl\n";
-    print CONFIG "mvapich2_conf_pm=$mvapich2_conf_pm\n";
     print CONFIG "mvapich2_conf_romio=$mvapich2_conf_romio\n";
     print CONFIG "mvapich2_conf_shared_libs=$mvapich2_conf_shared_libs\n";
     print CONFIG "mvapich2_conf_ckpt=$mvapich2_conf_ckpt\n";
@@ -2249,11 +2221,6 @@ sub select_packages
                     next;
                 }
 
-                elsif ($package eq "mvapich2_conf_pm") {
-                    $mvapich2_conf_pm = $selected;
-                    next;
-                }
-
                 elsif ($package eq "mvapich2_conf_romio") {
                     $mvapich2_conf_romio = $selected;
                     next;
@@ -3077,7 +3044,6 @@ sub build_rpm
             $cmd .= " --define 'auto_req 0'";
             $cmd .= " --define 'mpi_selector $prefix/bin/mpi-selector'";
             $cmd .= " --define '_prefix $prefix/mpi/$compiler/$parent-$main_packages{$parent}{'version'}'";
-            $cmd .= " --define '_pm --with-pm=$mvapich2_conf_pm'";
         }
         elsif ($parent eq "openmpi") {
             my $compiler = (split('_', $name))[1];