[mpich2-commits] r6747 - in mpich2/trunk/src: include mpid/dcmfd/src/comm/collselect

[thakur at mcs.anl.gov]

Author: thakur
Date: 2010-05-25 15:54:45 -0500 (Tue, 25 May 2010)
New Revision: 6747

Modified:
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/mpid/dcmfd/src/comm/collselect/mpid_coll.c
Log:
move new reduce_scatter_block function pointer to end of table

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2010-05-25 20:28:21 UTC (rev 6746)
+++ mpich2/trunk/src/include/mpiimpl.h	2010-05-25 20:54:45 UTC (rev 6747)
@@ -1730,10 +1730,10 @@
                       MPID_Comm *);
     int (*Reduce_scatter) (void*, void*, int *, MPI_Datatype, MPI_Op, 
                            MPID_Comm *);
+    int (*Scan) (void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm * );
+    int (*Exscan) (void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm * );
     int (*Reduce_scatter_block) (void*, void*, int, MPI_Datatype, MPI_Op, 
                            MPID_Comm *);
-    int (*Scan) (void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm * );
-    int (*Exscan) (void*, void*, int, MPI_Datatype, MPI_Op, MPID_Comm * );
     
 } MPID_Collops;
 

Modified: mpich2/trunk/src/mpid/dcmfd/src/comm/collselect/mpid_coll.c
===================================================================
--- mpich2/trunk/src/mpid/dcmfd/src/comm/collselect/mpid_coll.c	2010-05-25 20:28:21 UTC (rev 6746)
+++ mpich2/trunk/src/mpid/dcmfd/src/comm/collselect/mpid_coll.c	2010-05-25 20:54:45 UTC (rev 6747)
@@ -647,9 +647,9 @@
   comm->coll_fns->Scatter        = MPIDO_Scatter;
   comm->coll_fns->Scatterv       = MPIDO_Scatterv;
   comm->coll_fns->Reduce_scatter = MPIDO_Reduce_scatter;
-  comm->coll_fns->Reduce_scatter_block = MPIDO_Reduce_scatter_block;
   comm->coll_fns->Scan           = MPIDO_Scan;
   comm->coll_fns->Exscan         = MPIDO_Exscan;
+  comm->coll_fns->Reduce_scatter_block = MPIDO_Reduce_scatter_block;
 
   /* set geometric properties of the communicator */
   if (MPIDO_ISPOF2(comm->local_size))
@@ -747,9 +747,9 @@
   comm->coll_fns->Scatter        = NULL;
   comm->coll_fns->Scatterv       = NULL;
   comm->coll_fns->Reduce_scatter = NULL;
-  comm->coll_fns->Reduce_scatter_block = NULL;
   comm->coll_fns->Scan           = NULL;
   comm->coll_fns->Exscan         = NULL;
+  comm->coll_fns->Reduce_scatter_block = NULL;
 
 #endif /* !USE_CCMI_COLL */