Merge pull request #4119 from zerefwayne/update-openmpi

Adapt sanity checks for AMD ROCm

Author: jfgrimm

easybuild/easyblocks/o/openmpi.py

@@ -218,15 +218,19 @@ def sanity_check_step(self):
             expected['mpif90'] = 'pgfortran'
         # for Clang the pattern is always clang
         for key in ['mpicc', 'mpicxx']:
-            if expected[key] in ['clang++']:
+            if expected[key] in ['clang++', 'amdclang', 'amdclang++']:
                 expected[key] = 'clang'
         # for flang/flang-new the pattern is always flang
         for key in ['mpifort', 'mpif90']:
-            if expected[key] in ['flang', 'flang-new']:
+            if expected[key] in ['flang', 'flang-new', 'amdflang']:
                 expected[key] = 'flang'
 
         custom_commands = ["%s --version | grep '%s'" % (key, expected[key]) for key in sorted(expected.keys())]
 
+        rocmroot = get_software_root('ROCm-LLVM')
+        if rocmroot:
+            custom_commands.append("ompi_info | grep -i 'rocm'")
+
         # Add minimal test program to sanity checks
         # Run with correct MPI launcher
         mpi_cmd_tmpl, params = get_mpi_cmd_template(toolchain.OPENMPI, {}, mpi_version=self.version)