[mpich2-commits] r6694 - in mpich2/trunk/src: include mpi/coll mpid/ch3/src util/param

[goodell at mcs.anl.gov]

Author: goodell
Date: 2010-05-20 22:34:31 -0500 (Thu, 20 May 2010)
New Revision: 6694

Modified:
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/mpi/coll/alltoall.c
   mpich2/trunk/src/mpi/coll/alltoallv.c
   mpich2/trunk/src/mpi/coll/alltoallw.c
   mpich2/trunk/src/mpid/ch3/src/mpid_vc.c
   mpich2/trunk/src/util/param/params.yml
Log:
use the new parameter interface for alltoall and NO_LOCAL

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/include/mpiimpl.h	2010-05-21 03:34:31 UTC (rev 6694)
@@ -3155,11 +3155,6 @@
 #define MPIR_BCAST_SHORT_MSG          12288
 #define MPIR_BCAST_LONG_MSG           524288
 #define MPIR_BCAST_MIN_PROCS          8
-#define MPIR_ALLTOALL_SHORT_MSG       256
-#define MPIR_ALLTOALL_MEDIUM_MSG      32768
-#define MPIR_ALLTOALL_THROTTLE        4  /* max no. of irecvs/isends posted at a 
-time in some alltoall algorithms. Setting it to 0 causes all irecvs/isends to be 
-posted at once. */
 #define MPIR_REDSCAT_COMMUTATIVE_LONG_MSG 524288
 #define MPIR_REDSCAT_NONCOMMUTATIVE_SHORT_MSG 512
 #define MPIR_ALLGATHER_SHORT_MSG      81920

Modified: mpich2/trunk/src/mpi/coll/alltoall.c
===================================================================
--- mpich2/trunk/src/mpi/coll/alltoall.c	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/mpi/coll/alltoall.c	2010-05-21 03:34:31 UTC (rev 6694)
@@ -148,7 +148,7 @@
             }
         }
     }
-    else if ((nbytes <= MPIR_ALLTOALL_SHORT_MSG) && (comm_size >= 8)) {
+    else if ((nbytes <= MPIR_PARAM_ALLTOALL_SHORT_MSG_SIZE) && (comm_size >= 8)) {
 
         /* use the indexing algorithm by Jehoshua Bruck et al,
          * IEEE TPDS, Nov. 97 */ 
@@ -423,7 +423,7 @@
 
     }
 
-    else if (nbytes <= MPIR_ALLTOALL_MEDIUM_MSG) {  
+    else if (nbytes <= MPIR_PARAM_ALLTOALL_MEDIUM_MSG_SIZE) {
         /* Medium-size message. Use isend/irecv with scattered
            destinations. Use Tony Ladd's modification to post only
            a small number of isends/irecvs at a time. */
@@ -441,7 +441,7 @@
 	 */
         int ii, ss, bblock;
 
-        bblock = MPIR_ALLTOALL_THROTTLE;
+        bblock = MPIR_PARAM_ALLTOALL_THROTTLE;
         if (bblock == 0) bblock = comm_size;
 
 	/* FIXME: This should use the memory macros (there are storage

Modified: mpich2/trunk/src/mpi/coll/alltoallv.c
===================================================================
--- mpich2/trunk/src/mpi/coll/alltoallv.c	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/mpi/coll/alltoallv.c	2010-05-21 03:34:31 UTC (rev 6694)
@@ -122,7 +122,7 @@
         }
     }
     else {
-        bblock = MPIR_ALLTOALL_THROTTLE;
+        bblock = MPIR_PARAM_ALLTOALL_THROTTLE;
         if (bblock == 0) bblock = comm_size;
 
         MPIU_CHKLMEM_MALLOC(starray,  MPI_Status*,  2*bblock*sizeof(MPI_Status),  mpi_errno, "starray");

Modified: mpich2/trunk/src/mpi/coll/alltoallw.c
===================================================================
--- mpich2/trunk/src/mpi/coll/alltoallw.c	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/mpi/coll/alltoallw.c	2010-05-21 03:34:31 UTC (rev 6694)
@@ -113,7 +113,7 @@
         }
     }
     else {
-        bblock = MPIR_ALLTOALL_THROTTLE;
+        bblock = MPIR_PARAM_ALLTOALL_THROTTLE;
         if (bblock == 0) bblock = comm_size;
 
         MPIU_CHKLMEM_MALLOC(starray,  MPI_Status*,  2*bblock*sizeof(MPI_Status),  mpi_errno, "starray");

Modified: mpich2/trunk/src/mpid/ch3/src/mpid_vc.c
===================================================================
--- mpich2/trunk/src/mpid/ch3/src/mpid_vc.c	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/mpid/ch3/src/mpid_vc.c	2010-05-21 03:34:31 UTC (rev 6694)
@@ -1101,9 +1101,7 @@
 #ifdef ENABLED_NO_LOCAL
     no_local = 1;
 #else
-    ret = MPL_env2bool("MPICH_NO_LOCAL", &val);
-    if (ret == 1 && val)
-        no_local = 1;
+    no_local = MPIR_PARAM_NOLOCAL;
 #endif
 
     /* Used for debugging on a single machine: Odd procs on a node are

Modified: mpich2/trunk/src/util/param/params.yml
===================================================================
--- mpich2/trunk/src/util/param/params.yml	2010-05-21 03:34:27 UTC (rev 6693)
+++ mpich2/trunk/src/util/param/params.yml	2010-05-21 03:34:31 UTC (rev 6694)
@@ -12,6 +12,10 @@
 categories:
     - name        : collective
       description : parameters that control collective communication behavior
+    - name        : intranode
+      description : intranode communication parameters
+    - name        : developer
+      description : useful for developers working on MPICH2 itself
 
 parameters:
     ##############################################################