From d6ab9a4dd6d93e4ffaf0529bd209839d4610b3dc Mon Sep 17 00:00:00 2001
From: Damian Alvarez <swmanage@juwels01.ib.juwels.fzj.de>
Date: Fri, 28 Aug 2020 18:05:40 +0200
Subject: [PATCH] Enable building psmpi with NVHPC

---
 Custom_EasyBlocks/psmpi.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Custom_EasyBlocks/psmpi.py b/Custom_EasyBlocks/psmpi.py
index e6a381e0b..b63b19090 100644
--- a/Custom_EasyBlocks/psmpi.py
+++ b/Custom_EasyBlocks/psmpi.py
@@ -214,6 +214,7 @@ class EB_psmpi(EB_MPICH):
             toolchain.GCC: 'gcc',
             toolchain.INTELCOMP: 'intel',
             toolchain.PGI: 'pgi',
+            toolchain.NVHPC: 'nvhpc',
         }
 
         # ParaStationMPI defines its environment through confsets. So these should be unset
@@ -229,7 +230,10 @@ class EB_psmpi(EB_MPICH):
         # Set confset
         comp_fam = self.toolchain.comp_family()
         if comp_fam in comp_opts:
-            self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[comp_fam])
+            if comp_opts[comp_fam] is comp_opts[toolchain.NVHPC]:
+                self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[toolchain.PGI])
+            else:
+                self.cfg.update('configopts', ' --with-confset=%s' % comp_opts[comp_fam])
         else:
             raise EasyBuildError("Compiler %s not supported. Valid options are: %s",
                                  comp_fam, ', '.join(comp_opts.keys()))
-- 
GitLab