From huangwei at mvapich.cse.ohio-state.edu  Sat Sep  1 00:02:13 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Sat Sep  1 00:02:39 2007
Subject: [mvapich-commit] r1481 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma
Message-ID: <200709010402.l8142DVi018458@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-01 00:02:11 -0400 (Sat, 01 Sep 2007)
New Revision: 1481

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_rndvtransfer.c
Log:
Fix accumulate -multi 1 hanging problem. We need to keep pushing packets util
all data is sent out.


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_rndvtransfer.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_rndvtransfer.c	2007-08-29 20:01:06 UTC (rev 1480)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_rndvtransfer.c	2007-09-01 04:02:11 UTC (rev 1481)
@@ -446,7 +446,7 @@
             finished = MPIDI_CH3I_Request_adjust_iov(sreq, nb);
             DEBUG_PRINT("ajust iov finish: %d, ca %d\n", finished,
                         sreq->dev.ca);
-        } while (!finished && !msg_buffered);
+        } while (!finished/* && !msg_buffered*/);
 
         if (finished && sreq->dev.OnDataAvail ==
 			MPIDI_CH3_ReqHandler_SendReloadIOV) {
@@ -456,14 +456,14 @@
         } else if (finished) {
             complete = 1;
         }
-    } while (1 != msg_buffered && 0 == complete);
+    } while (/* 1 != msg_buffered && */0 == complete);
 
     DEBUG_PRINT("exit loop with complete %d, msg_buffered %d\n", complete,
                 msg_buffered);
 
-    if (0 == complete && 1 == msg_buffered) {
+    /*if (0 == complete && 1 == msg_buffered) {
         sreq->mrail.nearly_complete = 0;
-    } else if (1 == msg_buffered) {
+    } else */if (1 == msg_buffered) {
         buf->sreq = (void *) sreq;
         sreq->mrail.nearly_complete = 1;
     } else {

From huangwei at mvapich.cse.ohio-state.edu  Sat Sep  1 23:05:28 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Sat Sep  1 23:05:56 2007
Subject: [mvapich-commit] r1482 - mvapich2/tags
Message-ID: <200709020305.l8235StS021046@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-01 23:05:25 -0400 (Sat, 01 Sep 2007)
New Revision: 1482

Added:
   mvapich2/tags/1.0-BETA2/
Log:
Create 1.0-beta2 tag.


Copied: mvapich2/tags/1.0-BETA2 (from rev 1481, mvapich2/trunk)

From gaoq at mvapich.cse.ohio-state.edu  Wed Sep  5 10:13:40 2007
From: gaoq at mvapich.cse.ohio-state.edu (gaoq@mvapich.cse.ohio-state.edu)
Date: Wed Sep  5 10:14:08 2007
Subject: [mvapich-commit] r1484 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2
Message-ID: <200709051413.l85EDetu019881@mvapich.cse.ohio-state.edu>

Author: gaoq
Date: 2007-09-05 10:13:38 -0400 (Wed, 05 Sep 2007)
New Revision: 1484

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
Log:
Fix a hang in Finalization for on-demand in a corner case (only 1 proc)



Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-04 17:24:49 UTC (rev 1483)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-05 14:13:38 UTC (rev 1484)
@@ -1161,6 +1161,10 @@
 	    }
 	}
     }
+    else {
+        lid_all[0] = MPIDI_CH3I_RDMA_Process.lids[0][0];
+        ud_qpn_all[0] = ud_qpn_self;
+    }
 
     mpi_errno  = MPICM_Connect_UD(ud_qpn_all, lid_all);
     if (mpi_errno) {

From vishnu at mvapich.cse.ohio-state.edu  Wed Sep  5 11:48:02 2007
From: vishnu at mvapich.cse.ohio-state.edu (vishnu@mvapich.cse.ohio-state.edu)
Date: Wed Sep  5 11:48:29 2007
Subject: [mvapich-commit] r1485 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2
Message-ID: <200709051548.l85Fm2Bw020010@mvapich.cse.ohio-state.edu>

Author: vishnu
Date: 2007-09-05 11:48:00 -0400 (Wed, 05 Sep 2007)
New Revision: 1485

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_rndv.c
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_send.c
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/mpidi_ch3_rdma_pre.h
Log:
Fixing the problem for RDMA Read and HSAM



Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_rndv.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_rndv.c	2007-09-05 14:13:38 UTC (rev 1484)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_rndv.c	2007-09-05 15:48:00 UTC (rev 1485)
@@ -269,6 +269,8 @@
 
     rreq->mrail.completion_counter = 0;
 
+    rreq->mrail.num_rdma_read_completions = 0;
+
     if (rreq->mrail.rndv_buf_sz > 0) {
 #ifdef DEBUG
         assert(rreq->mrail.d_entry != NULL);
@@ -333,6 +335,8 @@
                     rreq->mrail.rkey[vc->mrail.rails[rail].hca_index],
                     nbytes, rail);
 
+            rreq->mrail.num_rdma_read_completions++;
+
         } else if(!MPIDI_CH3I_RDMA_Process.has_hsam) {
             inc = nbytes / rdma_num_rails;
             
@@ -348,6 +352,7 @@
                         rreq->mrail.rndv_buf_off + rail * inc,
                         rreq->mrail.rkey[vc->mrail.rails[rail].hca_index], 
                         inc, rail);
+                rreq->mrail.num_rdma_read_completions++;
                 /* Send the finish message immediately after the data */  
             }
             v = get_vbuf();
@@ -361,6 +366,7 @@
                     rreq->mrail.rndv_buf_off + inc * (rdma_num_rails - 1),
                     rreq->mrail.rkey[vc->mrail.rails[rail].hca_index], 
                     nbytes - (rdma_num_rails - 1) * inc, rail);
+            rreq->mrail.num_rdma_read_completions++;
 
         } else {
             rail = 0;
@@ -404,6 +410,7 @@
                         rails[mapped[count_rail]].hca_index],
                         inc, mapped[count_rail]);
 
+                rreq->mrail.num_rdma_read_completions++;
                 /* Send the finish message immediately after the data */
                 disp += inc;
             }
@@ -421,8 +428,8 @@
                     rreq->mrail.rkey[vc->mrail.
                     rails[mapped[count_rail]].hca_index],
                     nbytes - disp, mapped[count_rail]);
+            rreq->mrail.num_rdma_read_completions++;
 
-
         }
         /* Send the finish message immediately after the data */  
         rreq->mrail.rndv_buf_off += nbytes; 

Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_send.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_send.c	2007-09-05 14:13:38 UTC (rev 1484)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_send.c	2007-09-05 15:48:00 UTC (rev 1485)
@@ -986,25 +986,19 @@
         if(req->mrail.rndv_buf_sz > striping_threshold) {
             if(MPIDI_CH3I_RDMA_Process.has_hsam && 
                     (req->mrail.completion_counter == 
-                     (rdma_num_rails / stripe_factor) * 
-                     (MAX(MPIDI_CH3I_RDMA_Process.maxtransfersize,  
-                          req->mrail.rndv_buf_sz))/
-                     MPIDI_CH3I_RDMA_Process.maxtransfersize )) {
+                     req->mrail.num_rdma_read_completions )) { 
 
                 MRAILI_RDMA_Get_finish(vc, 
                         (MPID_Request *) v->sreq, v->rail);
-                
+
                 adjust_weights(v->vc, req->mrail.stripe_start_time,
                         req->mrail.stripe_finish_time, 
                         req->mrail.initial_weight);                       
 
             } else if (!MPIDI_CH3I_RDMA_Process.has_hsam && 
-                    (req->mrail.completion_counter ==
-                     (rdma_num_rails * 
-                      ((MAX(MPIDI_CH3I_RDMA_Process.maxtransfersize, 
-                            req->mrail.rndv_buf_sz)) / 
-                       MPIDI_CH3I_RDMA_Process.maxtransfersize)))) {
-               
+                    (req->mrail.completion_counter == 
+                       req->mrail.num_rdma_read_completions)) {
+
                 MRAILI_RDMA_Get_finish(vc,
                         (MPID_Request *) v->sreq, v->rail);
             }

Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/mpidi_ch3_rdma_pre.h
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/mpidi_ch3_rdma_pre.h	2007-09-05 14:13:38 UTC (rev 1484)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/mpidi_ch3_rdma_pre.h	2007-09-05 15:48:00 UTC (rev 1485)
@@ -93,6 +93,7 @@
         void     *remote_addr;          \
         uint32_t rkey[MAX_NUM_HCAS];    \
         uint8_t  nearly_complete;       \
+        uint8_t  num_rdma_read_completions;       \
         uint32_t completion_counter;   \
         double  initial_weight[MAX_NUM_SUBRAILS];   \
         double  stripe_start_time;   \

From chail at mvapich.cse.ohio-state.edu  Wed Sep  5 13:47:42 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Wed Sep  5 13:48:09 2007
Subject: [mvapich-commit] r1486 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma
Message-ID: <200709051747.l85HlgHW020227@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-05 13:47:39 -0400 (Wed, 05 Sep 2007)
New Revision: 1486

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_smp_progress.c
Log:
Fix a bug in smp. Reset reqest handle after rndv finishes.


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_smp_progress.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_smp_progress.c	2007-09-05 15:48:00 UTC (rev 1485)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/rdma/ch3_smp_progress.c	2007-09-05 17:47:39 UTC (rev 1486)
@@ -346,6 +346,7 @@
 			MPIU_ERR_POP(mpi_errno);
 		    }
 		    if (complete) {
+                        req->ch.reqtype = REQUEST_NORMAL;
 			MPIDI_CH3I_SMP_SendQ_dequeue(vc);
 			DEBUG_PRINT("Dequeue request from sendq %p, now head %p\n", 
 				req, vc->smp.sendq_head);

From chail at mvapich.cse.ohio-state.edu  Wed Sep  5 13:56:04 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Wed Sep  5 13:56:31 2007
Subject: [mvapich-commit] r1487 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl
Message-ID: <200709051756.l85Hu4Bn020247@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-05 13:56:03 -0400 (Wed, 05 Sep 2007)
New Revision: 1487

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.c
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.h
Log:
Remove unused variables to avoid confusion. The number of dreg entries is set by rdma_ndreg_entries,
not udapl_ndreg_entries.


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.c	2007-09-05 17:47:39 UTC (rev 1486)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.c	2007-09-05 17:56:03 UTC (rev 1487)
@@ -45,7 +45,6 @@
 int num_rdma_buffer = NUM_RDMA_BUFFER;
 #endif
 int rdma_iba_eager_threshold = RDMA_IBA_EAGER_THRESHOLD;
-unsigned int udapl_ndreg_entries = UDAPL_NDREG_ENTRIES;
 char dapl_provider[32] = DAPL_DEFAULT_PROVIDER;
 
 /* max (total) number of vbufs to allocate, after which process
@@ -245,10 +244,6 @@
     if ((value = getenv("MV2_NDREG_ENTRIES")) != NULL) {
         rdma_ndreg_entries = (unsigned int)atoi(value);
     }
-    if ((value = (char *) getenv ("MV2_NDREG_ENTRIES")) != NULL)
-      {
-          udapl_ndreg_entries = (unsigned int) atoi (value);
-      }
     if ((value = (char *) getenv ("MV2_VBUF_MAX")) != NULL)
       {
           udapl_vbuf_max = (int) atoi (value);

Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.h
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.h	2007-09-05 17:47:39 UTC (rev 1486)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_param.h	2007-09-05 17:56:03 UTC (rev 1487)
@@ -30,7 +30,6 @@
 extern float rdma_credit_update_threshold;
 extern int num_rdma_buffer;
 extern int rdma_iba_eager_threshold;
-extern unsigned int udapl_ndreg_entries;
 extern int udapl_vbuf_max;
 extern int udapl_vbuf_pool_size;
 extern int udapl_vbuf_secondary_pool_size;
@@ -79,7 +78,6 @@
 
 #define MAX_NUM_HCAS                    (1)
 #define MAX_SUBCHANNELS                 (1)
-#define UDAPL_NDREG_ENTRIES              (1000)
 #define UDAPL_VBUF_POOL_SIZE             (5000)
 #define UDAPL_VBUF_SECONDARY_POOL_SIZE   (500)
 #define UDAPL_PREPOST_DEPTH              (80)

From chail at mvapich.cse.ohio-state.edu  Wed Sep  5 16:44:18 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Wed Sep  5 16:44:45 2007
Subject: [mvapich-commit] r1488 - in mvapich2/trunk/src/mpid/osu_ch3:
	channels/mrail/src/udapl include
Message-ID: <200709052044.l85KiIbT020493@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-05 16:44:15 -0400 (Wed, 05 Sep 2007)
New Revision: 1488

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_channel_manager.c
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_rndv.c
   mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h
Log:
Check in the seqnum patch to uDAPL.


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_channel_manager.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_channel_manager.c	2007-09-05 17:56:03 UTC (rev 1487)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_channel_manager.c	2007-09-05 20:44:15 UTC (rev 1488)
@@ -156,6 +156,11 @@
               return ((MPIDI_CH3_Pkt_rndv_clr_to_send_t *)
                       (buf->pheader))->seqnum;
           }
+      case MPIDI_CH3_PKT_RPUT_FINISH:
+         {
+               return ((MPIDI_CH3_Pkt_rput_finish_t *)(buf->pheader))->seqnum;
+         }
+
       default:
           return PKT_NO_SEQ_NUM;
       }

Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_rndv.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_rndv.c	2007-09-05 17:56:03 UTC (rev 1487)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/udapl_rndv.c	2007-09-05 20:44:15 UTC (rev 1488)
@@ -212,6 +212,7 @@
     int n_iov = 1;
     int nb, rdma_ok;
     int mpi_errno = MPI_SUCCESS;
+    int seqnum;
 
     vbuf *buf;
 
@@ -219,6 +220,8 @@
     rput_pkt.receiver_req_id = sreq->mrail.partner_id;
     iov.MPID_IOV_BUF = (void *)&rput_pkt;
     iov.MPID_IOV_LEN = sizeof (MPIDI_CH3_Pkt_rput_finish_t);
+    MPIDI_VC_FAI_send_seqnum(vc, seqnum);
+    MPIDI_Pkt_set_seqnum(&rput_pkt, seqnum);
 
 #if defined(RDMA_FAST_PATH)
     if (MPIDI_CH3I_RDMA_Process.has_rdma_fast_path) {

Modified: mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h	2007-09-05 17:56:03 UTC (rev 1487)
+++ mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h	2007-09-05 20:44:15 UTC (rev 1488)
@@ -200,6 +200,9 @@
 {
     uint8_t type;
     MPIDI_CH3I_MRAILI_IBA_PKT_DECL
+#ifdef DAPL_DEFAULT_PROVIDER 
+    MPID_Seqnum_t seqnum;
+#endif
     MPI_Request receiver_req_id; /* echoed*/
 } MPIDI_CH3_Pkt_rput_finish_t;
 

From narravul at mvapich.cse.ohio-state.edu  Thu Sep  6 02:39:14 2007
From: narravul at mvapich.cse.ohio-state.edu (narravul@mvapich.cse.ohio-state.edu)
Date: Thu Sep  6 06:47:29 2007
Subject: [mvapich-commit] r1489 - in mvapich2/branches/0.9.8/src: mpe2/sbin
	pmi/simple
Message-ID: <200709060639.l866dEb6021618@mvapich.cse.ohio-state.edu>

Author: narravul
Date: 2007-09-06 02:39:12 -0400 (Thu, 06 Sep 2007)
New Revision: 1489

Modified:
   mvapich2/branches/0.9.8/src/mpe2/sbin/mpeinstall.in
   mvapich2/branches/0.9.8/src/pmi/simple/simple_pmi.c
Log:
 * Minor patches for fixing (i) duplication of DESTDIR in install
paths and (ii) PMIU_getval length used in simple_pmi
 * Thanks to Jim Schutt of Sandia for this patch.




Modified: mvapich2/branches/0.9.8/src/mpe2/sbin/mpeinstall.in
===================================================================
--- mvapich2/branches/0.9.8/src/mpe2/sbin/mpeinstall.in	2007-09-05 20:44:15 UTC (rev 1488)
+++ mvapich2/branches/0.9.8/src/mpe2/sbin/mpeinstall.in	2007-09-06 06:39:12 UTC (rev 1489)
@@ -442,10 +442,10 @@
          echo "Copying MPE utility programs to $DESTDIR$bindir"
          CopyDirRecurP $binbuild_dir $bindir $XMODE
          if [ -s $binbuild_dir/mpecc -a -x $binbuild_dir/mpecc ] ; then
-             FixInstallFile $binbuild_dir/mpecc $DESTDIR$bindir/mpecc $XMODE
+             FixInstallFile $binbuild_dir/mpecc $bindir/mpecc $XMODE
          fi
          if [ -s $binbuild_dir/mpefc -a -x $binbuild_dir/mpefc ] ; then
-             FixInstallFile $binbuild_dir/mpefc $DESTDIR$bindir/mpefc $XMODE
+             FixInstallFile $binbuild_dir/mpefc $bindir/mpefc $XMODE
          fi
     fi
 fi
@@ -457,7 +457,7 @@
          CopyDirRecurP $etcbuild_dir $sysconfdir $MODE
          cd $etcbuild_dir && \
          for file in *.conf ; do \
-             FixInstallFile $file $DESTDIR$sysconfdir/$file ; \
+             FixInstallFile $file $sysconfdir/$file ; \
          done
     fi
 fi

Modified: mvapich2/branches/0.9.8/src/pmi/simple/simple_pmi.c
===================================================================
--- mvapich2/branches/0.9.8/src/pmi/simple/simple_pmi.c	2007-09-05 20:44:15 UTC (rev 1488)
+++ mvapich2/branches/0.9.8/src/pmi/simple/simple_pmi.c	2007-09-06 06:39:12 UTC (rev 1489)
@@ -566,7 +566,7 @@
 	PMIU_getval( "rc", buf, PMIU_MAXLINE );
 	rc = atoi( buf );
 	if ( rc == 0 ) {
-	    PMIU_getval( "value", value, PMI_vallen_max );
+	    PMIU_getval( "value", value, length );
 	    return( 0 );
 	}
 	else {

From narravul at mvapich.cse.ohio-state.edu  Thu Sep  6 02:41:04 2007
From: narravul at mvapich.cse.ohio-state.edu (narravul@mvapich.cse.ohio-state.edu)
Date: Thu Sep  6 06:47:30 2007
Subject: [mvapich-commit] r1490 - mvapich2/branches/0.9.8
Message-ID: <200709060641.l866f4TK021633@mvapich.cse.ohio-state.edu>

Author: narravul
Date: 2007-09-06 02:41:04 -0400 (Thu, 06 Sep 2007)
New Revision: 1490

Modified:
   mvapich2/branches/0.9.8/CHANGELOG
Log:
Updating changelog and credits.



Modified: mvapich2/branches/0.9.8/CHANGELOG
===================================================================
--- mvapich2/branches/0.9.8/CHANGELOG	2007-09-06 06:39:12 UTC (rev 1489)
+++ mvapich2/branches/0.9.8/CHANGELOG	2007-09-06 06:41:04 UTC (rev 1490)
@@ -3,6 +3,11 @@
 This file briefly describes the latest changes to the MVAPICH2 software
 package.  The logs are arranged in the "most recent first" order.
 
+09/05/2007
+ * Minor patches for fixing (i) duplication of DESTDIR in install
+   paths and (ii) PMIU_getval length used in simple_pmi 
+   Thanks to Jim Schutt (Sandia) for this patch.
+
 07/25/2007
 * Fix for hang while using IMB with -multi option. 
   Thanks to Pasha (Mellanox) for reporting this.

From perkinjo at mvapich.cse.ohio-state.edu  Thu Sep  6 11:55:32 2007
From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu)
Date: Thu Sep  6 11:56:01 2007
Subject: [mvapich-commit] r1492 - mvapich/trunk/mpid/ch_gen2/process
Message-ID: <200709061555.l86FtWZn022969@mvapich.cse.ohio-state.edu>

Author: perkinjo
Date: 2007-09-06 11:55:30 -0400 (Thu, 06 Sep 2007)
New Revision: 1492

Modified:
   mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c
Log:
Checking in minor fix for handling builtin kill command with different shells.



Modified: mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c
===================================================================
--- mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c	2007-09-06 13:56:36 UTC (rev 1491)
+++ mvapich/trunk/mpid/ch_gen2/process/mpirun_rsh.c	2007-09-06 15:55:30 UTC (rev 1492)
@@ -1697,7 +1697,7 @@
 		char kill_cmd[bufsize], tmp[10];
 
 		kill_cmd[0] = '\0';
-		strcat(kill_cmd, "kill -s SIGKILL");
+		strcat(kill_cmd, "kill -s 9");
 
 		for(j = 0; j < pg->npids; j++) {
 		    snprintf(tmp, 10, " %d", pg->pids[j]);
@@ -1774,7 +1774,7 @@
 
 	    if(!plist[i].remote_pid) exit(EXIT_SUCCESS);
 
-	    snprintf(kill_cmd, 80, "kill -s SIGKILL %d >&/dev/null",
+	    snprintf(kill_cmd, 80, "kill -s 9 %d >&/dev/null",
 		plist[i].remote_pid);
 
 	    if(use_rsh) {

From huangwei at mvapich.cse.ohio-state.edu  Mon Sep 10 16:14:34 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Mon Sep 10 16:15:01 2007
Subject: [mvapich-commit] r1501 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi
Message-ID: <200709102014.l8AKEY20019821@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-10 16:14:31 -0400 (Mon, 10 Sep 2007)
New Revision: 1501

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c
Log:
sequence number of rma_cts packet type


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c	2007-09-10 17:24:13 UTC (rev 1500)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c	2007-09-10 20:14:31 UTC (rev 1501)
@@ -133,6 +133,11 @@
         {
             return ((MPIDI_CH3_Pkt_put_t *)(buf->pheader))->seqnum;
         }
+    case MPIDI_CH3_PKT_RMA_RNDV_CLR_TO_SEND:
+	{
+	    return ((MPIDI_CH3_Pkt_rndv_clr_to_send_t *)
+		    (buf->pheader))->seqnum;
+	}
 
     default:
         return PKT_NO_SEQ_NUM;

From huangwei at mvapich.cse.ohio-state.edu  Tue Sep 11 09:41:18 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Tue Sep 11 09:41:48 2007
Subject: [mvapich-commit] r1502 - in mvapich2/trunk/src/mpid/osu_ch3:
	channels/mrail/src/vapi include
Message-ID: <200709111341.l8BDfIwF022032@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-11 09:41:16 -0400 (Tue, 11 Sep 2007)
New Revision: 1502

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_rndv.c
   mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h
Log:
RPUT_FINISH package sent in order for vapi device.



Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c	2007-09-10 20:14:31 UTC (rev 1501)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_channel_manager.c	2007-09-11 13:41:16 UTC (rev 1502)
@@ -138,6 +138,10 @@
 	    return ((MPIDI_CH3_Pkt_rndv_clr_to_send_t *)
 		    (buf->pheader))->seqnum;
 	}
+    case MPIDI_CH3_PKT_RPUT_FINISH:
+	{
+	    return ((MPIDI_CH3_Pkt_rput_finish_t *)(buf->pheader))->seqnum;
+	}
 
     default:
         return PKT_NO_SEQ_NUM;

Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_rndv.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_rndv.c	2007-09-10 20:14:31 UTC (rev 1501)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/vapi/vapi_rndv.c	2007-09-11 13:41:16 UTC (rev 1502)
@@ -193,6 +193,7 @@
     int n_iov = 1;
     int nb, rdma_ok;
     int mpi_errno = MPI_SUCCESS;
+    int seqnum;
 
     vbuf *buf;
 
@@ -200,6 +201,8 @@
     rput_pkt.receiver_req_id = sreq->mrail.partner_id;
     iov.MPID_IOV_BUF = (void *)&rput_pkt;
     iov.MPID_IOV_LEN = sizeof(MPIDI_CH3_Pkt_rput_finish_t);
+    MPIDI_VC_FAI_send_seqnum(vc, seqnum);
+    MPIDI_Pkt_set_seqnum(&rput_pkt, seqnum);
 
 #if defined(RDMA_FAST_PATH)
     rdma_ok =

Modified: mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h	2007-09-10 20:14:31 UTC (rev 1501)
+++ mvapich2/trunk/src/mpid/osu_ch3/include/mpidpkt.h	2007-09-11 13:41:16 UTC (rev 1502)
@@ -200,9 +200,7 @@
 {
     uint8_t type;
     MPIDI_CH3I_MRAILI_IBA_PKT_DECL
-#ifdef DAPL_DEFAULT_PROVIDER 
     MPID_Seqnum_t seqnum;
-#endif
     MPI_Request receiver_req_id; /* echoed*/
 } MPIDI_CH3_Pkt_rput_finish_t;
 

From chail at mvapich.cse.ohio-state.edu  Tue Sep 11 19:01:46 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Tue Sep 11 19:02:14 2007
Subject: [mvapich-commit] r1504 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl
Message-ID: <200709112301.l8BN1kAI023026@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-11 19:01:44 -0400 (Tue, 11 Sep 2007)
New Revision: 1504

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/dreg.c
Log:
Don't abort if registration failed, just return NULL and let the upper layer fall back.


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/dreg.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/dreg.c	2007-09-11 21:29:40 UTC (rev 1503)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/udapl/dreg.c	2007-09-11 23:01:44 UTC (rev 1504)
@@ -1069,9 +1069,6 @@
                          &d->memhandle.hndl, &d->memhandle.lkey,
                          &d->memhandle.rkey, &reg_size, &reg_addr);
 
-#ifndef SOLARIS
-    CHECK_RETURN(ret, "cannot create lmr\n");
-#endif
     DEBUG_PRINT("register return mr %p, buf %p, len %d\n", mr, buf, len);
     return ret;
 }

From huangwei at mvapich.cse.ohio-state.edu  Thu Sep 13 10:19:27 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Thu Sep 13 10:19:58 2007
Subject: [mvapich-commit] r1505 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2
Message-ID: <200709131419.l8DEJR7j028031@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-13 10:19:26 -0400 (Thu, 13 Sep 2007)
New Revision: 1505

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_param.c
Log:
Device name for ConnectX should be "mlx4*", disable coalesce when ConnectX is
detected


Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_param.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_param.c	2007-09-11 23:01:44 UTC (rev 1504)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/ibv_param.c	2007-09-13 14:19:26 UTC (rev 1505)
@@ -189,7 +189,9 @@
         return HCA_ERROR;
     }
 
-    if(!strncmp(dev_name, "mthca", 5)) {
+    if(!strncmp(dev_name, "mlx4", 4)) {
+	hca_type = MLX_CX_DDR;
+    } else if(!strncmp(dev_name, "mthca", 5)) {
 
         hca_type = MLX_PCI_X;
 
@@ -229,9 +231,12 @@
                 }
 
             } else if (10 == rate) {
+		if(!strncmp(umad_ca.ca_type, "MT254", 5)) {
+                    hca_type = MLX_CX_DDR;
+                } else {
+		    hca_type = MLX_PCI_EX_SDR;
+		}
 
-                hca_type = MLX_PCI_EX_SDR;
-
             } else {
 
                 fprintf(stderr,"Unknown Mellanox PCI-Express HCA"
@@ -506,6 +511,10 @@
         rdma_use_coalesce = !!atoi(value);
     }
 
+    if (proc->hca_type == MLX_CX_DDR) {
+	rdma_use_coalesce = 0;
+    }
+
     if ((MPIDI_CH3I_Process.cm_type == MPIDI_CH3I_CM_ON_DEMAND) 
 	|| proc->use_rdma_cm_on_demand)
 	    proc->has_one_sided = 0;

From rowland at mvapich.cse.ohio-state.edu  Fri Sep 14 17:32:22 2007
From: rowland at mvapich.cse.ohio-state.edu (rowland@mvapich.cse.ohio-state.edu)
Date: Fri Sep 14 17:32:53 2007
Subject: [mvapich-commit] r1508 - mvapich2/trunk/src/env
Message-ID: <200709142132.l8ELWMqK032106@mvapich.cse.ohio-state.edu>

Author: rowland
Date: 2007-09-14 17:32:22 -0400 (Fri, 14 Sep 2007)
New Revision: 1508

Modified:
   mvapich2/trunk/src/env/mpicc.bash.in
   mvapich2/trunk/src/env/mpicc.in
   mvapich2/trunk/src/env/mpicxx.bash.in
   mvapich2/trunk/src/env/mpicxx.in
   mvapich2/trunk/src/env/mpif77.bash.in
   mvapich2/trunk/src/env/mpif77.in
   mvapich2/trunk/src/env/mpif90.bash.in
   mvapich2/trunk/src/env/mpif90.in
Log:
Updated the MPI compiler source files to make sure the installation's include
directory is always first.  This should avoid confusion caused by including
the wrong mpi.h file, or possibly other include files.


Modified: mvapich2/trunk/src/env/mpicc.bash.in
===================================================================
--- mvapich2/trunk/src/env/mpicc.bash.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpicc.bash.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -219,10 +219,10 @@
 	# prepend the path for the shared libraries to the library list
 	mpilibs="$C_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $CC $CFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir $mpilibs $MPI_OTHERLIBS
+    $Show $CC -I$includedir $CFLAGS $LDFLAGS "${allargs[@]}" -L$libdir $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $CC $CFLAGS "${allargs[@]}" -I$includedir
+    $Show $CC -I$includedir $CFLAGS "${allargs[@]}" 
     rc=$?
 fi
 

Modified: mvapich2/trunk/src/env/mpicc.in
===================================================================
--- mvapich2/trunk/src/env/mpicc.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpicc.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -229,10 +229,10 @@
 	# prepend the path for the shared libraries to the library list
 	mpilibs="$C_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $CC $CFLAGS $LDFLAGS $allargs -I$includedir -L$libdir $mpilibs $MPI_OTHERLIBS
+    $Show $CC -I$includedir $CFLAGS $LDFLAGS $allargs -L$libdir $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $CC $CFLAGS $allargs -I$includedir
+    $Show $CC -I$includedir $CFLAGS $allargs 
     rc=$?
 fi
 

Modified: mvapich2/trunk/src/env/mpicxx.bash.in
===================================================================
--- mvapich2/trunk/src/env/mpicxx.bash.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpicxx.bash.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -219,10 +219,10 @@
         # Prepend the path for the shared libraries to the library list
         shllibpath="$CXX_LINKPATH_SHL$libdir"
     fi
-    $Show $CXX $CXXFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
+    $Show $CXX -I$includedir $CXXFLAGS $LDFLAGS "${allargs[@]}" -L$libdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $CXX $CXXFLAGS "${allargs[@]}" -I$includedir
+    $Show $CXX -I$includedir $CXXFLAGS "${allargs[@]}" 
     rc=$?
 fi
 

Modified: mvapich2/trunk/src/env/mpicxx.in
===================================================================
--- mvapich2/trunk/src/env/mpicxx.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpicxx.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -229,10 +229,10 @@
         # Prepend the path for the shared libraries to the library list
         shllibpath="$CXX_LINKPATH_SHL$libdir"
     fi
-    $Show $CXX $CXXFLAGS $LDFLAGS $allargs -I$includedir -L$libdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
+    $Show $CXX -I$includedir $CXXFLAGS $LDFLAGS $allargs -L$libdir $shllibpath $cxxlibs $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $CXX $CXXFLAGS $allargs -I$includedir
+    $Show $CXX -I$includedir $CXXFLAGS $allargs 
     rc=$?
 fi
 

Modified: mvapich2/trunk/src/env/mpif77.bash.in
===================================================================
--- mvapich2/trunk/src/env/mpif77.bash.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpif77.bash.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -265,10 +265,10 @@
         # Prepend the path for the shared libraries to the library list
         mpilibs="$FC_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $FC $FFLAGS $LDFLAGS "${allargs[@]}" -I$includedir -L$libdir $mpilibs $MPI_OTHERLIBS
+    $Show $FC -I$includedir $FFLAGS $LDFLAGS "${allargs[@]}" -L$libdir $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $FC $FFLAGS "${allargs[@]}" -I$includedir
+    $Show $FC -I$includedir $FFLAGS "${allargs[@]}" 
     rc=$?
 fi
 if [ -n "$rmfiles" ] ; then

Modified: mvapich2/trunk/src/env/mpif77.in
===================================================================
--- mvapich2/trunk/src/env/mpif77.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpif77.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -288,10 +288,10 @@
         # Prepend the path for the shared libraries to the library list
         mpilibs="$FC_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $FC $FFLAGS $LDFLAGS $allargs -I$includedir -L$libdir $mpilibs $MPI_OTHERLIBS
+    $Show $FC -I$includedir $FFLAGS $LDFLAGS $allargs -L$libdir $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $FC $FFLAGS $allargs -I$includedir
+    $Show $FC -I$includedir $FFLAGS $allargs 
     rc=$?
 fi
 if [ -n "$rmfiles" ] ; then

Modified: mvapich2/trunk/src/env/mpif90.bash.in
===================================================================
--- mvapich2/trunk/src/env/mpif90.bash.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpif90.bash.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -314,10 +314,10 @@
         # Prepend the path for the shared libraries to the library list
         mpilibs="$F90_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $F90 $F90FLAGS $LDFLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS -L$libdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS
+    $Show $F90 $F90INCDIRS $F90FLAGS $LDFLAGS "${allargs[@]}" $F90MODDIRS -L$libdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $F90 $F90FLAGS "${allargs[@]}" $F90INCDIRS $F90MODDIRS
+    $Show $F90 $F90INCDIRS $F90FLAGS "${allargs[@]}" $F90MODDIRS
     rc=$?
 fi
 if [ -n "$rmfiles" ] ; then

Modified: mvapich2/trunk/src/env/mpif90.in
===================================================================
--- mvapich2/trunk/src/env/mpif90.in	2007-09-13 17:02:12 UTC (rev 1507)
+++ mvapich2/trunk/src/env/mpif90.in	2007-09-14 21:32:22 UTC (rev 1508)
@@ -336,10 +336,10 @@
         # Prepend the path for the shared libraries to the library list
         mpilibs="$F90_LINKPATH_SHL$libdir $mpilibs"
     fi
-    $Show $F90 $F90FLAGS $LDFLAGS $allargs $F90INCDIRS $F90MODDIRS -L$libdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS
+    $Show $F90 $F90INCDIRS $F90FLAGS $LDFLAGS $allargs $F90MODDIRS -L$libdir $F90MODLIBS $mpilibs $MPI_OTHERLIBS
     rc=$?
 else
-    $Show $F90 $F90FLAGS $allargs $F90INCDIRS $F90MODDIRS
+    $Show $F90 $F90INCDIRS $F90FLAGS $allargs $F90MODDIRS
     rc=$?
 fi
 if [ -n "$rmfiles" ] ; then

From vishnu at mvapich.cse.ohio-state.edu  Fri Sep 14 18:29:34 2007
From: vishnu at mvapich.cse.ohio-state.edu (vishnu@mvapich.cse.ohio-state.edu)
Date: Fri Sep 14 18:30:02 2007
Subject: [mvapich-commit] r1509 - mvapich2/tags
Message-ID: <200709142229.l8EMTYG2032338@mvapich.cse.ohio-state.edu>

Author: vishnu
Date: 2007-09-14 18:29:33 -0400 (Fri, 14 Sep 2007)
New Revision: 1509

Added:
   mvapich2/tags/1.0-RELEASE/
Log:
Creating the 1.0 Branch



Copied: mvapich2/tags/1.0-RELEASE (from rev 1508, mvapich2/trunk)

From vishnu at mvapich.cse.ohio-state.edu  Fri Sep 14 18:50:07 2007
From: vishnu at mvapich.cse.ohio-state.edu (vishnu@mvapich.cse.ohio-state.edu)
Date: Fri Sep 14 18:50:36 2007
Subject: [mvapich-commit] r1510 - mvapich2/branches
Message-ID: <200709142250.l8EMo70W032392@mvapich.cse.ohio-state.edu>

Author: vishnu
Date: 2007-09-14 18:50:04 -0400 (Fri, 14 Sep 2007)
New Revision: 1510

Removed:
   mvapich2/branches/1.0/
Log:
Deleting the un-used 1.0 branch


From vishnu at mvapich.cse.ohio-state.edu  Fri Sep 14 18:50:56 2007
From: vishnu at mvapich.cse.ohio-state.edu (vishnu@mvapich.cse.ohio-state.edu)
Date: Fri Sep 14 18:51:23 2007
Subject: [mvapich-commit] r1511 - mvapich2/branches
Message-ID: <200709142250.l8EMouNG032402@mvapich.cse.ohio-state.edu>

Author: vishnu
Date: 2007-09-14 18:50:55 -0400 (Fri, 14 Sep 2007)
New Revision: 1511

Added:
   mvapich2/branches/1.0/
Log:
Creating a new MVAPICH2 branch for 1.0 release



Copied: mvapich2/branches/1.0 (from rev 1510, mvapich2/trunk)

From huangwei at mvapich.cse.ohio-state.edu  Thu Sep 20 14:19:26 2007
From: huangwei at mvapich.cse.ohio-state.edu (huangwei@mvapich.cse.ohio-state.edu)
Date: Thu Sep 20 14:19:57 2007
Subject: [mvapich-commit] r1518 - mvapich2/trunk/src/pm/mpd
Message-ID: <200709201819.l8KIJQAA006304@mvapich.cse.ohio-state.edu>

Author: huangwei
Date: 2007-09-20 14:19:24 -0400 (Thu, 20 Sep 2007)
New Revision: 1518

Modified:
   mvapich2/trunk/src/pm/mpd/mtv_setup.py
Log:
totalview patch


Modified: mvapich2/trunk/src/pm/mpd/mtv_setup.py
===================================================================
--- mvapich2/trunk/src/pm/mpd/mtv_setup.py	2007-09-20 12:39:27 UTC (rev 1517)
+++ mvapich2/trunk/src/pm/mpd/mtv_setup.py	2007-09-20 18:19:24 UTC (rev 1518)
@@ -6,6 +6,9 @@
 
 from distutils.core import setup, Extension
 
-mtv = Extension("mtv",["mtv.c"])
+mtv = Extension("mtv",
+                sources = ["mtv.c"],
+                extra_compile_args = ["-O0", "-g"],
+                extra_link_args = ["-O0", "-g"])
 
 setup(name="mtv", version="1.0", ext_modules=[mtv])

From perkinjo at mvapich.cse.ohio-state.edu  Mon Sep 24 13:03:14 2007
From: perkinjo at mvapich.cse.ohio-state.edu (perkinjo@mvapich.cse.ohio-state.edu)
Date: Mon Sep 24 13:03:45 2007
Subject: [mvapich-commit] r1526 - mvapich2/branches/1.0/src/pm/mpd
Message-ID: <200709241703.l8OH3Ej6002267@mvapich.cse.ohio-state.edu>

Author: perkinjo
Date: 2007-09-24 13:03:12 -0400 (Mon, 24 Sep 2007)
New Revision: 1526

Modified:
   mvapich2/branches/1.0/src/pm/mpd/mtv_setup.py
Log:
Checking in TotalView Optimization/Debug flag fix.



Modified: mvapich2/branches/1.0/src/pm/mpd/mtv_setup.py
===================================================================
--- mvapich2/branches/1.0/src/pm/mpd/mtv_setup.py	2007-09-21 21:21:07 UTC (rev 1525)
+++ mvapich2/branches/1.0/src/pm/mpd/mtv_setup.py	2007-09-24 17:03:12 UTC (rev 1526)
@@ -6,6 +6,9 @@
 
 from distutils.core import setup, Extension
 
-mtv = Extension("mtv",["mtv.c"])
+mtv = Extension("mtv",
+                sources = ["mtv.c"],
+                extra_compile_args = ["-O0", "-g"],
+                extra_link_args = ["-O0", "-g"])
 
 setup(name="mtv", version="1.0", ext_modules=[mtv])

From chail at mvapich.cse.ohio-state.edu  Tue Sep 25 16:37:46 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Tue Sep 25 16:38:16 2007
Subject: [mvapich-commit] r1542 -
	mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2
Message-ID: <200709252037.l8PKbkUR005803@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-25 16:37:44 -0400 (Tue, 25 Sep 2007)
New Revision: 1542

Modified:
   mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
Log:
Correctly applying the start-up patch (to fix the slow PMI exchange).



Modified: mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
===================================================================
--- mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-25 15:38:20 UTC (rev 1541)
+++ mvapich2/trunk/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-25 20:37:44 UTC (rev 1542)
@@ -1044,16 +1044,14 @@
 	    int hostid;
 	    struct hostent *hostent;
 
-	    if (SMP_INIT) {
-		gethostname(hostname, HOSTNAME_LEN);
-		if (!hostname) {
-		    MPIU_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_OTHER,
-			    "**fail", "**fail %s", "Could not get hostname");
-		}
-		hostent = gethostbyname(hostname);
-		hostid = (int) ((struct in_addr *) hostent->h_addr_list[0])->s_addr;
-		self_info.hostid = hostid;
+	    gethostname(hostname, HOSTNAME_LEN);
+	    if (!hostname) {
+	        MPIU_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_OTHER,
+		    "**fail", "**fail %s", "Could not get hostname");
 	    }
+	    hostent = gethostbyname(hostname);
+	    hostid = (int) ((struct in_addr *) hostent->h_addr_list[0])->s_addr;
+	    self_info.hostid = hostid;
 #endif
 
 	    self_info.lid = MPIDI_CH3I_RDMA_Process.lids[0][0];
@@ -1065,10 +1063,8 @@
 	    for (i=0;i<pg_size;i++) {
 #ifdef _SMP_
 		MPIDI_VC_t *vc;
-		if (SMP_INIT) {
-		    MPIDI_PG_Get_vcr(pg, i, &vc);
-		    vc->smp.hostid = all_info[i].hostid;
-		}
+		MPIDI_PG_Get_vcr(pg, i, &vc);
+		vc->smp.hostid = all_info[i].hostid;
 #endif
 		ud_qpn_all[i] = all_info[i].qpn;
 		lid_all[i] = all_info[i].lid;

From chail at mvapich.cse.ohio-state.edu  Tue Sep 25 16:42:08 2007
From: chail at mvapich.cse.ohio-state.edu (chail@mvapich.cse.ohio-state.edu)
Date: Tue Sep 25 16:42:38 2007
Subject: [mvapich-commit] r1543 -
	mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2
Message-ID: <200709252042.l8PKg8iq005819@mvapich.cse.ohio-state.edu>

Author: chail
Date: 2007-09-25 16:42:08 -0400 (Tue, 25 Sep 2007)
New Revision: 1543

Modified:
   mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
Log:
Correctly applying the start-up patch (to fix the slow PMI exchange).


Modified: mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c
===================================================================
--- mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-25 20:37:44 UTC (rev 1542)
+++ mvapich2/branches/1.0/src/mpid/osu_ch3/channels/mrail/src/gen2/rdma_iba_init.c	2007-09-25 20:42:08 UTC (rev 1543)
@@ -1044,16 +1044,14 @@
 	    int hostid;
 	    struct hostent *hostent;
 
-	    if (SMP_INIT) {
-		gethostname(hostname, HOSTNAME_LEN);
-		if (!hostname) {
-		    MPIU_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_OTHER,
-			    "**fail", "**fail %s", "Could not get hostname");
-		}
-		hostent = gethostbyname(hostname);
-		hostid = (int) ((struct in_addr *) hostent->h_addr_list[0])->s_addr;
-		self_info.hostid = hostid;
+	    gethostname(hostname, HOSTNAME_LEN);
+	    if (!hostname) {
+	        MPIU_ERR_SETFATALANDJUMP1(mpi_errno, MPI_ERR_OTHER,
+		    "**fail", "**fail %s", "Could not get hostname");
 	    }
+	    hostent = gethostbyname(hostname);
+	    hostid = (int) ((struct in_addr *) hostent->h_addr_list[0])->s_addr;
+	    self_info.hostid = hostid;
 #endif
 
 	    self_info.lid = MPIDI_CH3I_RDMA_Process.lids[0][0];
@@ -1065,10 +1063,8 @@
 	    for (i=0;i<pg_size;i++) {
 #ifdef _SMP_
 		MPIDI_VC_t *vc;
-		if (SMP_INIT) {
-		    MPIDI_PG_Get_vcr(pg, i, &vc);
-		    vc->smp.hostid = all_info[i].hostid;
-		}
+		MPIDI_PG_Get_vcr(pg, i, &vc);
+		vc->smp.hostid = all_info[i].hostid;
 #endif
 		ud_qpn_all[i] = all_info[i].qpn;
 		lid_all[i] = all_info[i].lid;