X-Git-Url: https://git.donarmstrong.com/?p=uiuc_igb_scripts.git;a=blobdiff_plain;f=dqsub;h=1682d058c4871516720932a1a80f29ef2cd447ad;hp=8d12b21fc6f4f9a6ec256c2e53f42aff47ff70a8;hb=819b503b14406a8509f6ea12a425513b5916d9df;hpb=38558ec64976a7d0c8adf451b2b927996206f6bb

diff --git a/dqsub b/dqsub
index 8d12b21..1682d05 100755
--- a/dqsub
+++ b/dqsub
@@ -26,9 +26,14 @@ dqsub [options]
    --nodes nodes to use
    --array array mode (one of 'chdir' or 'xargs' or '')
    --array-from file to read arrays from (default STDIN)
+   --array-per-job number of array items to handle in each job (default 1)
+   --array-all-in-one-job Run all of the array items in one job
    --ppn processors per node to use
    --mem memory to request
    --dir Directory to run the script in (default current directory)
+   --account, -A Account name to use
+   --join, -J join error and output streams (default)
+   --name, -N Name of the job
    --debug, -d debugging level (Default 0)
    --help, -h display this help
    --man, -m display manual
@@ -57,6 +62,15 @@ command run in the current directory.
 File to read array arguments from. If not provided, and B<--array> is
 given, arguments will be read from STDIN.
 
+=item B<--account, -A>
+
+Account name to use
+
+=item B<--join, J>
+
+Whether to join STDOUT and STDERR. On by default; disable with
+C<--nojoin>.
+
 =item B<--debug, -d>
 
 Debug verbosity. (Default 0)
@@ -79,6 +93,8 @@ dqsub
 
 use IO::File;
 use Cwd qw(getcwd abs_path);
+use POSIX qw(ceil);
+use List::Util qw(min);
 use vars qw($DEBUG);
 
 my %options = (nodes           => 1,
@@ -88,6 +104,8 @@ my %options = (nodes           => 1,
                help            => 0,
                man             => 0,
                interactive     => 0,
+               array_per_job   => 1,
+               join            => 1,
               );
 
 GetOptions(\%options,
@@ -96,9 +114,19 @@ GetOptions(\%options,
            'nodes=i',
            'array=s',
            'array_from|array-from=s',
+           'array_per_job|array-per-job=i',
+           'array_slot_limit|array-slot-limit=i',
+           'array_all_in_one_job|array-all-in-one-job!',
            'ppn|processors-per-node=i',
+           'account|A=s',
+           'join|J!',
            'mem|memory=s',
+           'time|walltime=s','cputime|cput=s','host=s',
+           'pmem|process_mem|process-mem=s',
+           'pvmem|process_virtual_mem|process-virtiual-mem=s',
+           'max_file|max-file|file=s',
            'dir=s',
+           'name=s',
            'debug|d+','help|h|?','man|m');
 
 # pod2usage() if $options{help};
@@ -122,10 +150,13 @@ if ($options{interactive} and @ARGV) {
 }
 
 # pod2usage(join("\n",@USAGE_ERRORS)) if @USAGE_ERRORS;
-print STDERR join("\n",@USAGE_ERRORS) and exit 1 if @USAGE_ERRORS;
+if (@USAGE_ERRORS) {
+    print STDERR map {"$_\n"} @USAGE_ERRORS;
+    exit 1;
+}
 
 # OK. Generate the options to qsub which we'll be using
-my @qsub_options = generate_qsub_options(\%options);
+my @qsub_options = generate_qsub_options(\%options,\@ARGV);
 
 if ($options{interactive}) {
     print STDERR 'running: qsub '.join(' ',@qsub_options) if $DEBUG;
@@ -135,13 +166,20 @@ if ($options{interactive}) {
     if ($options{array}) {
         @array = read_array_options(\%options) if $options{array};
         # the -t option gives the range of elements for an array job
-        push @qsub_options,'-t','1-'. scalar @array;
+        if ($options{array_all_in_one_job}) {
+            $options{array_per_job} = scalar @array;
+        } else {
+            push @qsub_options,'-t','1-'. ceil(scalar @array / $options{array_per_job});
+            if ($options{array_slot_limit}) {
+                $qsub_options[$#qsub_options] .= '%'.$options{array_slot_limit};
+            }
+        }
     }
     call_qsub(\@qsub_options,write_qsub_script(\%options,\@ARGV,\@array));
 }
 
 sub generate_qsub_options{
-    my ($options) = @_;
+    my ($options,$args) = @_;
     my @qo;
     if (defined $options->{queue} and length $options->{queue}) {
         push @qo,'-q',$options->{queue};
@@ -157,13 +195,38 @@ sub generate_qsub_options{
     if (defined $options->{ppn}) {
         $l[$#l] .= ':ppn='.$options->{ppn};
     }
-    if ($options->{mem}) {
-        push @l,'mem='.$options->{mem};
+    if (defined $options->{account}) {
+        push @qo,'-A',$options->{account};
+    }
+    my %l_options =
+        (mem => 'vmem',
+         time => 'walltime',
+         cputime => 'cput',
+         host    => 'host',
+         pmem => 'pmem',
+         pvmem => 'pvmem',
+         max_file => 'file',
+        );
+    for my $k (keys %l_options) {
+        if ($options->{$k}) {
+            push @l,$l_options{$k}.'='.$options{$k};
+        }
     }
     push @qo,'-l',join(',',@l) if @l;
     if ($options->{interactive}) {
         push @qo,'-I';
     }
+    if ($options->{name}) {
+        push @qo,'-N',$options->{name};
+    } else {
+        push @qo,'-N',join('_',
+                           map {my $a = $_; $a =~ s/[^a-zA-Z0-9]*//g; $a;}
+                          @{$args}[0..min($#{$args},2)]);
+    }
+    # join error and output streams
+    if ($options->{join}) {
+        push @qo,'-j','oe';
+    }
     return @qo;
 }
 
@@ -197,26 +260,54 @@ sub write_qsub_script {
     my ($opt,$arg,$array) = @_;
 
     my $script = "#!/bin/bash\n";
-    my $command = join(' ',map {qq('$_')} @{$arg});
+    my $command = join(' ',map {$_ =~ /\s/?qq('$_'):$_} @{$arg});
         $script .= <<EOF;
 # this script was written by dqsub
 EOF
     if (defined $opt->{array}) {
+        my @subshell = ('','');
         my $array_opt = join("\n",@{$array});
+        my $max_array = scalar @{$array};
+        my $apjm1 = $opt->{array_per_job} - 1;
+        if ($opt->{array_per_job} > 1) {
+            # we will use subshells if there are more than one array
+            # items per job
+            @subshell = ('(',')');
+            $script .= <<EOF;
+for i in \$(seq 1 $opt->{array_per_job}); do
+# in some cases, the jobs aren't going to come out evenly. Handle that.
+JOBNUM=\$(( \${PBS_ARRAYID:=1} * $opt->{array_per_job} + \$i - $opt->{array_per_job} ))
+if [ \$JOBNUM -le $max_array ]; then 
+OPT=\$(sed -n -e "\$JOBNUM p"<<'_HERE_DOC_END_'
+EOF
+        } else {
+            $script .= <<EOF;
+OPT=\$(sed -n -e "\${PBS_ARRAYID:=1} p"<<'_HERE_DOC_END_'
+EOF
+        }
         $script .= <<EOF;
-OPT=\$(sed -n -e "\$PBS_ARRAYID p"<<'_HERE_DOC_END_'
 $array_opt
 _HERE_DOC_END_
 )
 EOF
         if ($opt->{array} eq 'chdir') {
             $script .= <<EOF;
+$subshell[0]
 cd "\$OPT";
-exec $command;
+exec ${command};
+$subshell[1]
 EOF
         } else {
             $script .= <<EOF;
-exec $command "\$OPT";
+$subshell[0]
+exec ${command} "\$OPT";
+$subshell[1]
+EOF
+        }
+        if ($opt->{array_per_job} > 1) {
+            $script .= <<EOF
+fi;
+done;
 EOF
         }
     } else {