open-mpi · hppritcha · Sep 28, 2023 · May 10, 2025 · May 28, 2025 · May 29, 2025
diff --git a/.gitignore b/.gitignore
@@ -271,6 +271,7 @@ ompi/tools/ompi_info/ompi_info
 
 ompi/tools/wrappers/mpic++-wrapper-data.txt
 ompi/tools/wrappers/mpicc-wrapper-data.txt
+ompi/tools/wrappers/mpicc_abi-wrapper-data.txt
 ompi/tools/wrappers/mpifort-wrapper-data.txt
 ompi/tools/wrappers/ompi_wrapper_script
 ompi/tools/wrappers/ompi.pc
@@ -534,6 +535,13 @@ docs/man
 
 # Generated C Bindings
 ompi/mpi/c/*_generated*.c
+ompi/mpi/c/standard_*.c
+ompi/mpi/c/abi.h
+ompi/mpi/c/abi_get_info.c
+ompi/mpi/c/abi_converters.h
+ompi/mpi/c/abi_converters.c
+ompi/mpi/c/standard_abi
+ompi/mpi/tool/*_generated*.c
 
 # Generated Fortran Bindings
 ompi/mpi/fortran/use-mpi-f08/*_generated.F90

diff --git a/3rd-party/pympistandard b/3rd-party/pympistandard
diff --git a/VERSION b/VERSION
@@ -20,7 +20,7 @@ minor=1
 release=0
 
 # MPI Standard Compliance Level
-mpi_standard_version=3
+mpi_standard_version=5
 mpi_standard_subversion=1
 
 # OMPI required dependency versions.
@@ -92,6 +92,14 @@ date="Unreleased developer copy"
 # but they are "public" within the OMPI code base and select 3rd party
 # software packages.
 
+# The current and age values of the libmpi_abi shared library are
+# implicitly determined by the MPI ABI definition of the
+# version of the MPI specification supported by this Open MPI release.
+# The MPI ABI is intended not to break backward compatibility,
+# so presumably the current and age values will move in lock step.
+# We assume we have flexibility with the revision number as
+# bugs are fixed, etc.
+
 # Version numbers are described in the Libtool current:revision:age
 # format.
 
@@ -100,6 +108,7 @@ libmpi_mpifh_so_version=0:0:0
 libmpi_usempi_tkr_so_version=0:0:0
 libmpi_usempi_ignore_tkr_so_version=0:0:0
 libmpi_usempif08_so_version=0:0:0
+libmpi_abi_so_version=0:0:0
 libopen_pal_so_version=0:0:0
 libmpi_java_so_version=0:0:0
 liboshmem_so_version=0:0:0

diff --git a/config/ompi_config_files.m4 b/config/ompi_config_files.m4
@@ -48,6 +48,7 @@ AC_DEFUN([OMPI_CONFIG_FILES],[
         ompi/tools/ompi_info/Makefile
         ompi/tools/wrappers/Makefile
         ompi/tools/wrappers/mpicc-wrapper-data.txt
+        ompi/tools/wrappers/mpicc_abi-wrapper-data.txt
         ompi/tools/wrappers/mpic++-wrapper-data.txt
         ompi/tools/wrappers/mpifort-wrapper-data.txt
         ompi/tools/wrappers/ompi.pc

diff --git a/config/ompi_configure_options.m4 b/config/ompi_configure_options.m4
@@ -256,5 +256,29 @@ AM_CONDITIONAL(OMPI_OMPIO_SUPPORT, test "$ompi_want_ompio" = "1")
 AC_ARG_ENABLE([deprecate-mpif-h],
               [AS_HELP_STRING([--enable-deprecate-mpif-h],
                               [Mark the mpif.h bindings as deprecated (default: enabled)])])
-
+# If the binding source files don't exist, then we need Python to generate them
+AM_PATH_PYTHON([3.6],,[:])
+binding_file="${srcdir}/ompi/mpi/c/ompi_send_generated.c"
+AS_IF([! test -e "$binding_file" && test "$PYTHON" = ":"],
+      [AC_MSG_ERROR([Open MPI requires Python >=3.6 for generating the bindings. Aborting])])
+AM_CONDITIONAL(OMPI_GENERATE_BINDINGS,[test "$PYTHON" != ":"])
+
+AC_MSG_CHECKING([if want to enable standard ABI library])
+AC_ARG_ENABLE([standard-abi],
+    [AS_HELP_STRING([--enable-standard-abi],
+                    [Enable building the standard ABI library (default: enabled)])])
+if test "$enable_standard_abi" = "no"; then
+    AC_MSG_RESULT([no])
+    ompi_standard_abi=0
+else
+    AC_MSG_RESULT([yes])
+    ompi_standard_abi=1
+fi
+AC_DEFINE_UNQUOTED([OMPI_STANDARD_ABI],[$ompi_standard_abi],
+                   [Whether we want to build the standard ABI library])
+AM_CONDITIONAL(OMPI_STANDARD_ABI,[test $ompi_standard_abi = 1])
+AS_IF([test $ompi_standard_abi -eq 1],
+      [gen_abi="yes"],
+      [gen_abi="no"])
+OPAL_SUMMARY_ADD([Miscellaneous], [MPI Standard ABI support], [], [$gen_abi])
 ])dnl
diff --git a/config/ompi_fortran_check_logical_array.m4 b/config/ompi_fortran_check_logical_array.m4
@@ -11,6 +11,8 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2025      Triad National Security, LLC. All rights
+dnl                         reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -64,7 +66,7 @@ void ompi_check_f(ompi_fortran_logical_t * logical)
     FILE *f=fopen("conftestval", "w");
     if (!f) exit(1);
 
-    if (logical[[0]] == 0 &&
+    if (logical[[0]] == $ompi_cv_fortran_false_value &&
         logical[[1]] == $ompi_cv_fortran_true_value)
       result = 1;
     fprintf(f, "%d\n", result);

diff --git a/config/ompi_fortran_get_value_true.m4 b/config/ompi_fortran_get_value_true.m4
@@ -11,6 +11,8 @@ dnl                         All rights reserved.
 dnl Copyright (c) 2011-2012 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2015      Research Organization for Information Science
 dnl                         and Technology (RIST). All rights reserved.
+dnl Copyright (c) 2025      Triad National Security, LLC. All rights
+dnl                         reserved.
 dnl $COPYRIGHT$
 dnl
 dnl Additional copyrights may follow
@@ -27,16 +29,22 @@ AC_DEFUN([OMPI_FORTRAN_GET_VALUE_TRUE],[
     if test "$ompi_cv_fortran_true_value" = "0" ; then
         unset ompi_cv_fortran_true_value
     fi
+    if test "$ompi_cv_fortran_false_value" = "0" ; then
+        unset ompi_cv_fortran_false_value
+    fi
 
     AS_VAR_PUSHDEF([fortran_true_var],
                    [ompi_cv_fortran_true_value])
+    AS_VAR_PUSHDEF([fortran_false_var],
+                   [ompi_cv_fortran_false_value])
 
     AC_CACHE_CHECK([Fortran value for .TRUE. logical type],
         fortran_true_var,
         [if test "$1" = "none" || \
             test $OMPI_TRY_FORTRAN_BINDINGS -eq $OMPI_FORTRAN_NO_BINDINGS || \
             test $ompi_fortran_happy -eq 0 ; then
-             value=77
+             tvalue=77
+             fvalue=77
          else
              #
              # C module
@@ -98,6 +106,14 @@ EOF
       CALL ompi_print(value)
       end
 EOF
+             cat > conftestf2.f <<EOF
+      program main
+      logical value
+      value=.FALSE.
+      CALL ompi_print(value)
+      end
+EOF
+
 
              #
              # Try the compilation and run.
@@ -114,11 +130,40 @@ EOF
              AS_IF([test "$cross_compiling" = "yes"],
                  [AC_MSG_ERROR([Can not determine value of .TRUE. when cross-compiling])],
                  [OPAL_LOG_COMMAND([./conftest],
-                     [value=`sed 's/  *//' conftestval`],
+                     [tvalue=`sed 's/  *//' conftestval`],
                      [AC_MSG_ERROR([Could not determine value of Fotran .TRUE..  Aborting.])])])
+
+             cat > conftestf.f <<EOF
+      program main
+      logical value
+      value=.FALSE.
+      CALL ompi_print(value)
+      end
+EOF
+
+             #
+             # Try the compilation and run.
+             #
+             OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
+                 [OPAL_LOG_COMMAND([$FC $FCFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS],
+                      [happy=1], [happy=0])],
+                 [happy=0])
+
+             AS_IF([test $happy -eq 0 && test $ompi_fortran_happy -eq 1],
+                          [AC_MSG_ERROR([Could not compile Fortran .FALSE. test.  Aborting.])
+                          ])
+
+             AS_IF([test "$cross_compiling" = "yes"],
+                 [AC_MSG_ERROR([Can not determine value of .FALSE. when cross-compiling])],
+                 [OPAL_LOG_COMMAND([./conftest],
+                     [fvalue=`sed 's/  *//' conftestval`],
+                     [AC_MSG_ERROR([Could not determine value of Fotran .FALSE..  Aborting.])])])
          fi
-         AS_VAR_SET(fortran_true_var, [$value])
-         unset value
+         AS_VAR_SET(fortran_true_var, [$tvalue])
+         unset tvalue
+         AS_VAR_SET(fortran_false_var, [$fvalue])
+         unset fvalue
+
         ])
 
     AS_VAR_COPY([ompi_fortran_true_value], [fortran_true_var])
@@ -127,6 +172,13 @@ EOF
         [Fortran value for LOGICAL .TRUE. value])
     AS_VAR_POPDEF([fortran_true_var])
 
+   AS_VAR_COPY([ompi_fortran_false_value], [fortran_false_var])
+    AC_DEFINE_UNQUOTED([OMPI_FORTRAN_VALUE_FALSE],
+        [$ompi_fortran_false_value],
+        [Fortran value for LOGICAL .FALSE. value])
+    AS_VAR_POPDEF([fortran_false_var])
+
+
     unset happy ompi_print_logical_fn
     rm -rf conftest*
 ])dnl
diff --git a/configure.ac b/configure.ac
@@ -147,6 +147,7 @@ OPAL_SAVE_VERSION([OPAL], [Open Portable Access Layer], [$srcdir/VERSION],
 
 m4_ifdef([project_ompi],
          [AC_SUBST(libmpi_so_version)
+          AC_SUBST(libmpi_abi_so_version)
           AC_SUBST(libmpi_mpifh_so_version)
           AC_SUBST(libmpi_usempi_tkr_so_version)
           AC_SUBST(libmpi_usempi_ignore_tkr_so_version)
+7 −0		src/pympistandard/_kinds.py
+7,265 −3,104		src/pympistandard/data/apis.json
+22 −7		src/pympistandard/isoc.py
+6 −0		tests/test_iso_c.py