Merge pull request #1 from Thyre/exp-LLVMtoolchain

Add MPICH toolchains & fix toolchain options not showing up correctly.

Author: Crivella

easybuild/toolchains/compiler/llvm.py

@@ -44,8 +44,6 @@
 
 class LLVM(Compiler):
     """Compiler toolchain with LLVM compilers (clang/flang)."""
-    # NAME = 'LLVMcore'
-    # COMPILER_MODULE_NAME = [NAME]
     COMPILER_FAMILY = TC_CONSTANT_LLVM
     SUBTOOLCHAIN = SYSTEM_TOOLCHAIN_NAME
 
@@ -79,10 +77,8 @@ class LLVM(Compiler):
         'lld_undefined_version': (True, "-Wl,--undefined-version - Allow unused version in version script"),
         'no_unused_args': (
             True,
-            (
-                "-Wno-unused-command-line-argument - Avoid some failures in CMake correctly recognizing "
-                "feature due to linker warnings"
-            )
+            "-Wno-unused-command-line-argument - Avoid some failures in CMake correctly recognizing "
+            "feature due to linker warnings"
         ),
         'no_int_conversion_error': (
             True,
@@ -130,18 +126,21 @@ class LLVM(Compiler):
         'no_int_conversion_error': ['-Wno-error=int-conversion'],
     }
 
-    COMPILER_OPTIONS = [
-        'lld_undefined_version',
-    ]
+    # Ensure that compiler options only appear once, so that arguments do not appear multiple times when compiling.
+    COMPILER_OPTIONS = Compiler.COMPILER_OPTIONS
+    COMPILER_OPTIONS += ['lld_undefined_version']
+    COMPILER_OPTIONS = list(set(COMPILER_OPTIONS))
 
     # Options only available for Clang compiler
-    COMPILER_C_OPTIONS = [
+    COMPILER_C_UNIQUE_OPTIONS = Compiler.COMPILER_C_UNIQUE_OPTIONS
+    COMPILER_C_UNIQUE_OPTIONS += [
         'no_unused_args',
         'no_int_conversion_error'
     ]
+    COMPILER_C_UNIQUE_OPTIONS = list(set(COMPILER_C_UNIQUE_OPTIONS))
 
     # Options only available for Flang compiler
-    COMPILER_F_OPTIONS = []
+    COMPILER_F_UNIQUE_OPTIONS = Compiler.COMPILER_F_UNIQUE_OPTIONS
 
     # used when 'optarch' toolchain option is enabled (and --optarch is not specified)
     COMPILER_OPTIMAL_ARCHITECTURE_OPTION = {
@@ -150,6 +149,7 @@ class LLVM(Compiler):
         (systemtools.X86_64, systemtools.AMD): '-march=native',
         (systemtools.X86_64, systemtools.INTEL): '-march=native',
     }
+
     # used with --optarch=GENERIC
     COMPILER_GENERIC_OPTION = {
         (systemtools.RISCV64, systemtools.RISCV): '-march=rv64gc -mabi=lp64d',  # default for -mabi is system-dependent
@@ -159,12 +159,10 @@ class LLVM(Compiler):
 
     COMPILER_CC = 'clang'
     COMPILER_CXX = 'clang++'
-    COMPILER_C_UNIQUE_OPTIONS = []
 
     COMPILER_F77 = 'flang'
     COMPILER_F90 = 'flang'
     COMPILER_FC = 'flang'
-    COMPILER_F_UNIQUE_OPTIONS = []
 
     LIB_MULTITHREAD = ['pthread']
     LIB_MATH = ['m']

easybuild/toolchains/lmpflf.py

@@ -0,0 +1,45 @@
+##
+# Copyright 2013-2025 Ghent University
+#
+# This file is triple-licensed under GPLv2 (see below), MIT, and
+# BSD three-clause licenses.
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/easybuilders/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for lmpflf compiler toolchain (includes LLVM, MPICH, FlexiBLAS, LAPACK, ScaLAPACK and FFTW).
+
+Authors:
+
+* Jan Reuter (JSC)
+"""
+from easybuild.toolchains.lmpich import Lmpich
+from easybuild.toolchains.lfbf import Lfbf
+from easybuild.toolchains.fft.fftw import Fftw
+from easybuild.toolchains.linalg.flexiblas import FlexiBLAS
+from easybuild.toolchains.linalg.scalapack import ScaLAPACK
+
+
+class Lmpflf(Lmpich, FlexiBLAS, ScaLAPACK, Fftw):
+    """Compiler toolchain with LLVM, MPICH, FlexiBLAS, ScaLAPACK and FFTW."""
+    NAME = 'lmpflf'
+    SUBTOOLCHAIN = [Lmpich.NAME, Lfbf.NAME]

easybuild/toolchains/lmpich.py

@@ -0,0 +1,41 @@
+##
+# Copyright 2012-2025 Ghent University
+#
+# This file is part of EasyBuild,
+# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
+# with support of Ghent University (http://ugent.be/hpc),
+# the Flemish Supercomputer Centre (VSC) (https://www.vscentrum.be),
+# Flemish Research Foundation (FWO) (http://www.fwo.be/en)
+# and the Department of Economy, Science and Innovation (EWI) (http://www.ewi-vlaanderen.be/en).
+#
+# https://github.com/easybuilders/easybuild
+#
+# EasyBuild is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation v2.
+#
+# EasyBuild is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with EasyBuild.  If not, see <http://www.gnu.org/licenses/>.
+##
+"""
+EasyBuild support for gmpich compiler toolchain (includes GCC and MPICH).
+
+Authors:
+
+* Kenneth Hoste (Ghent University)
+* Jan Andre Reuter (JSC)
+"""
+
+from easybuild.toolchains.llvm import LLVMtc
+from easybuild.toolchains.mpi.mpich import Mpich
+
+
+class Lmpich(LLVMtc, Mpich):
+    """Compiler toolchain with LLVM and MPICH."""
+    NAME = 'lmpich'
+    SUBTOOLCHAIN = LLVMtc.NAME