From 66252c61e2628175a0bb3bac5a29164c68e32d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20R=C3=B6blitz?= Date: Wed, 28 May 2025 19:44:23 +0200 Subject: [PATCH 1/2] fix issue that parallel gets set to None with EB 5+ --- eb_hooks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index e8afdc75d9..fe02b7db2a 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -133,7 +133,8 @@ def post_ready_hook(self, *args, **kwargs): # Check whether we have EasyBuild 4 or 5 parallel_param = 'parallel' if EASYBUILD_VERSION >= '5': - parallel_param = 'max_parallel' + # parallel_param = 'max_parallel' # EasyBlock.set_parallel sets 'parallel' + parallel_param = 'parallel' # get current parallelism setting parallel = self.cfg[parallel_param] if parallel == 1: From 99d8f1b73871973344d8df5f1d26738037933193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20R=C3=B6blitz?= Date: Wed, 28 May 2025 22:26:37 +0200 Subject: [PATCH 2/2] different workaround for missing setting in EB5+ --- eb_hooks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eb_hooks.py b/eb_hooks.py index fe02b7db2a..0280c325c8 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -133,10 +133,11 @@ def post_ready_hook(self, *args, **kwargs): # Check whether we have EasyBuild 4 or 5 parallel_param = 'parallel' if EASYBUILD_VERSION >= '5': - # parallel_param = 'max_parallel' # EasyBlock.set_parallel sets 'parallel' - parallel_param = 'parallel' + parallel_param = 'max_parallel' # get current parallelism setting parallel = self.cfg[parallel_param] + if parallel == None: + return # self.cfg doesn't contain 'parallel' or 'max_parallel' if parallel == 1: return # no need to limit if already using 1 core