Merge branch 'devreal:main' into notified-rma-sm

Author: joe-explr

.ci/mellanox/README.md

@@ -6,7 +6,7 @@
 CI is managed by [Azure Pipelines](https://docs.microsoft.com/en-us/azure/devops/pipelines/?view=azure-devops) service.
 
 Mellanox Open MPI CI includes:
-* Open MPI building with internal stable engineering versions of UCX and HCOLL. The building is run in Docker-based environment.
+* Open MPI building with internal stable engineering versions of UCX. The building is run in Docker-based environment.
 * Sanity functional testing.
 ### How to Run CI
 Mellanox Open MPI CI is triggered upon the following events:

.github/workflows/compile-examples.yaml

@@ -0,0 +1,19 @@
+name: Compile ignored components
+
+on: [pull_request]
+
+jobs:
+  compile-ignored:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v4
+      with:
+            submodules: recursive
+    - name: Remove .opal_ignore files so that we build all examples
+      run: |
+        find . -name .opal_ignore -exec rm -f {} \; -print
+    - name: Build Open MPI
+      run: |
+        ./autogen.pl
+        ./configure --prefix=${PWD}/install --disable-silent-rules
+        make -j

.github/workflows/hdf5-tests.yaml

@@ -20,9 +20,9 @@ jobs:
         make -j 8 && make install
     - name: Install HDF5
       run: |
-         wget --progress=dot:giga https://github.com/HDFGroup/hdf5/releases/latest/download/hdf5.tar.gz
-         tar -xzf hdf5.tar.gz
-         mv hdf5-1* hdf5
+         wget --progress=dot:giga https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/hdf5-1.14.6.tar.gz
+         tar -xzf hdf5-1.14.6.tar.gz
+         mv hdf5-1.14.6 hdf5
          cd hdf5
          export PATH=/opt/openmpi/bin:${PATH}
          export LD_LIBRARY_PATH=/opt/openmpi/lib:${LD_LIBRARY_PATH}

3rd-party/openpmix

@@ -15,7 +15,7 @@
 # major, minor, and release are generally combined in the form
 # <major>.<minor>.<release>.
 
-major=5
+major=6
 minor=1
 release=0
 

3rd-party/prrte

@@ -0,0 +1,57 @@
+# -*- shell-script -*-
+#
+# Copyright (C) 2015-2017 Mellanox Technologies, Inc.
+#                         All rights reserved.
+# Copyright (c) 2015      Research Organization for Information Science
+#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
+#                         reserved.
+# Copyright (c) 2016 Cisco Systems, Inc.  All rights reserved.
+# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+# Copyright (c) 2024-2025 Bull S.A.S.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# OMPI_CHECK_UBCL(prefix, [action-if-found], [action-if-not-found])
+# --------------------------------------------------------
+# check if UBCL support can be found.  sets prefix_{CPPFLAGS,
+# as needed and runs action-if-found if there is
+# support, otherwise executes action-if-not-found
+AC_DEFUN([OMPI_CHECK_UBCL],[
+    OPAL_VAR_SCOPE_PUSH([ompi_check_ubcl_dir ompi_check_ubcl_happy])
+
+    m4_ifblank([$1], [m4_fatal([First argument to OMPI_CHECK_UBCL cannot be blank])])
+
+    AC_ARG_WITH([ubcl],
+        [AS_HELP_STRING([--with-ubcl(=DIR)],
+            [Build with UBCL support])])
+
+    # UBCL is dlopen'd to avoid direct link to libubcl.so.
+    # OAC_CHECK_PACKAGE would add this explicit link, so it cannot be used.
+    # OPAL_CHECK_WITHDIR prints an error if the given path is invalid
+    OPAL_CHECK_WITHDIR([ubcl], [$with_ubcl], [include/ubcl_api.h])
+
+    AS_IF([test "$with_ubcl" == "no"],
+          [ompi_check_ubcl_happy="no"],
+
+          [test -z "$with_ubcl"],
+          [ompi_check_ubcl_happy="no"],
+
+          [ompi_check_ubcl_happy="yes"
+           $1_CPPFLAGS="${$1_CPPFLAGS} -I$with_ubcl/include/"
+           AC_MSG_NOTICE([$1_CPPFLAGS is set to: ${$1_CPPFLAGS}])])
+
+
+    OPAL_SUMMARY_ADD([Transports],[UBCL],[],[$ompi_check_ubcl_happy])
+
+    AS_IF([test "$ompi_check_ubcl_happy" = "yes"],
+          [$2],
+          [$3])
+
+    OPAL_VAR_SCOPE_POP
+])
+

VERSION

@@ -0,0 +1,54 @@
+dnl -*- shell-script -*-
+dnl
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The University of Tennessee and The University
+dnl                         of Tennessee Research Foundation.  All rights
+dnl                         reserved.
+dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2010-2014 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2022-2025 Triad National Security, LLC. All rights
+dnl                         reserved.
+dnl $COPYRIGHT$
+dnl
+dnl Additional copyrights may follow
+dnl
+dnl $HEADER$
+dnl
+
+# Check whether or not the Fortran compiler can build mpi_f08 using
+# the given compiler options.  This test is intended to
+# trap cases where default INTEGER KIND is equivalent to MPI_COUNT_KIND.
+
+# OMPI_FORTRAN_CHECK_BIG_COUNT([action if found],
+#                            [action if not found])
+# ----------------------------------------------------
+AC_DEFUN([OMPI_FORTRAN_CHECK_BIG_COUNT],[
+    AS_VAR_PUSHDEF([big_count_var], [ompi_cv_big_count_var])
+
+    AC_CACHE_CHECK([if Fortran compiler can compile interface containing MPI_KIND_COUNT arguments ], big_count_var,
+       [AC_LANG_PUSH([Fortran])
+        AC_COMPILE_IFELSE([AC_LANG_SOURCE([[module sendit_interfaces
+INTERFACE SendIt
+ subroutine SendIt_int(X)
+ INTEGER :: X
+ end subroutine SendIt_int
+ subroutine SendIt_big(x)
+ integer(KIND=$OMPI_MPI_COUNT_KIND)::X
+ end subroutine SendIt_big
+ end interface SendIt
+ end module sendit_interfaces]])],
+             [AS_VAR_SET(big_count_var, yes)],
+             [AS_VAR_SET(big_count_var, no)])
+        touch conftest_foo.mod
+        rm -rf *.mod 2>/dev/null
+        AC_LANG_POP([Fortran])
+       ])
+
+    AS_VAR_IF(big_count_var, [yes], [$1], [$2])
+    AS_VAR_POPDEF([big_count_var])dnl
+])

config/ompi_check_libhcoll.m4

@@ -896,6 +896,14 @@ AC_CHECK_MEMBERS([struct timespec.tv_nsec],
 #
 m4_ifdef([project_ompi], [OMPI_FIND_MPI_AINT_COUNT_OFFSET])
 
+#
+# now that we have MPI_COUNT_KIND set, try building
+# MPI F08 bindings if that level of fortran support is requested
+#
+m4_ifdef([project_ompi], [AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS],
+                                [OMPI_FORTRAN_CHECK_BIG_COUNT([],
+                                     [AC_MSG_ERROR([The mpi_f08 module cannot be compiled using the current set of Fortran compiler options ($FCFLAGS).  Either change compiler options or use --enable-mpi-fortran=usempi])])
+                                ])])
 # checkpoint results
 AC_CACHE_SAVE