From 3dbb2c00050144f3f70eb33913d5fef4ed5be6fb Mon Sep 17 00:00:00 2001 From: Damian Alvarez Date: Fri, 23 Aug 2024 15:20:19 +0200 Subject: [PATCH] psmpi: To support the renaming of a couple of options in this version --- easybuild/easyblocks/p/psmpi.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/easybuild/easyblocks/p/psmpi.py b/easybuild/easyblocks/p/psmpi.py index 82e9c33443..9d91dd09d3 100644 --- a/easybuild/easyblocks/p/psmpi.py +++ b/easybuild/easyblocks/p/psmpi.py @@ -92,7 +92,10 @@ def configure_step(self): if self.cfg['msa']: self.log.info("Enabling MSA-Awareness...") - self.cfg.update('configopts', ' --with-msa-awareness') + if LooseVersion(self.version) >= LooseVersion('5.10.0-1'): + self.cfg.update('configopts', ' --enable-msa-awareness') + else: + self.cfg.update('configopts', ' --with-msa-awareness') # Set confset comp_fam = self.toolchain.comp_family() @@ -104,7 +107,10 @@ def configure_step(self): # Enable threading, if necessary if self.cfg['threaded']: - self.cfg.update('configopts', ' --with-threading') + if LooseVersion(self.version) >= LooseVersion('5.10.0-1'): + self.cfg.update('configopts', ' --enable-threading') + else: + self.cfg.update('configopts', ' --with-threading') # Add extra mpich options, if any if self.cfg['mpich_opts'] is not None: