Changeset 26072 for gs2-extensions/parallel-building/trunk/src/perllib/ParallelInexport.pm

Timestamp:

2012-08-06T11:42:55+12:00 (12 years ago)

Author:

jmt12

Message:

Extended to notice and load mpi.conf file on clusters and to use full paths to executables since they don't always seem to be on environment PATH correctly

File:

• gs2-extensions/parallel-building/trunk/src/perllib/ParallelInexport.pm (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/perllib/ParallelInexport.pm

@@ -66 +66 @@
    }
 
+   # Determine if we've been provided a mpi.conf file to indicate the other
+   # machines (slave nodes) this parallizable process should run on
+   my $mpi_conf_path = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'mpi.conf');
+   my $mpi_flags = '';
+   if (-f $mpi_conf_path)
+   {
+     print STDERR " ***** CLUSTER MODE *****\n";
+     $mpi_flags .= '-machinefile "' . $mpi_conf_path . '" ';
+     #$mpi_flags .= '-nolocal ';
+   }
+   else
+   {
+     print STDERR " ***** SINGLE COMPUTER MODE *****\n";
+   }
+   $mpi_flags .= ' --show-progress --timestamp-output --verbose --report-bindings --tag-output';
+
    # invoke the farmer to start processing the files
    $site = "" if (!defined $site);
    my $gsdlhome = $ENV{'GSDLHOME'};
-   my $farmer_exe = 'mpiimport'; # will be on PATH
-   #my $mpi_cmd = "mpirun -n $jobs $farmer_exe $tmp_filelist $epoch $gsdlhome $collection $site";
-   my $mpi_cmd = "mpirun --show-progress --timestamp-output --verbose --report-bindings --tag-output -n $jobs $farmer_exe $tmp_filelist $epoch $gsdlhome $collection $site";
+   my $farmer_exe = $gsdlhome . '/ext/parallel-building/linux/bin/mpiimport';
+   my $mpi_cmd = $gsdlhome . '/ext/parallel-building/linux/bin/mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
    print STDERR "MPI Command: \"" . $mpi_cmd . "\"\n";
 #   system ($mpi_cmd);