[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-46-g0d4fc04

[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  0d4fc04f5263eca49f55d46441c44c5e8c0303c8 (commit)
      from  3b330831cf996926482c4fe7f7941d3c8d0686b8 (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/0d4fc04f5263eca49f55d46441c44c5e8c0303c8

commit 0d4fc04f5263eca49f55d46441c44c5e8c0303c8
Author: Xin Zhao <xinzhao3 at illinois.edu>
Date:   Sat Oct 25 16:15:59 2014 -0500

    Revert "MPICH-specific initialization of mxm."
    
    This reverts commit 4ce4103ae1ee924c8d27dc5202f669e6bb5e8a35.

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 f155b82..37e0558 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c
@@ -107,7 +107,6 @@ static int _mxm_conf(void);
 #define FCNAME MPIDI_QUOTE(FUNCNAME)
 int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p)
 {
-    int r;
     int mpi_errno = MPI_SUCCESS;
 
     MPIDI_STATE_DECL(MPID_STATE_MXM_INIT);
@@ -117,15 +116,6 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
     MPIU_Assert(sizeof(MPID_nem_mxm_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN);
     MPIU_Assert(sizeof(MPID_nem_mxm_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
 
-
-    /* mpich-specific initialization of mxm */
-    /* check if the user is not trying to override the tls setting
-     * before resetting it */
-    if (getenv("MXM_TLS") == NULL) {
-        r = MPL_putenv("MXM_TLS=rc,dc,ud");
-        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     |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
MPICH primary repository