diff --git a/binarycpython/utils/condor.py b/binarycpython/utils/condor.py index 21f2712b3b1fff2ca48e2a9f1d9ab34868405dbc..34a0effcd747b585de14e835720f040977bea948 100644 --- a/binarycpython/utils/condor.py +++ b/binarycpython/utils/condor.py @@ -325,6 +325,7 @@ should_transfer_files = {should_transfer_files} when_to_transfer_output = {when_to_transfer_output} requirements = {requirements} JobBatchName = {batchname} +kill_sig = {kill_sig} {extra_settings} queue {njobs} """.format( @@ -351,6 +352,7 @@ queue {njobs} when_to_transfer_output = self.grid_options['when_to_transfer_output'], requirements = self.grid_options['condor_requirements'], batchname = self.grid_options['condor_batchname'], + kill_sig = self.grid_options['condor_kill_sig'], extra_settings = extra_settings, njobs = self.grid_options['condor_njobs'], ) diff --git a/binarycpython/utils/grid_options_defaults.py b/binarycpython/utils/grid_options_defaults.py index 4fadaa343ed8127c6c8592dee0bb945f4d352570..a87ecc261d57a01df410b2745f583355a38a783e 100644 --- a/binarycpython/utils/grid_options_defaults.py +++ b/binarycpython/utils/grid_options_defaults.py @@ -251,6 +251,7 @@ class grid_options_defaults(): "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" : "binary_c-condor", # Condor batchname option + "condor_kill_sig" : "SIGINT", # signal Condor should use to stop a process : note that grid.py expects this to be "SIGINT" ########################## # Unordered. Need to go through this. Copied from the perl implementation. ##########################