From ce5053c606344861ddb88a8ed0575f48cf5a9c52 Mon Sep 17 00:00:00 2001
From: Felix Tomski <tomski@itc.rwth-aachen.de>
Date: Tue, 7 Nov 2023 12:18:22 +0100
Subject: [PATCH] Do not buffer output of main job for srun modes
---
.gitlab-ci.yml | 2 +-
core/utility/executor.py | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 223bbf4..f8d65bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ variables:
.local-template:
variables:
- RUNNER_TAG: "custom2"
+ RUNNER_TAG: "ja664344"
.run-template:
stage: run
diff --git a/core/utility/executor.py b/core/utility/executor.py
index c807e91..681c57c 100644
--- a/core/utility/executor.py
+++ b/core/utility/executor.py
@@ -192,14 +192,12 @@ class Slurm_Executor(Executor, ABC):
return scancel_out
def run_direct(self, params="", wrapper_add="", script=""):
- out = self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh",
+ self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh",
allocator=self.get_srun_cmd(),
params=f'{self.get_default_params()} {params}',
target_script=script,
- wrapper_add=wrapper_add, main_script=True,
- text=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT).stdout
- logging.debug(out)
- return out
+ wrapper_add=wrapper_add, main_script=True)
+ return ''
def run_batched(self, params="", wrapper_add="", script=""):
sbatch_out = self.execute(helper_script=f"{self.job.scripts_path}/xPipeHelper.sh",
--
GitLab