mirror of
https://github.com/cp2k/cp2k.git
synced 2026-07-28 14:15:19 -04:00
OpenMPI 5.0.5 -> 5.0.6
MPIRUN -> MPIEXEC
This commit is contained in:
Matthias Krack
parent
e032d7223b
commit
1b0ef63ba5
3 changed files with 15 additions and 13 deletions
|
|
@ -29,7 +29,7 @@ case "${with_intelmpi}" in
|
|||
;;
|
||||
__SYSTEM__)
|
||||
echo "==================== Finding Intel MPI from system paths ===================="
|
||||
check_command mpiexec "intelmpi" && MPIRUN="$(realpath $(command -v mpiexec))"
|
||||
check_command mpiexec "intelmpi" && MPIEXEC="$(realpath $(command -v mpiexec))"
|
||||
if [ "${with_intel}" != "__DONTUSE__" ]; then
|
||||
if [ "${with_ifx}" = "yes" ]; then
|
||||
check_command mpiicx "intelmpi" && MPICC="$(realpath $(command -v mpiicx))" || exit 1
|
||||
|
|
@ -61,7 +61,7 @@ case "${with_intelmpi}" in
|
|||
check_dir "${pkg_install_dir}/bin"
|
||||
check_dir "${pkg_install_dir}/lib"
|
||||
check_dir "${pkg_install_dir}/include"
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "intel" && MPIRUN="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "intel" && MPIEXEC="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
if [ "${with_intel}" != "__DONTUSE__" ]; then
|
||||
check_command ${pkg_install_dir}/bin/mpiicc "intel" && MPICC="${pkg_install_dir}/bin/mpiicc" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpiicpc "intel" && MPICXX="${pkg_install_dir}/bin/mpiicpc" || exit 1
|
||||
|
|
@ -97,7 +97,7 @@ export I_MPI_CXX="${I_MPI_CXX}"
|
|||
export I_MPI_CC="${I_MPI_CC}"
|
||||
export I_MPI_FC="${I_MPI_FC}"
|
||||
export MPI_MODE="${MPI_MODE}"
|
||||
export MPIRUN="${MPIRUN}"
|
||||
export MPIEXEC="${MPIEXEC}"
|
||||
export MPICC="${MPICC}"
|
||||
export MPICXX="${MPICXX}"
|
||||
export MPIFC="${MPIFC}"
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ case "${with_mpich}" in
|
|||
check_dir "${pkg_install_dir}/bin"
|
||||
check_dir "${pkg_install_dir}/lib"
|
||||
check_dir "${pkg_install_dir}/include"
|
||||
check_install ${pkg_install_dir}/bin/mpiexec "mpich" && MPIRUN="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpiexec "mpich" && MPIEXEC="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpicc "mpich" && MPICC="${pkg_install_dir}/bin/mpicc" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpicxx "mpich" && MPICXX="${pkg_install_dir}/bin/mpicxx" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpifort "mpich" && MPIFC="${pkg_install_dir}/bin/mpifort" || exit 1
|
||||
|
|
@ -79,7 +79,7 @@ case "${with_mpich}" in
|
|||
;;
|
||||
__SYSTEM__)
|
||||
echo "==================== Finding MPICH from system paths ===================="
|
||||
check_command mpiexec "mpich" && MPIRUN="$(command -v mpiexec)"
|
||||
check_command mpiexec "mpich" && MPIEXEC="$(command -v mpiexec)"
|
||||
check_command mpicc "mpich" && MPICC="$(command -v mpicc)" || exit 1
|
||||
if [ $(command -v mpic++ > /dev/null 2>&1) ]; then
|
||||
check_command mpic++ "mpich" && MPICXX="$(command -v mpic++)" || exit 1
|
||||
|
|
@ -104,7 +104,7 @@ case "${with_mpich}" in
|
|||
check_dir "${pkg_install_dir}/bin"
|
||||
check_dir "${pkg_install_dir}/lib"
|
||||
check_dir "${pkg_install_dir}/include"
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "mpich" && MPIRUN="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "mpich" && MPIEXEC="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpicc "mpich" && MPICC="${pkg_install_dir}/bin/mpicc" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpicxx "mpich" && MPICXX="${pkg_install_dir}/bin/mpicxx" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpifort "mpich" && MPIFC="${pkg_install_dir}/bin/mpifort" || exit 1
|
||||
|
|
@ -123,7 +123,7 @@ if [ "${with_mpich}" != "__DONTUSE__" ]; then
|
|||
MPICH_LIBS="-lmpifort -lmpicxx -lmpi"
|
||||
cat << EOF > "${BUILDDIR}/setup_mpich"
|
||||
export MPI_MODE="${MPI_MODE}"
|
||||
export MPIRUN="${MPIRUN}"
|
||||
export MPIEXEC="${MPIEXEC}"
|
||||
export MPICC="${MPICC}"
|
||||
export MPICXX="${MPICXX}"
|
||||
export MPIFC="${MPIFC}"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
[ "${BASH_SOURCE[0]}" ] && SCRIPT_NAME="${BASH_SOURCE[0]}" || SCRIPT_NAME=$0
|
||||
SCRIPT_DIR="$(cd "$(dirname "$SCRIPT_NAME")/.." && pwd -P)"
|
||||
|
||||
openmpi_ver="5.0.5"
|
||||
openmpi_sha256="6588d57c0a4bd299a24103f4e196051b29e8b55fbda49e11d5b3d32030a32776"
|
||||
openmpi_ver="5.0.6"
|
||||
openmpi_sha256="bd4183fcbc43477c254799b429df1a6e576c042e74a2d2f8b37d537b2ff98157"
|
||||
openmpi_pkg="openmpi-${openmpi_ver}.tar.bz2"
|
||||
|
||||
source "${SCRIPT_DIR}"/common_vars.sh
|
||||
|
|
@ -63,6 +63,8 @@ case "${with_openmpi}" in
|
|||
--enable-static \
|
||||
--with-hwloc=internal \
|
||||
--with-libevent=internal \
|
||||
--with-pmix=internal \
|
||||
--with-slurm \
|
||||
> configure.log 2>&1 || tail -n ${LOG_LINES} configure.log
|
||||
make -j $(get_nprocs) > make.log 2>&1 || tail -n ${LOG_LINES} make.log
|
||||
make -j $(get_nprocs) install > install.log 2>&1 || tail -n ${LOG_LINES} install.log
|
||||
|
|
@ -72,7 +74,7 @@ case "${with_openmpi}" in
|
|||
check_dir "${pkg_install_dir}/bin"
|
||||
check_dir "${pkg_install_dir}/lib"
|
||||
check_dir "${pkg_install_dir}/include"
|
||||
check_install ${pkg_install_dir}/bin/mpiexec "openmpi" && MPIRUN="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpiexec "openmpi" && MPIEXEC="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpicc "openmpi" && MPICC="${pkg_install_dir}/bin/mpicc" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpicxx "openmpi" && MPICXX="${pkg_install_dir}/bin/mpicxx" || exit 1
|
||||
check_install ${pkg_install_dir}/bin/mpifort "openmpi" && MPIFC="${pkg_install_dir}/bin/mpifort" || exit 1
|
||||
|
|
@ -83,7 +85,7 @@ case "${with_openmpi}" in
|
|||
;;
|
||||
__SYSTEM__)
|
||||
echo "==================== Finding OpenMPI from system paths ===================="
|
||||
check_command mpiexec "openmpi" && MPIRUN="$(command -v mpiexec)"
|
||||
check_command mpiexec "openmpi" && MPIEXEC="$(command -v mpiexec)"
|
||||
check_command mpicc "openmpi" && MPICC="$(command -v mpicc)" || exit 1
|
||||
check_command mpic++ "openmpi" && MPICXX="$(command -v mpic++)" || exit 1
|
||||
check_command mpifort "openmpi" && MPIFC="$(command -v mpifort)" || exit 1
|
||||
|
|
@ -103,7 +105,7 @@ case "${with_openmpi}" in
|
|||
check_dir "${pkg_install_dir}/bin"
|
||||
check_dir "${pkg_install_dir}/lib"
|
||||
check_dir "${pkg_install_dir}/include"
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "openmpi" && MPIRUN="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpiexec "openmpi" && MPIEXEC="${pkg_install_dir}/bin/mpiexec" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpicc "openmpi" && MPICC="${pkg_install_dir}/bin/mpicc" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpic++ "openmpi" && MPICXX="${pkg_install_dir}/bin/mpic++" || exit 1
|
||||
check_command ${pkg_install_dir}/bin/mpifort "openmpi" && MPIFC="${pkg_install_dir}/bin/mpifort" || exit 1
|
||||
|
|
@ -135,7 +137,7 @@ if [ "${with_openmpi}" != "__DONTUSE__" ]; then
|
|||
done
|
||||
cat << EOF > "${BUILDDIR}/setup_openmpi"
|
||||
export MPI_MODE="${MPI_MODE}"
|
||||
export MPIRUN="${MPIRUN}"
|
||||
export MPIEXEC="${MPIEXEC}"
|
||||
export MPICC="${MPICC}"
|
||||
export MPICXX="${MPICXX}"
|
||||
export MPIFC="${MPIFC}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue