Changeset 1147 for XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_gather.cpp

Timestamp:

05/29/17 16:15:38 (7 years ago)

Author:

yushan

Message:

bug fixed in MPI_Gather(v)

File:

• XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_gather.cpp (modified) (4 diffs)

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

@@ -352 +352 @@
 
     void *local_gather_recvbuf;
+    void *master_recvbuf;
+    if(ep_rank_loc == 0 && mpi_rank == root_mpi_rank && root_ep_loc != 0) master_recvbuf = new void*[sizeof(recvbuf)];
 
     if(ep_rank_loc==0)
@@ -381 +383 @@
       }
 
-
-      ::MPI_Gatherv(local_gather_recvbuf, count*num_ep, static_cast< ::MPI_Datatype>(datatype), recvbuf, gatherv_recvcnt,
+      if(root_ep_loc != 0) // gather to root_master
+      {
+        ::MPI_Gatherv(local_gather_recvbuf, count*num_ep, static_cast< ::MPI_Datatype>(datatype), master_recvbuf, gatherv_recvcnt,
                     gatherv_displs, static_cast< ::MPI_Datatype>(datatype), root_mpi_rank, static_cast< ::MPI_Comm>(comm.mpi_comm));
+      }
+      else
+      {
+        ::MPI_Gatherv(local_gather_recvbuf, count*num_ep, static_cast< ::MPI_Datatype>(datatype), recvbuf, gatherv_recvcnt,
+                    gatherv_displs, static_cast< ::MPI_Datatype>(datatype), root_mpi_rank, static_cast< ::MPI_Comm>(comm.mpi_comm));
+      }
 
       delete[] gatherv_recvcnt;
@@ -392 +401 @@
     if(root_ep_loc != 0 && mpi_rank == root_mpi_rank) // root is not master, master send to root and root receive from master
     {
-      innode_memcpy(0, recvbuf, root_ep_loc, recvbuf, count*ep_size, datatype, comm);
+      innode_memcpy(0, master_recvbuf, root_ep_loc, recvbuf, count*ep_size, datatype, comm);
+      if(ep_rank_loc == 0 ) delete[] master_recvbuf;
     }
 
@@ -399 +409 @@
     if(ep_rank_loc==0)
     {
+
       if(datatype == MPI_INT)
       {