Merge pull request #26 from eschnett/eschnett/MPI_DISTRIBUTE_DFLT_DARG

Add MPI_DISTRIBUTE_DFLT_DARG
eschnett · Feb 26, 2022 · b0f62b3 · b0f62b3
2 parents 5a6aa40 + 75337a5
commit b0f62b3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 3 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -5,6 +5,6 @@ authors:
     given-names: Erik
     orcid: 0000-0002-4518-9017
 title: MPItrampoline
-version: v3.6.0
+version: v3.7.0
 doi: 10.5281/zenodo.6174408
 date-released: 2022-02-25
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12...3.20)
 project(
-  MPItrampoline VERSION 3.6.0
+  MPItrampoline VERSION 3.7.0
   DESCRIPTION "MPI trampoline"
   HOMEPAGE_URL "https://github.com/eschnett/MPItrampoline"
   LANGUAGES NONE

diff --git a/mpi_constants.py b/mpi_constants.py
@@ -58,6 +58,7 @@
     # File operation constants
     ("int", "MPI_DISTRIBUTE_BLOCK"),
     ("int", "MPI_DISTRIBUTE_CYCLIC"),
+    ("int", "MPI_DISTRIBUTE_DFLT_DARG"),
     ("int", "MPI_DISTRIBUTE_NONE"),
 
     ("int", "MPI_ERR_ACCESS"),

diff --git a/mpi_constants_fortran.py b/mpi_constants_fortran.py
@@ -38,6 +38,7 @@
 
     ("MPI_Fint", "MPI_DISTRIBUTE_BLOCK"),
     ("MPI_Fint", "MPI_DISTRIBUTE_CYCLIC"),
+    ("MPI_Fint", "MPI_DISTRIBUTE_DFLT_DARG"),
     ("MPI_Fint", "MPI_DISTRIBUTE_NONE"),
 
     ("MPI_Fint", "MPI_ERR_ACCESS"),
@@ -124,7 +125,27 @@
     ("MPI_Fint", "MPI_WIN_SEPARATE"),
     ("MPI_Fint", "MPI_WIN_UNIFIED"),
 
+    # ("char **", "MPI_ARGV_NULL"),
+    # MPICH: character(len=1), dimension(1), target :: MPI_ARGV_NULL
+    # OpenMPI: character MPI_ARGV_NULL(1)
+
+    # ("char ***", "MPI_ARGVS_NULL"),
+    # MPICH: character(len=1), dimension(1,1), target :: MPI_ARGVS_NULL
+    # OpenMPI: character MPI_ARGVS_NULL(1, 1)
+
+    # ("int *", "MPI_ERRCODES_IGNORE"),
+    # ("int *", "MPI_UNWEIGHTED"),
+    # ("int *", "MPI_WEIGHTS_EMPTY"),
+    # MPICH:  integer, dimension(1), target :: MPI_UNWEIGHTED
+    # OpenMPI: integer MPI_UNWEIGHTED(1)
+
+    # ("void *", "MPI_BOTTOM"),
+    # MPICH:  integer(c_int), bind(C, name="MPIR_F08_MPI_BOTTOM"), target :: MPI_BOTTOM
+    # OpenMPI: integer MPI_BOTTOM
+
     # ("void *", "MPI_IN_PLACE"),
+    # MPICH:  integer(c_int), bind(C, name="MPIR_F08_MPI_IN_PLACE"), target :: MPI_IN_PLACE
+    # OpenMPI: integer MPI_IN_PLACE
 
     ("MPI_Comm", "MPI_COMM_NULL"),
     ("MPI_Comm", "MPI_COMM_SELF"),

diff --git a/mpiabi.h b/mpiabi.h
@@ -19,7 +19,7 @@
 // MPI ABI version (we use SemVer)
 
 #define MPIABI_VERSION_MAJOR 2
-#define MPIABI_VERSION_MINOR 4
+#define MPIABI_VERSION_MINOR 5
 #define MPIABI_VERSION_PATCH 0
 
 // Compile-time constants