From 6c3a9502f0f9d5523102545bf344b5bc2e2bfeb9 Mon Sep 17 00:00:00 2001 From: Francesco Ballarin Date: Sat, 5 Mar 2022 09:42:35 +0100 Subject: [PATCH 1/2] Define MPI_Session for compatibility with current mpi4py main branch --- include/mpi-compat.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/mpi-compat.h b/include/mpi-compat.h index 367c58a7d..9a604f851 100644 --- a/include/mpi-compat.h +++ b/include/mpi-compat.h @@ -11,4 +11,9 @@ typedef void *PyMPI_MPI_Message; #define MPI_Message PyMPI_MPI_Message #endif +#if (MPI_VERSION < 4) && !defined(PyMPI_HAVE_MPI_Session) +typedef void *PyMPI_MPI_Session; +#define MPI_Session PyMPI_MPI_Session +#endif + #endif/*MPI_COMPAT_H*/ From 7b0b0ec5c2ce955105f49d8beb1e1309cb46af4b Mon Sep 17 00:00:00 2001 From: Francesco Ballarin Date: Sun, 6 Mar 2022 08:48:48 +0100 Subject: [PATCH 2/2] Oversubscribe openmpi run, as 4 cores are requested while GitHub actions offers 2 cores --- .github/workflows/miniconda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/miniconda.yml b/.github/workflows/miniconda.yml index b32c63562..23e7e1fc4 100644 --- a/.github/workflows/miniconda.yml +++ b/.github/workflows/miniconda.yml @@ -78,7 +78,7 @@ jobs: export PATH="${CONDA_PREFIX}/bin:${CONDA_PREFIX}/Library/bin:$PATH" which mpirun mpirun --version - mpirun -np 4 python mpi_example.py + mpirun -np 4 --oversubscribe python mpi_example.py if [ $? -ne 0 ] ; then echo "hdf5 mpi test failed!" exit 1