Changeset 32 for trunk

Timestamp:

Dec 1, 2011, 8:36:22 PM (12 years ago)

Author:

g7moreau

Message:

• Add many option and now could be use outside OAR environment!

File:

• trunk/oarutils/oar-parexec (modified) (7 diffs)

trunk/oarutils/oar-parexec

@@ -14 +14 @@
 use IO::File;
 use POSIX qw( WNOHANG WEXITSTATUS );
+use Cwd qw( getcwd );
 
 my $file = '';
 my $verbose;
+my $nodefile = $ENV{OAR_NODE_FILE} || '';
+my $masterio;
 my $switchio;
 my $help;
@@ -22 +25 @@
 
 Getopt::Long::GetOptions(
-   'file=s'   => \$file,
-   'verbose'  => \$verbose,
-   'help'     => \$help,
-   'oarsh'    => \$oarsh,
-   'switchio' => \$switchio,
+   'file=s'     => \$file,
+   'verbose'    => \$verbose,
+   'help'       => \$help,
+   'oarsh=s'    => \$oarsh,
+   'nodefile=s' => \$nodefile,
+   'masterio=s' => \$masterio,
+   'switchio'   => \$switchio,
    ) || pod2usage( -verbose => 0 );
 pod2usage( -verbose => 2 ) if $help;
@@ -36 +41 @@
    chomp;
    next if m/^#/;
-   push @job, $_ if not m/^\s*$/;
+   next if m/^\s*$/;
+   push @job, $_ ;
    }
 close JOB_LIST;
 
-my $stderr = $ENV{OAR_STDERR};
+my $stderr = $ENV{OAR_STDERR} || '';
 $stderr =~ s/\.stderr$//;
-my $stdout = $ENV{OAR_STDOUT};
+$stderr = $masterio if $masterio;
+my $stdout = $ENV{OAR_STDOUT} || '';
 $stdout =~ s/\.stdout$//;
+$stdout = $masterio if $masterio;
+
+my $current_dir = getcwd();
 
 my $finished = new Coro::Signal;
@@ -50 +60 @@
 
 my $ressources = new Coro::Channel;
-open( NODE_FILE, '<', "$ENV{OAR_NODE_FILE}" )
-   or die "can't open ENV{OAR_NODE_FILE}: $!";
+open( NODE_FILE, '<', "$nodefile" )
+   or die "can't open $nodefile: $!";
 while (<NODE_FILE>) {
    chomp;
+   next if m/^#/;
+   next if m/^\s*$/;
    $ressources->put($_);
    }
@@ -84 +96 @@
       $job_stderr = "2> $stderr-$job_num.stderr" if $stderr ne '' and $switchio;
 
-      $fh->print("cd $ENV{OAR_WORKDIR}\n");
+      $fh->print("cd $current_dir\n");
       $fh->print("$job $job_stdout $job_stderr\n");
       $fh->print("exit\n");
@@ -124 +136 @@
 =head1 SYNOPSIS
 
- oar-parexec --file filepath [--verbose] [--switchio] [--oarsh sssh]
+ oar-parexec --file filecommand [--verbose]  [--nodefile filenode] [--masterio basefileio] [--switchio] [--oarsh sssh]
  oar-parexec --help
 
+=head1 DESCRIPTION
+
+C<oar-parexec> execute lot of small job.in parallel inside a cluster.
+Number of parallel job at one time cannot excede core number in the node file.
+C<oar-parexec> is easier to use inside an OAR job environment
+which define automatically theses strategics parameters...
+
+Option C<--file> is the only mandatory one.
+
+Small job will be launch in the same folder as the master job.
+
+
 =head1 OPTIONS
 
- --file file name which content job list
-
- --verbose
-
- --switchio each small job will have it's own output STDOUT and STDERR
-            base on master OAR job with JOB_NUM inside. Example :
-
-            OAR.151524.stdout -> OAR.151524-JOB_NUM.stdout
-
-            where 151524 here is the master OAR_JOB_ID
-
- -oarsh command use to connect a shell on a node
-        by default
+=over 12
+
+=item B<-f|--file       filecommand>
+
+File name which content job list.
+
+=item B<-v|--verbose>
+
+=item B<-n|nodefile filenode>
+
+File name that list all the node to launch job.
+By defaut, it's define automatically by OAR via
+environment variable C<OAR_NODE_FILE>.
+
+For example, if you want to use 6 core on your cluster node,
+you need to put 6 times the hostname node in this file,
+one per line...
+It's a very common file in MPI process !
+
+=item B<-m|--masterio basefileio> 
+
+The C<basefileio> will be use in place of environment variable
+C<OAR_STDOUT> and C<OAR_STDERR> (without extension) to build the base name of the small job standart output
+(only when option C<swithio> is activated).
+
+=item B<-s|--switchio> 
+
+Each small job will have it's own output STDOUT and STDERR
+base on master OAR job with C<JOB_NUM> inside
+(or base on C<basefileio> if option C<masterio>).
+Example :
+
+ OAR.151524.stdout -> OAR.151524-JOB_NUM.stdout
+
+where 151524 here is the master C<OAR_JOB_ID>
+and C<JOB_NUM> is the small job nnumber.
+
+=item B<-o|-oarsh command>
+
+Command use to launch a shell on a node.
+By default
 
         oarsh -q -T
 
- --help
-
-
-=head1 DESCRIPTION
-
-C<oar-parexec> need to be executed inside an OAR job environment.
-because it need the two environment variable that OAR define by
-default:
-
- OAR_NODE_FILE path to a file which content one node by line
-
- OAR_WORKDIR   dir to launch job and do a chdir inside
+=item B<-h|--help>
+
+=back
+
+
+=head1 EXAMPLE
 
 Content for the job file (option C<--file>) could have:
@@ -170 +216 @@
  $HOME/test/subjob3.sh
  $HOME/test/subjob4.sh
-
+ ...
  $HOME/test/subjob38.sh
  $HOME/test/subjob39.sh