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

Timestamp:

06/08/17 17:31:50 (7 years ago)

Author:

yushan

Message:

Bug fixed in MPI_(All)Gatherv with displs

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

@@ -355 +355 @@
     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 && mpi_rank == root_mpi_rank && root_ep_loc != 0) 
+    {
+      master_recvbuf = new void*[datasize*ep_size*count];
+    }
 
     if(ep_rank_loc==0)
@@ -404 +407 @@
     {
       innode_memcpy(0, master_recvbuf, root_ep_loc, recvbuf, count*ep_size, datatype, comm);
-      if(ep_rank_loc == 0 ) delete[] master_recvbuf;
     }
 
@@ -411 +413 @@
     if(ep_rank_loc==0)
     {
-
       if(datatype == MPI_INT)
       {
@@ -436 +437 @@
         delete[] static_cast<unsigned long*>(local_gather_recvbuf);
       }
-    }
-
-
+      
+      if(root_ep_loc != 0 && mpi_rank == root_mpi_rank) delete[] master_recvbuf;
+    }
   }