[mpich2-commits] r7777 - in mpich2/trunk/src: include mpi/coll

[goodell at mcs.anl.gov]

Author: goodell
Date: 2011-01-20 16:08:36 -0600 (Thu, 20 Jan 2011)
New Revision: 7777

Modified:
   mpich2/trunk/src/include/mpi.h.in
   mpich2/trunk/src/include/mpiimpl.h
   mpich2/trunk/src/mpi/coll/ibcast.c
Log:
fix missing root parameter in MPIX_Ibcast

Reviewed by balaji at .

Modified: mpich2/trunk/src/include/mpi.h.in
===================================================================
--- mpich2/trunk/src/include/mpi.h.in	2011-01-20 22:08:33 UTC (rev 7776)
+++ mpich2/trunk/src/include/mpi.h.in	2011-01-20 22:08:36 UTC (rev 7777)
@@ -1242,7 +1242,7 @@
 
 /* MPI-3 nonblocking collectives */
 int MPIX_Ibarrier(MPI_Comm comm, MPI_Request *request);
-int MPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, MPI_Comm comm, MPI_Request *request);
+int MPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request);
 int MPIX_Igather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);
 int MPIX_Igatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);
 int MPIX_Iscatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);
@@ -1261,7 +1261,7 @@
 
 #if !defined(MPI_BUILD_PROFILING)
 int PMPIX_Ibarrier(MPI_Comm comm, MPI_Request *request);
-int PMPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, MPI_Comm comm, MPI_Request *request);
+int PMPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request);
 int PMPIX_Igather(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);
 int PMPIX_Igatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);
 int PMPIX_Iscatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request);

Modified: mpich2/trunk/src/include/mpiimpl.h
===================================================================
--- mpich2/trunk/src/include/mpiimpl.h	2011-01-20 22:08:33 UTC (rev 7776)
+++ mpich2/trunk/src/include/mpiimpl.h	2011-01-20 22:08:36 UTC (rev 7777)
@@ -3486,7 +3486,7 @@
 
 /* begin impl functions for NBC */
 int MPIR_Ibarrier_impl(MPID_Comm *comm_ptr, MPI_Request *request);
-int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, MPID_Comm *comm_ptr, MPI_Request *request);
+int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPI_Request *request);
 int MPIR_Igather_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request);
 int MPIR_Igatherv_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int *recvcounts, int *displs, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request);
 int MPIR_Iscatter_impl(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPID_Comm *comm_ptr, MPI_Request *request);

Modified: mpich2/trunk/src/mpi/coll/ibcast.c
===================================================================
--- mpich2/trunk/src/mpi/coll/ibcast.c	2011-01-20 22:08:33 UTC (rev 7776)
+++ mpich2/trunk/src/mpi/coll/ibcast.c	2011-01-20 22:08:36 UTC (rev 7777)
@@ -28,7 +28,7 @@
 #define FUNCNAME MPIR_Ibcast_impl
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
-int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, MPID_Comm *comm_ptr, MPI_Request *request)
+int MPIR_Ibcast_impl(void *buffer, int count, MPI_Datatype datatype, int root, MPID_Comm *comm_ptr, MPI_Request *request)
 {
     int mpi_errno = MPI_SUCCESS;
 
@@ -43,12 +43,12 @@
 #if 0
         if (comm_ptr->comm_kind == MPID_INTRACOMM) {
             /* intracommunicator */
-            mpi_errno = MPIR_Ibcast_intra(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr);
+            mpi_errno = MPIR_Ibcast_intra(buffer, count, datatype, root, comm_ptr, request);
             if (mpi_errno) MPIU_ERR_POP(mpi_errno);
         }
         else {
             /* intercommunicator */
-            mpi_errno = MPIR_Ibcast_inter(sendbuf, recvbuf, recvcount, datatype, op, comm_ptr);
+            mpi_errno = MPIR_Ibcast_inter(buffer, count, datatype, root, comm_ptr, request);
             if (mpi_errno) MPIU_ERR_POP(mpi_errno);
         }
 #endif
@@ -85,7 +85,7 @@
 
 .N Errors
 @*/
-int MPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, MPI_Comm comm, MPI_Request *request)
+int MPIX_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request *request)
 {
     int mpi_errno = MPI_SUCCESS;
     MPID_Comm *comm_ptr = NULL;
@@ -135,7 +135,7 @@
 
     /* ... body of routine ...  */
 
-    mpi_errno = MPIR_Ibcast_impl(buffer, count, datatype, comm_ptr, request);
+    mpi_errno = MPIR_Ibcast_impl(buffer, count, datatype, root, comm_ptr, request);
     if (mpi_errno) MPIU_ERR_POP(mpi_errno);
 
     /* ... end of body of routine ... */