mx/MX_Pmodule
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mpich_intelcc' into 'master'

Browse Source 
Mpich intelcc

See merge request Pmodules/buildblocks!519
This commit is contained in:
caubet_m
2025-08-14 14:39:18 +02:00
parent 9d2d45ca53 330e10223a
commit a2a8be62e5
3 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Compiler/mpich/build
View File

@@ -1,7 +1,22 @@
#!/usr/bin/env modbuild #!/usr/bin/env modbuild
pbuild::pre_configure() { pbuild::pre_configure() {
unset F90 # It seems 'unset F90' is here since 2015-10-14
# Probably some old gcc or mpich versions had problems with it
# To review for gcc, but I think this should be not set anymore
#
# The versions compiled with 'unset F90' on Merlin7 are:
# mpich/3.3.2 unstable Compiler Alps gcc/8.4.0
# mpich/4.2.3 stable Compiler Alps gcc/8.5.0
# mpich/4.2.3 stable Compiler Alps gcc/12.3.0
# mpich/4.3.1 stable Compiler Alps gcc/8.5.0
# mpich/4.3.1 stable Compiler Alps gcc/12.3.0
#
# Finally, compiling with 'unset F90' crashes IntelCC based compilations
# which require it
#
# Commented out from now on:
# unset F90
pbuild::add_configure_args "--enable-shared" pbuild::add_configure_args "--enable-shared"
pbuild::add_configure_args "--enable-static" pbuild::add_configure_args "--enable-static"
@@ -47,13 +62,17 @@ pbuild::pre_configure() {
pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}" pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}"
fi fi
if [[ -v INTEL_VERSION ]]; then if [[ -v INTEL_VERSION ]] || [[ -v INTELCC_VERSION ]]; then
pbuild::add_configure_args "CC=icc" # Commented out, since this comes with the Intel/IntelCC modules
pbuild::add_configure_args "CXX=icpc" #
pbuild::add_configure_args "FC=ifort" # pbuild::add_configure_args "CC=$(which icc)"
pbuild::add_configure_args "F90=ifort" # pbuild::add_configure_args "CXX=$(which icpc)"
pbuild::add_configure_args "F77=ifort" # pbuild::add_configure_args "FC=$(which ifort)"
pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0" # pbuild::add_configure_args "F90=$(which ifort)"
# pbuild::add_configure_args "F77=$(which ifort)"
# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0"
#
# In general, any extra configure args should go to config.yaml
fi fi
if pbuild::use_flag slurm || \ if pbuild::use_flag slurm || \

12
Compiler/mpich/files/config.yaml
View File

@@ -20,6 +20,18 @@ mpich:
versions: versions:
4.3.1: 4.3.1:
variants: variants:
- systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch]
relstage: unstable
overlay: Alps
target_cpus: ['x86_64'] # MC
use_overlays: [PSI, Alps]
use_flags: [merlin7, slurm]
group_deps:
compiler: {intelcc: [22.2]}
build_requires: [hwloc/2.12.0, patchelf/0.14.5]
runtime_deps: [libfabric/2.2.0-oss]
configure_args+:
- --with-pm=hydra,gforker
- systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch] - systems: [login.*.merlin7.psi.ch, cn.*.merlin7.psi.ch]
relstage: stable relstage: stable
overlay: Alps overlay: Alps

21
Compiler/openmpi/build
View File

@@ -75,14 +75,19 @@ pbuild::pre_configure() {
pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}" pbuild::add_configure_args "--with-ucx=${UCX_PREFIX}"
fi fi
if [[ -v INTEL_VERSION ]]; then if [[ -v INTEL_VERSION ]] || [[ -v INTELCC_VERSION ]]; then
pbuild::add_configure_args "CC=icc" # Commented out, since this comes with the Intel/IntelCC modules
pbuild::add_configure_args "CXX=icpc" #
pbuild::add_configure_args "FC=ifort" # pbuild::add_configure_args "CC=$(which icc)"
pbuild::add_configure_args "F90=ifort" # pbuild::add_configure_args "CXX=$(which icpc)"
pbuild::add_configure_args "F77=ifort" # pbuild::add_configure_args "FC=$(which ifort)"
# -O0 was probably added for enabling debugging: # pbuild::add_configure_args "F90=$(which ifort)"
# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0" # pbuild::add_configure_args "F77=$(which ifort)"
# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel,-O0"
# |- -O0 was probably added for enabling debugging
#
# In general, any extra configure args should go to config.yaml
#
pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel" pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
fi fi