Changeset 1151 for XIOS/dev/branch_yushan_merged/extern

Timestamp:

05/31/17 19:42:49 (7 years ago)

Author:

yushan

Message:

bug fixed in MPI_Gather(v)

Location:

XIOS/dev/branch_yushan_merged/extern/src_ep_dev

Files:

• ep_gather.cpp (modified) (1 diff)
• ep_gatherv.cpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_gather.cpp

@@ -326 +326 @@
 
     if(!comm.mpi_comm) return 0;
+    
+    MPI_Bcast(&recvcount, 1, MPI_INT, root, comm);
 
     assert(static_cast< ::MPI_Datatype>(sendtype) == static_cast< ::MPI_Datatype>(recvtype) && sendcount == recvcount);

XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_gatherv.cpp

@@ -348 +348 @@
     mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
     
+    
+    
     if(ep_size == mpi_size) 
       return ::MPI_Gatherv(sendbuf, sendcount, static_cast< ::MPI_Datatype>(datatype), recvbuf, recvcounts, displs,
                               static_cast< ::MPI_Datatype>(datatype), root, static_cast< ::MPI_Comm>(comm.mpi_comm));
+
+    if(ep_rank != root)
+    {
+      recvcounts = new int[ep_size];
+      displs = new int[ep_size];
+    }
+    
+    MPI_Bcast(const_cast< int* >(displs),     ep_size, MPI_INT, root, comm);
+    MPI_Bcast(const_cast< int* >(recvcounts), ep_size, MPI_INT, root, comm);
+                              
 
     int recv_plus_displs[ep_size];
@@ -365 +377 @@
       assert(recv_plus_displs[ep_rank-ep_rank_loc+num_ep-1] >= displs[ep_rank-ep_rank_loc+num_ep-2]);
     }
-
-    if(ep_rank != root)
-    {
-      recvcounts = new int[ep_size];
-      displs = new int[ep_size];
-    }
-    
-    MPI_Bcast(const_cast< int* >(recvcounts), ep_size, MPI_INT, root, comm);
-    MPI_Bcast(const_cast< int* >(displs), ep_size, MPI_INT, root, comm);