[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-57-g669f428

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  669f4286cf5b9de036b85645fa6996124fbee485 (commit)
      from  b3d837d5ef71b483e135d7903f9c2f51bc81fafa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/669f4286cf5b9de036b85645fa6996124fbee485

commit 669f4286cf5b9de036b85645fa6996124fbee485
Author: Pavan Balaji <balaji at anl.gov>
Date:   Tue Oct 7 22:11:10 2014 -0500

    Disable hugepage support by default.
    
    This patch is a workaround for an issue with older HPC-X machines.
    Once we are comfortable upgrading to the latest HPC-X version, the
    default value of the CVAR should be changed to true.
    
    Signed-off-by: Xin Zhao <xinzhao3 at illinois.edu>

diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
index ec04d56..949efc7 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
@@ -40,6 +40,18 @@ cvars:
         If true, force mxm to disconnect all processes at
         finalization time.
 
+    - name        : MPIR_CVAR_NEMESIS_MXM_HUGEPAGE
+      category    : CH3
+      type        : boolean
+      default     : false
+      class       : none
+      verbosity   : MPI_T_VERBOSITY_USER_BASIC
+      scope       : MPI_T_SCOPE_ALL_EQ
+      description : >-
+        If true, mxm tries detecting hugepage support.  On HPC-X 2.3
+        and earlier, this might cause problems on Ubuntu and other
+        platforms even if the system provides hugepage support.
+
 === END_MPI_T_CVAR_INFO_BLOCK ===
 */
 
@@ -126,6 +138,20 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
         MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv");
     }
 
+    /* [PB @ 2014-10-06] If hugepage support is not enabled, we force
+     * memory allocation to go through mmap.  This is mainly to
+     * workaround issues in MXM with Ubuntu where the detection has
+     * some issues (either because of bugs on the platform or within
+     * MXM) causing errors.  This can probably be deleted eventually
+     * when this issue is resolved.  */
+    if (MPIR_CVAR_NEMESIS_MXM_HUGEPAGE == 0) {
+        if (getenv("MXM_MEM_ALLOC") == NULL) {
+            r = MPL_putenv("MXM_MEM_ALLOC=mmap,libc,sysv");
+            MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv");
+        }
+    }
+
+
     mpi_errno = _mxm_init(pg_rank, pg_p->size);
     if (mpi_errno)
         MPIU_ERR_POP(mpi_errno);

-----------------------------------------------------------------------

Summary of changes:
 .../ch3/channels/nemesis/netmod/mxm/mxm_init.c     |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
MPICH primary repository