Merge pull request #10 from hppritcha/topic/add_max_pset_nam_len

add definition of MPI_MAX_PSET_NAME_LEN
hppritcha · Sep 9, 2019 · b6fb8bd · b6fb8bd
2 parents 6db30f4 + 62abf65
commit b6fb8bd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/config/opal_configure_options.m4 b/config/opal_configure_options.m4
@@ -512,6 +512,9 @@ OPAL_WITH_OPTION_MIN_MAX_VALUE(port_name,      1024, 255, 2048)
 # Min length accroding to MPI-2.1, p. 418
 OPAL_WITH_OPTION_MIN_MAX_VALUE(datarep_string,  128,  64,  256)
 
+# No lower and upper bound required or enforced
+OPAL_WITH_OPTION_MIN_MAX_VALUE(pset_name_len,  512,  512, 4096)
+
 AC_DEFINE_UNQUOTED([OPAL_ENABLE_CRDEBUG], [0],
     [Whether we want checkpoint/restart enabled debugging functionality or not])
 

diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in
@@ -99,6 +99,9 @@
 /* Maximum length of processor names (default is 256) */
 #undef OPAL_MAX_PROCESSOR_NAME
 
+/* Maximum length of processor names (default is 256) */
+#undef OPAL_MAX_PSET_NAME_LEN
+
 /* Whether we have FORTRAN LOGICAL*1 or not */
 #undef OMPI_HAVE_FORTRAN_LOGICAL1
 
@@ -449,6 +452,7 @@ typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn
 #define MPI_DISTRIBUTE_CYCLIC    1                     /* cyclic distribution */
 #define MPI_DISTRIBUTE_NONE      2                     /* not distributed */
 #define MPI_DISTRIBUTE_DFLT_DARG (-1)                  /* default distribution arg */
+#define MPI_MAX_PSET_NAME_LEN    OPAL_MAX_PSET_NAME_LEN /* max pset name len */
 
 /*
  * Since these values are arbitrary to Open MPI, we might as well make

diff --git a/ompi/include/mpif-config.h.in b/ompi/include/mpif-config.h.in
@@ -60,6 +60,7 @@
       integer MPI_MAX_INFO_VAL
       integer MPI_MAX_PORT_NAME
       integer MPI_MAX_DATAREP_STRING
+      integer MPI_MAX_PSET_NAME_LEN
       parameter (MPI_MAX_PROCESSOR_NAME=@OPAL_MAX_PROCESSOR_NAME@-1)
       parameter (MPI_MAX_ERROR_STRING=@OPAL_MAX_ERROR_STRING@-1)
       parameter (MPI_MAX_OBJECT_NAME=@OPAL_MAX_OBJECT_NAME@-1)
@@ -68,6 +69,7 @@
       parameter (MPI_MAX_INFO_VAL=@OPAL_MAX_INFO_VAL@-1)
       parameter (MPI_MAX_PORT_NAME=@OPAL_MAX_PORT_NAME@-1)
       parameter (MPI_MAX_DATAREP_STRING=@OPAL_MAX_DATAREP_STRING@-1)
+      parameter (MPI_MAX_PSET_NAME_LEN=@OPAL_MAX_PSET_NAME_LEN@-1)
 
 !
 ! MPI F08 conformance