Merge branch 'v2.8' into v2.9

Iximiel · May 22, 2023 · 027d289 · 027d289
2 parents 6ac01e2 + 9018d97
commit 027d289
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -134,7 +134,9 @@ jobs:
         echo "CXX=mpic++" >> $GITHUB_ENV
         echo "OMPI_MCA_btl_base_warn_component_unused=0" >> $GITHUB_ENV
         echo "OMPI_MCA_btl_base_verbose=0" >> $GITHUB_ENV
-        echo "MPIEXEC=mpirun --oversubscribe" >> $GITHUB_ENV
+        echo "OMPI_MCA_plm=isolated" >> $GITHUB_ENV
+        echo "OMPI_MCA_btl_vader_single_copy_mechanism=none" >> $GITHUB_ENV
+        echo "OMPI_MCA_rmaps_base_oversubscribe=yes" >> $GITHUB_ENV
         pip install --user mpi4py
         python -c "import mpi4py"
     - name: Build PLUMED

diff --git a/docker/centos7 b/docker/centos7
@@ -24,6 +24,10 @@ COPY plumed2.tgz /home/plumed
 RUN . /etc/bashrc \
  && module load mpi \
  && export OMPI_MCA_btl_base_warn_component_unused=0 \
+ && export OMPI_MCA_btl_base_verbose=0 \
+ && export OMPI_MCA_plm=isolated \
+ && export OMPI_MCA_btl_vader_single_copy_mechanism=none \
+ && export OMPI_MCA_rmaps_base_oversubscribe=yes \
  && export PATH=$HOME/opt/bin:$PATH \
  && export CPATH=$HOME/opt/include:$CPATH \
  && export INCLUDE=$HOME/opt/include:$INCLUDE \

diff --git a/docker/fedora37 b/docker/fedora37
@@ -27,7 +27,10 @@ COPY plumed2.tgz /home/plumed
 RUN . /etc/bashrc \
  && module load mpi \
  && export OMPI_MCA_btl_base_warn_component_unused=0 \
- && export MPIEXEC="mpirun --oversubscribe" \
+ && export OMPI_MCA_btl_base_verbose=0 \
+ && export OMPI_MCA_plm=isolated \
+ && export OMPI_MCA_btl_vader_single_copy_mechanism=none \
+ && export OMPI_MCA_rmaps_base_oversubscribe=yes \
  && export PATH=$HOME/opt/bin:$PATH \
  && export CPATH=$HOME/opt/include:$CPATH \
  && export INCLUDE=$HOME/opt/include:$INCLUDE \

diff --git a/docker/rocky8 b/docker/rocky8
@@ -26,7 +26,10 @@ COPY plumed2.tgz /home/plumed
 RUN . /etc/bashrc \
  && module load mpi \
  && export OMPI_MCA_btl_base_warn_component_unused=0 \
- && export MPIEXEC="mpirun --oversubscribe" \
+ && export OMPI_MCA_btl_base_verbose=0 \
+ && export OMPI_MCA_plm=isolated \
+ && export OMPI_MCA_btl_vader_single_copy_mechanism=none \
+ && export OMPI_MCA_rmaps_base_oversubscribe=yes \
  && export PATH=$HOME/opt/bin:$PATH \
  && export CPATH=$HOME/opt/include:$CPATH \
  && export INCLUDE=$HOME/opt/include:$INCLUDE \