Remove missing mentions of mpi2 or mpi3

This commit is contained in:
Frederick Stein 2022-12-19 10:53:18 +01:00 committed by Frederick Stein
parent 0f4c3be663
commit 4989f366a7
4 changed files with 4 additions and 5 deletions

View file

@ -57,7 +57,7 @@ Following results were obtained in the following conditions:
- Date: 15th November 2019
- CP2K version: version 7.0 (Development Version, git:78cea8eeebb25e459941d8a28d987c9990d92676)
- DBCSR version: v2.0.0-rc9 (git:15fdaba855385f12db7599a6e69b51a7a4ce8a9a)
- CP2K flags: omp libint fftw3 libxc elpa parallel mpi3 scalapack acc pw_cuda
- CP2K flags: omp libint fftw3 libxc elpa parallel scalapack acc pw_cuda
xsmm dbcsr_acc max_contr=4
- Machine: Piz Daint (GPU partition), CSCS
- Slurm configuration: 2 MPI ranks per node, 12 OpenMP threads per MPI rank

View file

@ -115,7 +115,6 @@ CONTAINS
#endif
#if defined(__parallel)
flags = TRIM(flags)//" parallel"
flags = TRIM(flags)//" mpi3"
#endif
#if defined(__SCALAPACK)
flags = TRIM(flags)//" scalapack"

View file

@ -35,11 +35,11 @@ QS/regtest-mp2-admm-grad libint
QS/regtest-double-hybrid-stress
QS/regtest-double-hybrid-grad
QS/regtest-hfx-ri-2 libint libxc
QS/regtest-rma libint mpi3
QS/regtest-rma libint
QS/regtest-gapw_xc libint
LIBTEST/libvori libvori
LIBTEST/libbqb libbqb
QS/regtest-rma-3D libint mpi3
QS/regtest-rma-3D libint
TMC/regtest_ana_on_the_fly parallel mpiranks>2
TMC/regtest parallel mpiranks>1
TMC/regtest_ana_post_proc parallel mpiranks>1

View file

@ -89,7 +89,7 @@ export INTELMPI_LIBS="${INTELMPI_LIBS}"
export MPI_CFLAGS="${INTELMPI_CFLAGS}"
export MPI_LDFLAGS="${INTELMPI_LDFLAGS}"
export MPI_LIBS="${INTELMPI_LIBS}"
export CP_DFLAGS="\${CP_DFLAGS} IF_MPI(-D__parallel ${mpi2_dflags}|)"
export CP_DFLAGS="\${CP_DFLAGS} IF_MPI(-D__parallel|)"
export CP_CFLAGS="\${CP_CFLAGS} IF_MPI(${INTELMPI_CFLAGS}|)"
export CP_LDFLAGS="\${CP_LDFLAGS} IF_MPI(${INTELMPI_LDFLAGS}|)"
export CP_LIBS="\${CP_LIBS} IF_MPI(${INTELMPI_LIBS}|)"