From 0276a5717dbb71ee1384eeebae2e66e4f31a8931 Mon Sep 17 00:00:00 2001 From: caubet_m Date: Tue, 19 Jul 2022 09:39:24 +0200 Subject: [PATCH] Scalapack and dependencies update --- Compiler/impi/modulefile | 16 +++++++++++++--- Compiler/scalapack/build | 1 - Compiler/scalapack/files/variants.rhel7 | 3 ++- .../scalapack/files/version-to-gitcommit.txt | 1 + MPI/boost/build | 4 ++++ MPI/boost/files/variants.merlin6 | 5 +++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Compiler/impi/modulefile b/Compiler/impi/modulefile index 6d95e8c..a80b990 100644 --- a/Compiler/impi/modulefile +++ b/Compiler/impi/modulefile @@ -1,7 +1,7 @@ #%Module1.0 # Let the native Intel configuration define the following variables: -#set dont-setenv { C_INCLUDE_PATH CPLUS_INCLUDE_PATH LD_LIBRARY_PATH LIBRARY_PATH } +# set dont-setenv { C_INCLUDE_PATH CPLUS_INCLUDE_PATH LD_LIBRARY_PATH LIBRARY_PATH } module-whatis "Intel MPI" module-url "http://intel.com/" @@ -10,7 +10,11 @@ module-maintainer "Hans-Christian Stadler " module-addgroup "MPI" module-help " -impi/19.3 - Intel MPI 2019.3 64-bit +The Intel MPI Library. + +Loading intel PModules only is not enough when compiling software with +Intel MPI. Therefore, loading the impi PModule with equivalent version +is also necessary. " setenv MPICC mpiicc @@ -19,5 +23,11 @@ setenv MPIF77 mpiifort setenv MPIF90 mpiifort setenv MPIFC mpiifort setenv MPIFORTRAN mpiifort -setenv MPIEXEC mpirun +setenv MPIEXEC mpiexec.hydra setenv MPIRUN mpirun +# +setenv I_MPI_ICC mpiicc +setenv I_MPI_CXX mpiicpc +setenv I_MPI_F77 mpiifort +setenv I_MPI_F90 mpiifort +setenv I_MPI_FC mpiifort diff --git a/Compiler/scalapack/build b/Compiler/scalapack/build index 95acbbf..afd9491 100755 --- a/Compiler/scalapack/build +++ b/Compiler/scalapack/build @@ -29,4 +29,3 @@ pbuild::install_docfiles 'README' 'LICENSE' pbuild::pre_configure_Linux() { pbuild::use_cmake } - diff --git a/Compiler/scalapack/files/variants.rhel7 b/Compiler/scalapack/files/variants.rhel7 index b83fcf3..efd3980 100644 --- a/Compiler/scalapack/files/variants.rhel7 +++ b/Compiler/scalapack/files/variants.rhel7 @@ -1 +1,2 @@ -scalapack/2.2.1-1 unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm b:boost/1.79.0_slurm b:OpenBLAS/0.3.15 b:lapack/3.10.0 b:cmake/3.20.5 +scalapack/2.2.1-1 unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm boost/1.79.0_slurm b:OpenBLAS/0.3.15 b:lapack/3.10.0 b:cmake/3.20.5 +scalapack/2.2.1-2 unstable intel/21.4 impi/21.4 boost/1.69.0_slurm b:cmake/3.20.5 diff --git a/Compiler/scalapack/files/version-to-gitcommit.txt b/Compiler/scalapack/files/version-to-gitcommit.txt index 191dc12..28965ba 100644 --- a/Compiler/scalapack/files/version-to-gitcommit.txt +++ b/Compiler/scalapack/files/version-to-gitcommit.txt @@ -1 +1,2 @@ 2.2.1-1 5bad7487f496c811192334640ce4d3fc5f88144b +2.2.1-2 5bad7487f496c811192334640ce4d3fc5f88144b diff --git a/MPI/boost/build b/MPI/boost/build index 49e7f9a..3ef614b 100755 --- a/MPI/boost/build +++ b/MPI/boost/build @@ -20,6 +20,10 @@ pbuild::compile() { gcc ) TOOLSET=gcc ;; + intel ) + TOOLSET=intel-linux + # TOOLSET=gcc + ;; * ) std::die 1 "Unsupported compiler!" ;; diff --git a/MPI/boost/files/variants.merlin6 b/MPI/boost/files/variants.merlin6 index dd97e7a..5bda7a0 100644 --- a/MPI/boost/files/variants.merlin6 +++ b/MPI/boost/files/variants.merlin6 @@ -1,8 +1,9 @@ +boost/1.69.0_slurm unstable intel/21.4 impi/21.4 b:zlib/1.2.11 boost/1.70.0_slurm stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm b:zlib/1.2.11 boost/1.73.0_slurm stable gcc/{7.5.0,8.4.0,9.3.0} openmpi/3.1.6_slurm b:zlib/1.2.11 boost/1.73.0_slurm stable gcc/8.4.0 openmpi/4.0.5_slurm b:zlib/1.2.11 boost/1.73.0-1_slurm stable gcc/{8.4.0,9.3.0,10.2.0} openmpi/4.0.5-1_slurm b:zlib/1.2.11 boost/1.73.0_dgx deprecated gcc/{8.4.0,9.3.0,10.2.0} openmpi/4.0.5-1_dgx -boost/1.76.0_slurm stable gcc/{10.2.0,10.3.0} openmpi/4.0.5-1_slurm b:zlib/1.2.11 -boost/1.53.0_slurm unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm b:zlib/1.2.11 +boost/1.76.0_slurm stable gcc/{10.2.0,10.3.0} openmpi/4.0.5-1_slurm b:zlib/1.2.11 boost/1.79.0_slurm unstable gcc/{9.3.0,10.3.0} openmpi/4.1.3_slurm b:zlib/1.2.11 +boost/1.79.0_slurm unstable intel/21.4 impi/21.4 b:zlib/1.2.11