build: Support for MPI ABI

mpi4py · Jan 17, 2024 · 6ad83c4 · 6ad83c4
1 parent 8f5700f
commit 6ad83c4
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 48 deletions.
diff --git a/src/lib-mpi/config.h b/src/lib-mpi/config.h
@@ -12,6 +12,8 @@
 
 #if defined(HAVE_PYMPICONF_H)
 #include "pympiconf.h"
+#elif defined(MPI_ABI)
+#include "config/mpiapi.h"
 #elif defined(MSMPI_VER)
 #include "config/msmpi.h"
 #elif defined(MPICH_NAME) && (MPICH_NAME >= 3)

diff --git a/src/lib-mpi/config/mpiapi.h b/src/lib-mpi/config/mpiapi.h
@@ -0,0 +1,14 @@
+#ifndef PyMPI_CONFIG_MPIAPI_H
+#define PyMPI_CONFIG_MPIAPI_H
+
+#include "mpi-11.h"
+#include "mpi-12.h"
+#include "mpi-20.h"
+#include "mpi-22.h"
+#include "mpi-30.h"
+#include "mpi-31.h"
+#include "mpi-40.h"
+#include "mpi-41.h"
+#include "mpi-50.h"
+
+#endif /* !PyMPI_CONFIG_MPIAPI_H */
diff --git a/src/lib-mpi/config/mpich.h b/src/lib-mpi/config/mpich.h
@@ -1,21 +1,17 @@
 #ifndef PyMPI_CONFIG_MPICH_H
 #define PyMPI_CONFIG_MPICH_H
 
-#include "mpi-11.h"
-#include "mpi-12.h"
-#include "mpi-20.h"
-#include "mpi-22.h"
-#include "mpi-30.h"
-#include "mpi-31.h"
-#include "mpi-40.h"
-#include "mpi-41.h"
-#include "mpi-50.h"
+#include "mpiapi.h"
 
+/* These types may not be available */
 #ifndef MPI_REAL2
 #undef PyMPI_HAVE_MPI_REAL2
+#endif
+#ifndef MPI_MPI_COMPLEX4
 #undef PyMPI_HAVE_MPI_COMPLEX4
 #endif
 
+/* MPI I/O may not be available */
 #ifndef ROMIO_VERSION
 #include "mpi-io.h"
 #endif

diff --git a/src/lib-mpi/config/mpich2.h b/src/lib-mpi/config/mpich2.h
@@ -1,17 +1,9 @@
 #ifndef PyMPI_CONFIG_MPICH2_H
 #define PyMPI_CONFIG_MPICH2_H
 
-#include "mpi-11.h"
-#include "mpi-12.h"
-#include "mpi-20.h"
-#include "mpi-22.h"
-#include "mpi-30.h"
-#include "mpi-31.h"
-#include "mpi-40.h"
-#include "mpi-41.h"
-#include "mpi-50.h"
-
-/* These types are difficult to implement portably */
+#include "mpiapi.h"
+
+/* These types are not available */
 #undef PyMPI_HAVE_MPI_REAL2
 #undef PyMPI_HAVE_MPI_COMPLEX4
 
@@ -26,6 +18,7 @@
 #undef PyMPI_HAVE_MPI_Type_create_f90_complex
 #endif /* MPICH2 < 1.1.0 */
 
+/* MPI I/O may not be available */
 #ifndef ROMIO_VERSION
 #include "mpi-io.h"
 #endif

diff --git a/src/lib-mpi/config/msmpi.h b/src/lib-mpi/config/msmpi.h
@@ -1,15 +1,7 @@
 #ifndef PyMPI_CONFIG_MSMPI_H
 #define PyMPI_CONFIG_MSMPI_H
 
-#include "mpi-11.h"
-#include "mpi-12.h"
-#include "mpi-20.h"
-#include "mpi-22.h"
-#include "mpi-30.h"
-#include "mpi-31.h"
-#include "mpi-40.h"
-#include "mpi-41.h"
-#include "mpi-50.h"
+#include "mpiapi.h"
 
 #if MSMPI_VER >= 0x402
 #define PyMPI_HAVE_MPI_AINT 1

diff --git a/src/lib-mpi/config/openmpi.h b/src/lib-mpi/config/openmpi.h
@@ -1,15 +1,7 @@
 #ifndef PyMPI_CONFIG_OPENMPI_H
 #define PyMPI_CONFIG_OPENMPI_H
 
-#include "mpi-11.h"
-#include "mpi-12.h"
-#include "mpi-20.h"
-#include "mpi-22.h"
-#include "mpi-30.h"
-#include "mpi-31.h"
-#include "mpi-40.h"
-#include "mpi-41.h"
-#include "mpi-50.h"
+#include "mpiapi.h"
 
 #ifndef OMPI_HAVE_FORTRAN_LOGICAL1
 #define OMPI_HAVE_FORTRAN_LOGICAL1 0

diff --git a/src/lib-mpi/config/unknown.h b/src/lib-mpi/config/unknown.h
@@ -1,19 +1,17 @@
 #ifndef PyMPI_CONFIG_UNKNOWN_H
 #define PyMPI_CONFIG_UNKNOWN_H
 
-#include "mpi-11.h"
-#include "mpi-12.h"
-#include "mpi-20.h"
-#include "mpi-22.h"
-#include "mpi-30.h"
-#include "mpi-31.h"
-#include "mpi-40.h"
-#include "mpi-41.h"
-#include "mpi-50.h"
+#include "mpiapi.h"
 
 /* These types are difficult to implement portably */
-#undef PyMPI_HAVE_MPI_INTEGER16
+#ifndef MPI_REAL2
 #undef PyMPI_HAVE_MPI_REAL2
+#endif
+#ifndef MPI_COMPLEX4
 #undef PyMPI_HAVE_MPI_COMPLEX4
+#endif
+#ifndef MPI_INTEGER16
+#undef PyMPI_HAVE_MPI_INTEGER16
+#endif
 
 #endif /* !PyMPI_CONFIG_UNKNOWN_H */