Skip to content

Add environment variables to submit jobs #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add environment variables to submit jobs #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions gwsumm/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def __init__(self, universe, tag='gw_summary',
logdir, '%s-%s.err' % (tag, self.logtag)))
self.set_stdout_file(os.path.join(
logdir, '%s-%s.out' % (tag, self.logtag)))
cmds.setdefault('getenv', 'True')
for key, val in cmds.items():
if hasattr(self, 'set_%s' % key.lower()):
getattr(self, 'set_%s' % key.lower())(val)
Expand Down Expand Up @@ -507,6 +506,9 @@ def main(args=None):
'$$(CondorScratchDir)/.condor_creds/scitokens.use'
)

# Environment variables from the access point
envvars = 'DEFAULT_SEGMENT_SERVER, GWDATAFIND_SERVER, NDSSERVER, CONDA_EXE'

# -- build individual gw_summary jobs -----------

globalconfig = ','.join(args.global_config)
Expand All @@ -520,7 +522,9 @@ def main(args=None):
if not args.html_wrapper_only:
datajob = GWSummaryJob(
universe, subdir=outdir, logdir=logdir,
tag=args.file_tag, **condorcmds)
tag=args.file_tag, **condorcmds,
getenv=envvars,
)
jobs.append(datajob)

# add common command-line options
Expand Down
2 changes: 1 addition & 1 deletion gwsumm/data/timeseries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ def _get_timeseries_dict(channels, segments, config=None,
if nds is None and cache is not None:
nds = False
elif nds is None:
nds = 'LIGO_DATAFIND_SERVER' not in os.environ
nds = 'GWDATAFIND_SERVER' not in os.environ

# read new data
query &= (abs(new) > 0)
Expand Down
Loading