Fixes to thes pbs send script
util/pbs/send.py: - add a -d to set the job root directory allowing one to run send.py from anywhere. - specify full paths to files instead of relative paths to make -d work and to allow ssh qsub to work again. - make the Link directory only copy links that point to regular files. --HG-- extra : convert_revision : dd330cee08b97c5d72c3d58ef123f83ac7ccede7
This commit is contained in:
parent
26ef1f56c8
commit
061f40df08
1 changed files with 24 additions and 19 deletions
|
@ -54,7 +54,7 @@ Usage:
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import getopt
|
import getopt
|
||||||
opts, args = getopt.getopt(sys.argv[1:], '-cefhlq:v')
|
opts, args = getopt.getopt(sys.argv[1:], '-cd:efhlq:v')
|
||||||
except getopt.GetoptError:
|
except getopt.GetoptError:
|
||||||
sys.exit(usage)
|
sys.exit(usage)
|
||||||
|
|
||||||
|
@ -65,42 +65,48 @@ force = False
|
||||||
listonly = False
|
listonly = False
|
||||||
queue = ''
|
queue = ''
|
||||||
verbose = False
|
verbose = False
|
||||||
for o,a in opts:
|
rootdir = re.sub(r'^/\.automount/', r'/n/', os.getcwd())
|
||||||
if o == '-c':
|
for opt,arg in opts:
|
||||||
|
if opt == '-c':
|
||||||
clean = True
|
clean = True
|
||||||
if o == '-e':
|
if opt == '-d':
|
||||||
|
rootdir = arg
|
||||||
|
if opt == '-e':
|
||||||
onlyecho = True
|
onlyecho = True
|
||||||
if o == '-f':
|
if opt == '-f':
|
||||||
force = True
|
force = True
|
||||||
if o == '-h':
|
if opt == '-h':
|
||||||
print usage
|
print usage
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
if o == '-l':
|
if opt == '-l':
|
||||||
listonly = True
|
listonly = True
|
||||||
if o == '-q':
|
if opt == '-q':
|
||||||
queue = a
|
queue = arg
|
||||||
if o == '-v':
|
if opt == '-v':
|
||||||
verbose = True
|
verbose = True
|
||||||
|
|
||||||
|
basedir = joinpath(rootdir, 'Base')
|
||||||
|
linkdir = joinpath(rootdir, 'Link')
|
||||||
|
|
||||||
for arg in args:
|
for arg in args:
|
||||||
exprs.append(re.compile(arg))
|
exprs.append(re.compile(arg))
|
||||||
|
|
||||||
if not listonly and not onlyecho and isdir('Link'):
|
if not listonly and not onlyecho and isdir(linkdir):
|
||||||
print 'Checking for outdated files in Link directory'
|
print 'Checking for outdated files in Link directory'
|
||||||
entries = listdir('Link')
|
entries = listdir(linkdir)
|
||||||
for entry in entries:
|
for entry in entries:
|
||||||
link = joinpath('Link', entry)
|
link = joinpath(linkdir, entry)
|
||||||
if not islink(link):
|
if not islink(link) or not isfile(link):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
base = joinpath('Base', entry)
|
base = joinpath(basedir, entry)
|
||||||
if not isfile(base) or not filecmp(link, base):
|
if not isfile(base) or not filecmp(link, base):
|
||||||
print '%s is different than source %s...copying' % (base, link)
|
print 'Base/%s is different than Link/%s: copying' % (entry, entry)
|
||||||
copyfile(link, base)
|
copyfile(link, base)
|
||||||
|
|
||||||
import job, jobfile, pbs
|
import job, jobfile, pbs
|
||||||
|
|
||||||
test = jobfile.JobFile(joinpath('Base', 'test.py'))
|
test = jobfile.JobFile(joinpath(basedir, 'test.py'))
|
||||||
|
|
||||||
joblist = []
|
joblist = []
|
||||||
for jobname in test.jobs:
|
for jobname in test.jobs:
|
||||||
|
@ -143,7 +149,6 @@ if not onlyecho:
|
||||||
jl.append(jobname)
|
jl.append(jobname)
|
||||||
joblist = jl
|
joblist = jl
|
||||||
|
|
||||||
rootdir = re.sub(r'^/\.automount/', r'/n/', os.getcwd())
|
|
||||||
for jobname in joblist:
|
for jobname in joblist:
|
||||||
jobdir = joinpath(rootdir, jobname)
|
jobdir = joinpath(rootdir, jobname)
|
||||||
|
|
||||||
|
@ -165,5 +170,5 @@ for jobname in joblist:
|
||||||
if len(queue):
|
if len(queue):
|
||||||
qsub.queue = queue
|
qsub.queue = queue
|
||||||
|
|
||||||
qsub.do(joinpath('Base', 'job.py'))
|
qsub.do(joinpath(basedir, 'job.py'))
|
||||||
print >>sys.stderr, ''
|
print >>sys.stderr, ''
|
||||||
|
|
Loading…
Reference in a new issue