From fbb282ff254c780c6b79f9d92053754d1c50157e Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 15 Nov 2021 09:25:09 +0000
Subject: [PATCH] fix typos
---
binarycpython/utils/condor.py | 2 +-
binarycpython/utils/grid_options_defaults.py | 4 ++--
binarycpython/utils/slurm.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/binarycpython/utils/condor.py b/binarycpython/utils/condor.py
index 15fcb9db2..21f2712b3 100644
--- a/binarycpython/utils/condor.py
+++ b/binarycpython/utils/condor.py
@@ -328,7 +328,7 @@ JobBatchName = {batchname}
{extra_settings}
queue {njobs}
""".format(
- usr_bin_env = self.grid_options['condor_usr_bin_env'],
+ usr_bin_env = self.grid_options['condor_env'],
bash = self.grid_options['condor_bash'],
job_script_path = job_script_path,
universe = self.grid_options['condor_universe'],
diff --git a/binarycpython/utils/grid_options_defaults.py b/binarycpython/utils/grid_options_defaults.py
index 1b80b2e61..4fadaa343 100644
--- a/binarycpython/utils/grid_options_defaults.py
+++ b/binarycpython/utils/grid_options_defaults.py
@@ -241,7 +241,7 @@ class grid_options_defaults():
'condor_save_joined_file':0, # if 1 then results/joined contains the results
# (useful for debugging, otherwise a lot of work)
'condor_requirements':'', # job requirements
- 'condor_usr_bin_env' : shutil.which("env"), # /usr/bin/env location
+ 'condor_env' : shutil.which("env"), # /usr/bin/env location
'condor_bash' : shutil.which("bash"), # bash executable location
"condor_pwd" : shutil.which("pwd"), # pwd command location for Condor
"condor_date" : shutil.which("date"), # bash location for Condor
@@ -250,7 +250,7 @@ class grid_options_defaults():
"condor_submit" : "condor_submit", # the condor_submit command
"condor_getenv" : True, # if True condor takes the environment at submission and copies it to the jobs. You almost certainly want this.
"condor_restart_dir" : None, # restart Condor jobs from this directory
- "condor_batchname" : "", # Condor batchname option
+ "condor_batchname" : "binary_c-condor", # Condor batchname option
##########################
# Unordered. Need to go through this. Copied from the perl implementation.
##########################
diff --git a/binarycpython/utils/slurm.py b/binarycpython/utils/slurm.py
index 8d4b77e52..7fb4c5a45 100644
--- a/binarycpython/utils/slurm.py
+++ b/binarycpython/utils/slurm.py
@@ -219,7 +219,7 @@ class slurm():
# build the grid command
grid_command = [
- str(grid_options['slurm_env'])
+ str(grid_options['slurm_env']),
sys.executable,
str(lib_programname.get_path_executed_script()),
] + sys.argv[1:] + [
--
GitLab