Changeset 1503 for XIOS/dev/branch_openmp/extern/ep_dev/ep_gatherv.cpp

Timestamp:

05/28/18 17:28:07 (6 years ago)

Author:

yushan

Message:

rank_map is passed from vector to map, in order to have more flexibility in comm_split

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_gatherv.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_gatherv.cpp

@@ -63 +63 @@
     int mpi_size = comm->ep_comm_ptr->size_rank_info[2].second;
 
-    int root_mpi_rank = comm->rank_map->at(root).second;
-    int root_ep_loc = comm->rank_map->at(root).first;
+    int root_mpi_rank = comm->ep_rank_map->at(root).second;
+    int root_ep_loc = comm->ep_rank_map->at(root).first;
 
     ::MPI_Aint datasize, lb;
@@ -126 +126 @@
       for(int i=0; i<ep_size; i++)
       {
-        mpi_recvcounts[comm->rank_map->at(i).second]+=recvcounts[i];
+        mpi_recvcounts[comm->ep_rank_map->at(i).second]+=recvcounts[i];
       }
 
@@ -144 +144 @@
       {
         int extra = 0;
-        for(int j=0, k=0; j<ep_size, k<comm->rank_map->at(i).first; j++)
-          if(comm->rank_map->at(i).second == comm->rank_map->at(j).second)
+        for(int j=0, k=0; j<ep_size, k<comm->ep_rank_map->at(i).first; j++)
+          if(comm->ep_rank_map->at(i).second == comm->ep_rank_map->at(j).second)
           {
             extra += recvcounts[j];
@@ -151 +151 @@
           }  
 
-        offset = mpi_displs[comm->rank_map->at(i).second] +  extra;
+        offset = mpi_displs[comm->ep_rank_map->at(i).second] +  extra;
 
         memcpy(recvbuf+displs[i]*datasize, tmp_recvbuf+offset*datasize, recvcounts[i]*datasize);