Merge remote-tracking branch 'upstream/v5.0.x' into HEAD

docs/developers/sphinx.rst

@@ -113,10 +113,12 @@ permissions to run this command):
    # Or: python3 -m pip install install -r docs/requirements.txt
 
 This will install Sphinx and some Python modules required for building
-the Open MPI documentation in a system-wide location.
+the Open MPI documentation in a user-specific location, likely
+somewhere under ``$HOME``
 
 You will likely need to find the location where ``sphinx-build`` was
-installed and add it to your ``PATH``.
+installed and add it to your ``PATH`` (e.g., on macOS, it might appear
+under ``$HOME/Library/Python/PYTHON_VERSION/bin/sphinx-build``).
 
 .. note:: On MacOS, look for ``sphinx-build`` under
           ``$HOME/Library/Python/VERSION/bin`` (where ``VERSION`` is

docs/index.rst

@@ -82,3 +82,11 @@ Table of contents
    history
    man-openmpi/index
    man-openshmem/index
+
+Contributors
+============
+
+A gigantic "thank you!" to all of our contributors:
+
+.. image:: https://contrib.rocks/image?repo=open-mpi/ompi&max=999
+   :target: https://github.com/open-mpi/ompi/graphs/contributors

ompi/mca/io/ompio/io_ompio_file_open.c

@@ -414,19 +414,21 @@ static void mca_io_ompio_file_get_eof_offset (ompio_file_t *fh,
     in_offset -= fh->f_disp;
     if ( fh->f_view_size  > 0 ) {
         /* starting offset of the current copy of the filew view */
-        start_offset = in_offset / fh->f_view_extent;
+        start_offset = (in_offset / fh->f_view_extent) * fh->f_view_extent;
 
         index_in_file_view = 0;
         /* determine block id that the offset is located in and
            the starting offset of that block */
-        while ( offset <= in_offset && index_in_file_view < fh->f_iov_count) {
-            prev_offset = offset;
+        while (offset <= in_offset && index_in_file_view < fh->f_iov_count) {
             offset = start_offset + (OMPI_MPI_OFFSET_TYPE)(intptr_t) fh->f_decoded_iov[index_in_file_view++].iov_base;
+	    if (offset <= in_offset) {
+		prev_offset = offset;
+	    }
         }
 
         offset = prev_offset;
         blocklen = fh->f_decoded_iov[index_in_file_view-1].iov_len;
-        while (  offset <= in_offset && k <= blocklen )  {
+        while (offset <= in_offset && k <= blocklen)  {
             prev_offset = offset;
             offset += fh->f_etype_size;
             k += fh->f_etype_size;

opal/mca/btl/ofi/btl_ofi_context.c

@@ -2,6 +2,8 @@
 /*
  * $COPYRIGHT$
  * Copyright (c) 2018      Intel Inc. All rights reserved
+ * Copyright (c) 2025      Triad National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -14,10 +16,10 @@
 #include "btl_ofi_rdma.h"
 
 #if OPAL_HAVE_THREAD_LOCAL
-opal_thread_local mca_btl_ofi_context_t *my_context = NULL;
+static opal_thread_local mca_btl_ofi_context_t *my_context = NULL;
 #endif /* OPAL_HAVE_THREAD_LOCAL */
 
-int init_context_freelists(mca_btl_ofi_context_t *context)
+static int init_context_freelists(mca_btl_ofi_context_t *context)
 {
     int rc;
     OBJ_CONSTRUCT(&context->rdma_comp_list, opal_free_list_t);
@@ -113,6 +115,7 @@ mca_btl_ofi_context_t *mca_btl_ofi_context_alloc_normal(struct fi_info *info,
     context->tx_ctx = ep;
     context->rx_ctx = ep;
     context->context_id = 0;
+    my_context = NULL;
 
     return context;
 

opal/mca/btl/ofi/btl_ofi_endpoint.h

@@ -15,6 +15,8 @@
  * Copyright (c) 2018      Intel, Inc, All rights reserved
  * Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
  *                         All Rights reserved.
+ * Copyright (c) 2025      Triad National Security, LLC. All rights
+ *                         reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,10 +34,6 @@
 
 BEGIN_C_DECLS
 
-#if OPAL_HAVE_THREAD_LOCAL
-extern opal_thread_local mca_btl_ofi_context_t *my_context;
-#endif /* OPAL_HAVE_THREAD_LOCAL */
-
 struct mca_btl_base_endpoint_t {
     opal_list_item_t super;
 
@@ -53,8 +51,6 @@ typedef struct mca_btl_base_endpoint_t mca_btl_base_endpoint_t;
 typedef mca_btl_base_endpoint_t mca_btl_ofi_endpoint_t;
 OBJ_CLASS_DECLARATION(mca_btl_ofi_endpoint_t);
 
-int init_context_freelists(mca_btl_ofi_context_t *context);
-
 mca_btl_base_endpoint_t *mca_btl_ofi_endpoint_create(opal_proc_t *proc, struct fid_ep *ep);
 
 /* contexts */

opal/mca/memory/patcher/memory_patcher_component.c

@@ -16,6 +16,7 @@
  * Copyright (c) 2016-2017 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2016-2020 IBM Corporation.  All rights reserved.
+ * Copyright (c) 2025      Triad National Security, LLC. All rights reserved.
  *
  * $COPYRIGHT$
  *
@@ -73,6 +74,7 @@ static int patcher_register(void);
 static int patcher_query(int *);
 
 static int mca_memory_patcher_priority;
+static int was_executed_already = 0;
 
 opal_memory_patcher_component_t mca_memory_patcher_component = {
     .super =
@@ -585,7 +587,6 @@ static int patcher_query(int *priority)
 
 static int patcher_open(void)
 {
-    static int was_executed_already = 0;
     int rc;
 
     if (was_executed_already) {
@@ -678,6 +679,8 @@ static int patcher_close(void)
 {
     mca_base_framework_close(&opal_patcher_base_framework);
 
+    was_executed_already = 0;
+
     /* Note that we don't need to unpatch any symbols here; the
        patcher framework will take care of all of that for us. */
     return OPAL_SUCCESS;