diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/pbs/pbs.py | 2 | ||||
| -rwxr-xr-x | util/pbs/send.py | 9 | ||||
| -rwxr-xr-x | util/qdo | 2 | ||||
| -rwxr-xr-x | util/stats/stats.py | 4 |
4 files changed, 12 insertions, 5 deletions
diff --git a/util/pbs/pbs.py b/util/pbs/pbs.py index 70a0c6bed..21c2cb89d 100755 --- a/util/pbs/pbs.py +++ b/util/pbs/pbs.py @@ -147,6 +147,8 @@ class qsub: flags.append('e') if len(flags): self.cmd.append('-m ' + flags) + else: + self.cmd.append('-mn') if self.name: self.cmd.append("-N%s" % self.name) diff --git a/util/pbs/send.py b/util/pbs/send.py index d04f9066b..54bba931d 100755 --- a/util/pbs/send.py +++ b/util/pbs/send.py @@ -79,6 +79,8 @@ usage = """\ Usage: %(progname)s [-c] [-e] [-f] [-j <jobfile>] [-q queue] [-v] <regexp> -c clean directory if job can be run + -C submit the checkpointing runs + -d Make jobs be dependent on the completion of the checkpoint runs -e only echo pbs command info, don't actually send the job -f force the job to run regardless of state -q <queue> submit job to the named queue @@ -96,7 +98,7 @@ Usage: try: import getopt - opts, args = getopt.getopt(sys.argv[1:], '-Ccdefhj:lq:Rt:v') + opts, args = getopt.getopt(sys.argv[1:], '-Ccdefhj:lnq:Rt:v') except getopt.GetoptError: sys.exit(usage) @@ -113,6 +115,7 @@ docpts = False doruns = True runflag = False node_type = 'FAST' +update = True for opt,arg in opts: if opt == '-C': @@ -132,6 +135,8 @@ for opt,arg in opts: jfile = arg if opt == '-l': listonly = True + if opt == '-n': + update = False if opt == '-q': queue = arg if opt == '-R': @@ -152,7 +157,7 @@ from job import JobDir, date conf = jobfile.JobFile(jfile) -if not listonly and not onlyecho and isdir(conf.linkdir): +if update and not listonly and not onlyecho and isdir(conf.linkdir): if verbose: print 'Checking for outdated files in Link directory' if not isdir(conf.basedir): @@ -99,7 +99,7 @@ class Shell(pexpect.spawn): self.expect('\$ ', options.qsub_timeout) except pexpect.TIMEOUT: print >>sys.stderr, "%s: qsub timed out." % progname - self.kill(15) + self.kill(9) self.close(wait=True) sys.exit(1) self.do_command('unset PROMPT_COMMAND; PS1="qdo$ "') diff --git a/util/stats/stats.py b/util/stats/stats.py index e481a794c..61f54dede 100755 --- a/util/stats/stats.py +++ b/util/stats/stats.py @@ -179,7 +179,7 @@ def commands(options, command, args): source.method = 'sum' def disp(*args): - print "%-20s %12s %12s %4s %5s %5s %5s %10s" % args + print "%-35s %12s %12s %4s %5s %5s %5s %10s" % args # temporary variable containing a bunch of dashes d = '-' * 100 @@ -189,7 +189,7 @@ def commands(options, command, args): print "%s:" % stat.name disp("run name", "average", "stdev", ">10%", ">1SDV", ">2SDV", "SAMP", "CV") - disp(d[:20], d[:12], d[:12], d[:4], d[:5], d[:5], d[:5], d[:10]) + disp(d[:35], d[:12], d[:12], d[:4], d[:5], d[:5], d[:5], d[:10]) #loop through all the selected runs for run in runs: |