From c2b9833e1dbd29207fec1d0df6daa9c94c68acc6 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 15 Mar 2025 12:50:13 +0000 Subject: [PATCH 1/3] consider default parallelism --- easybuild/tools/systemtools.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/easybuild/tools/systemtools.py b/easybuild/tools/systemtools.py index 6d384ad573..c8198d3a83 100644 --- a/easybuild/tools/systemtools.py +++ b/easybuild/tools/systemtools.py @@ -1240,13 +1240,16 @@ def get_default_parallelism(): det_parallelism._default_parallelism = par return par - if par is None: - par = get_default_parallelism() - else: - try: - par = int(par) - except ValueError as err: - raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err) + try: + par = int(par) + except ValueError as err: + raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err) + + defaultpar = get_default_parallelism() + + if defaultpar < par + _log.info("Reducing parallelism from %s to %s", par, defaultpar) + par = defaultpar if maxpar is not None and maxpar < par: if maxpar is False: From 9a91bb9b2d050103bfe75fc20df719f24fedb228 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 15 Mar 2025 12:52:25 +0000 Subject: [PATCH 2/3] add missing : --- easybuild/tools/systemtools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/tools/systemtools.py b/easybuild/tools/systemtools.py index c8198d3a83..c0e1394508 100644 --- a/easybuild/tools/systemtools.py +++ b/easybuild/tools/systemtools.py @@ -1247,7 +1247,7 @@ def get_default_parallelism(): defaultpar = get_default_parallelism() - if defaultpar < par + if defaultpar < par: _log.info("Reducing parallelism from %s to %s", par, defaultpar) par = defaultpar From 2c0d30ccb2743bc1f702c4e9a61a245d47b41630 Mon Sep 17 00:00:00 2001 From: Simon Branford Date: Sat, 15 Mar 2025 12:57:52 +0000 Subject: [PATCH 3/3] unbreak the tests --- easybuild/tools/systemtools.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/easybuild/tools/systemtools.py b/easybuild/tools/systemtools.py index c0e1394508..dd9ac39c8a 100644 --- a/easybuild/tools/systemtools.py +++ b/easybuild/tools/systemtools.py @@ -1240,12 +1240,14 @@ def get_default_parallelism(): det_parallelism._default_parallelism = par return par - try: - par = int(par) - except ValueError as err: - raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err) - defaultpar = get_default_parallelism() + if par is None: + par = defaultpar + else: + try: + par = int(par) + except ValueError as err: + raise EasyBuildError("Specified level of parallelism '%s' is not an integer value: %s", par, err) if defaultpar < par: _log.info("Reducing parallelism from %s to %s", par, defaultpar)