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

Timestamp:

2013-04-14T22:52:17+12:00 (11 years ago)

Author:

davidb

Message:

Mods to allow code to run with Greenstone3

File:

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

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

@@ -83 +83 @@
 
    # invoke the farmer to start processing the files
-   $site = "" if (!defined $site);
-   my $gsdlhome = $ENV{'GSDLHOME'};
-   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;
+   my $gsdlhome;
+
+   if (defined $site) {
+       $gsdlhome = $ENV{'GSDL3HOME'};
+   }
+   else {
+       $site = "";
+       $gsdlhome = $ENV{'GSDLHOME'};
+   }
+
+#   my $farmer_exe = $gsdlhome . '/ext/parallel-building/linux/bin/mpiimport';
+   my $farmer_exe = 'mpiimport';
+
+#   my $mpi_cmd = $gsdlhome . '/ext/parallel-building/linux/bin/mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
+   my $mpi_cmd = 'mpirun ' . $mpi_flags . ' -n ' . $jobs . ' ' . $farmer_exe . ' ' . $tmp_filelist . ' ' . $epoch . ' ' . $gsdlhome . ' ' . $collection . ' ' . $site;
    print STDERR "MPI Command: \"" . $mpi_cmd . "\"\n";
 #   system ($mpi_cmd);