Skip to content
Snippets Groups Projects
Commit 52434b6e authored by Adrian Schmitz's avatar Adrian Schmitz
Browse files

HOTFIX: remove redundant and broken jobid callbacks for slurm

parent 98183df1
Branches
Tags
No related merge requests found
...@@ -53,7 +53,7 @@ class SingleSlurmJobAcrossStages(Slurm, ABC): ...@@ -53,7 +53,7 @@ class SingleSlurmJobAcrossStages(Slurm, ABC):
logging.info(f'Using slurm_job_id={self.slurm_job_id}, could find {self.slurm_jobid_file}') logging.info(f'Using slurm_job_id={self.slurm_job_id}, could find {self.slurm_jobid_file}')
tmp_dir_srun_out = self.executor.management_handler(helper_script=f"{self.job.scripts_path}/runHelper.sh", tmp_dir_srun_out = self.executor.management_handler(helper_script=f"{self.job.scripts_path}/runHelper.sh",
wrapper_add=f'--jobid {self.slurm_job_id} /usr/bin/printenv TMP').split('\n') wrapper_add=f'/usr/bin/printenv TMP').split('\n')
logging.debug(f'srun tmp_dir output (unfitered): {tmp_dir_srun_out}') logging.debug(f'srun tmp_dir output (unfitered): {tmp_dir_srun_out}')
ignores = ['error', 'slurmstepd'] ignores = ['error', 'slurmstepd']
self.tmp_dir = [x for x in tmp_dir_srun_out if all(s not in x for s in ignores)] self.tmp_dir = [x for x in tmp_dir_srun_out if all(s not in x for s in ignores)]
...@@ -69,7 +69,6 @@ class SingleSlurmJobAcrossStages(Slurm, ABC): ...@@ -69,7 +69,6 @@ class SingleSlurmJobAcrossStages(Slurm, ABC):
additional_env.append(f"{k}={v}") additional_env.append(f"{k}={v}")
if len(additional_env) != 0: if len(additional_env) != 0:
parameters += f' --export=' + ",".join(additional_env) parameters += f' --export=' + ",".join(additional_env)
parameters += f' --jobid={self.slurm_job_id}'
return parameters return parameters
def get_simple_run_wrapper(self): def get_simple_run_wrapper(self):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment