Merge pull request #5141 from lexming/fix-nvhpc-hmns

fix handling of NVHPC toolchain with HMNS

Author: boegel

easybuild/tools/module_naming_scheme/hierarchical_mns.py

@@ -240,15 +240,18 @@ def det_modpath_extensions(self, ec):
                 raise EasyBuildError("No compiler available in toolchain %s used to install MPI library %s v%s, "
                                      "which is required by the active module naming scheme.",
                                      ec['toolchain'], ec['name'], ec['version'])
-            else:
-                tc_comp_name, tc_comp_ver = tc_comp_info
-                fullver = self.det_full_version(ec)
-                paths.append(os.path.join(MPI, tc_comp_name, tc_comp_ver, ec['name'], fullver))
+            tc_comp_name, tc_comp_ver = tc_comp_info
+            fullver = self.det_full_version(ec)
+            paths.append(os.path.join(MPI, tc_comp_name, tc_comp_ver, ec['name'], fullver))
 
-        # special case for Cray toolchains
         elif modclass == MODULECLASS_TOOLCHAIN and tc_comp_info is None:
+            # special case for Cray toolchains
             if any(ec.name.startswith(x) for x in CRAY_TOOLCHAIN_NAME_PREFIXES):
                 paths.append(os.path.join(TOOLCHAIN, ec.name, ec.version))
+            # special case for NVHPC toolchains that lack standalone MPI component
+            elif ec.name == "NVHPC" and "GCCcore" not in {dep['name'] for dep in ec['dependencies']}:
+                fullver = self.det_full_version(ec)
+                paths.append(os.path.join(MPI, "nvidia-compilers", fullver, ec.name, fullver))
 
         return paths
 

test/framework/easyconfigs/test_ecs/n/NVHPC/NVHPC-25.9.eb

@@ -0,0 +1,37 @@
+# should be EB_NVHPC, but toy is enough for testing purposes
+easyblock = 'EB_toy'
+
+name = 'NVHPC'
+version = '25.9'
+
+homepage = 'https://developer.nvidia.com/hpc-sdk/'
+description = """Complete toolchain based on NVIDIA HPC SDK. Includes C, C++ and FORTRAN
+compilers (nvidia-compilers), an MPI implementation based on OpenMPI (NVHPCX)
+and math libraries based on OpenBLAS and ScaLAPACK."""
+
+toolchain = SYSTEM
+
+# By downloading, you accept the HPC SDK Software License Agreement
+# https://docs.nvidia.com/hpc-sdk/eula/index.html
+local_tarball_tmpl = 'nvhpc_2025_%%(version_major)s%%(version_minor)s_Linux_%s_cuda_multi.tar.gz'
+source_urls = ['https://developer.download.nvidia.com/hpc-sdk/%(version)s/']
+sources = [local_tarball_tmpl % '%(arch)s']
+checksums = [
+    {
+        local_tarball_tmpl % 'aarch64':
+            'c50f5cef29a3d535605409effab26c45bb36ba237968565856f733d7b733b514',
+        local_tarball_tmpl % 'x86_64':
+            '382e50122119a7aff4cfb3e3180342d02e09a9e47beaaac66441ff843f89077d',
+    }
+]
+
+dependencies = [
+    ('nvidia-compilers', version),
+]
+
+# NVHPC needs CUDA to work. This easyconfig uses CUDA bundled in NVHPC
+# The default CUDA version used by NVHPC is the one defined in nvidia-compilers
+
+# The default Compute Capability used by NVHPC is the one defined in nvidia-compilers (if any)
+
+moduleclass = 'toolchain'

test/framework/module_generator.py

@@ -1639,6 +1639,14 @@ def test_ec(ecfile, short_modname, mod_subdir, modpath_exts, user_modpath_exts,
                                 ['Toolchain/cpeGNU/21.04'],
                                 ['Core']),
             'HPL-2.1-CrayCCE-5.1.29.eb': ('HPL/2.1', 'Toolchain/CrayCCE/5.1.29', [], [], ['Core']),
+            'nvidia-compilers-25.9.eb': ('nvidia-compilers/25.9', 'Core',
+                                         ['Compiler/nvidia-compilers/25.9'],
+                                         ['Compiler/nvidia-compilers/25.9'],
+                                         ['Core']),
+            'NVHPC-25.9.eb': ('NVHPC/25.9', 'Core',
+                              ['MPI/nvidia-compilers/25.9/NVHPC/25.9'],
+                              ['MPI/nvidia-compilers/25.9/NVHPC/25.9'],
+                              ['Core']),
         }
         for ecfile, mns_vals in test_ecs.items():
             test_ec(ecfile, *mns_vals)
@@ -1676,6 +1684,12 @@ def test_ec(ecfile, short_modname, mod_subdir, modpath_exts, user_modpath_exts,
                       ['MPI/intel/%s/impi/5.1.2.150' % iccver]),
             imkl_ec: ('imkl/11.3.1.150', 'MPI/intel/%s/impi/5.1.2.150/numlib' % iccver,
                       [], []),
+            'nvidia-compilers-25.9.eb': ('nvidia-compilers/25.9', 'Core/compiler',
+                                         ['Compiler/nvidia-compilers/25.9/%s' % c for c in moduleclasses],
+                                         ['Compiler/nvidia-compilers/25.9']),
+            'NVHPC-25.9.eb': ('NVHPC/25.9', 'Core/toolchain',
+                              ['MPI/nvidia-compilers/25.9/NVHPC/25.9/%s' % c for c in moduleclasses],
+                              ['MPI/nvidia-compilers/25.9/NVHPC/25.9']),
         }
         for ecfile, mns_vals in test_ecs.items():
             test_ec(ecfile, *mns_vals, init_modpaths=['Core/%s' % c for c in moduleclasses])