diff --git a/binarycpython/utils/condor.py b/binarycpython/utils/condor.py index 15fcb9db2512f7ee73d2f130b91b0e88fb50f58b..21f2712b3b1fff2ca48e2a9f1d9ab34868405dbc 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 1b80b2e6166231c534697519967b807c2b2fca7c..4fadaa343ed8127c6c8592dee0bb945f4d352570 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 8d4b77e5273243c24e3c2f765e0c0a25fedef692..7fb4c5a454fae07576a22bffddcac028d3eb1dab 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:] + [