Changeset 25943

Timestamp:

2012-07-13T10:35:32+12:00 (11 years ago)

Author:

jmt12

Message:

Updated script to support cluster processing

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/parallel_dspace_filtermedia.pl (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/parallel_dspace_filtermedia.pl

@@ -121 +121 @@
     while ($line = <FIN>)
     {
-      if ($line =~ /"http:\/\/hdl.handle.net\/([^"]+)",.*"Video"/)
+      if ($line =~ /\"http:\/\/hdl.handle.net\/([^\"]+)\",.*\"Video\"/)
       {
         my $identifier = $1;
@@ -147 +147 @@
       # 4. Invoke mpidspacemediafilter (via mpirun) with the the filelist
       #    created above. MPIRun takes the number of worker threads to spawn
-      my $mpi_cmd = 'mpirun -np ' . ($worker_count + 1) . ' "' . $dspace_home . '/bin/mpidspacemediafilter" "' . $dspace_home . '" "' . $file_list_path . '"';
+
+      # 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($dspace_home, 'mpi.conf');
+      my $mpi_flags = '--show-progress --timestamp-output --verbose --report-bindings --tag-output';
+      if (-f $mpi_conf_path)
+      {
+        print STDERR " ***** CLUSTER MODE *****\n";
+        $mpi_flags .= ' -nolocal -machinefile "' . $mpi_conf_path . '"';
+      }
+      else
+      {
+        print STDERR " ***** SINGLE COMPUTER MODE *****\n";
+      }
+
+      my $mpi_cmd = 'mpirun ' . $mpi_flags . ' -np ' . ($worker_count + 1) . ' "' . $dspace_home . '/bin/mpidspacemediafilter" "' . $dspace_home . '" "' . $file_list_path . '"';
       if ($debug)
       {