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

Timestamp:

05/28/18 09:54:32 (6 years ago)

Author:

yushan

Message:

save dev

File:

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

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

@@ -23 +23 @@
     ::MPI_Type_get_extent(to_mpi_type(datatype), &lb, &datasize);
 
-    int ep_rank_loc = comm.ep_comm_ptr->size_rank_info[1].first;
-    int num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
+    int ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    int num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
 
 
     #pragma omp critical (_gatherv)
-    comm.my_buffer->void_buffer[ep_rank_loc] = const_cast< void* >(sendbuf);
+    comm->my_buffer->void_buffer[ep_rank_loc] = const_cast< void* >(sendbuf);
 
     MPI_Barrier_local(comm);
@@ -35 +35 @@
     {
       for(int i=0; i<num_ep; i++)
-        memcpy(recvbuf + datasize*displs[i], comm.my_buffer->void_buffer[i], datasize*recvcounts[i]);
+        memcpy(recvbuf + datasize*displs[i], comm->my_buffer->void_buffer[i], datasize*recvcounts[i]);
 
     }
@@ -46 +46 @@
   {
   
-    if(!comm.is_ep)
+    if(!comm->is_ep)
     {
       return ::MPI_Gatherv(const_cast<void*>(sendbuf), sendcount, to_mpi_type(sendtype), recvbuf, const_cast<int*>(input_recvcounts), const_cast<int*>(input_displs),
-                    to_mpi_type(recvtype), root, to_mpi_comm(comm.mpi_comm));
+                    to_mpi_type(recvtype), root, to_mpi_comm(comm->mpi_comm));
     }
 
@@ -56 +56 @@
 
     
-    int ep_rank = comm.ep_comm_ptr->size_rank_info[0].first;
-    int ep_rank_loc = comm.ep_comm_ptr->size_rank_info[1].first;
-    int mpi_rank = comm.ep_comm_ptr->size_rank_info[2].first;
-    int ep_size = comm.ep_comm_ptr->size_rank_info[0].second;
-    int num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
-    int mpi_size = comm.ep_comm_ptr->size_rank_info[2].second;
+    int ep_rank = comm->ep_comm_ptr->size_rank_info[0].first;
+    int ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    int mpi_rank = comm->ep_comm_ptr->size_rank_info[2].first;
+    int ep_size = comm->ep_comm_ptr->size_rank_info[0].second;
+    int num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
+    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->rank_map->at(root).second;
+    int root_ep_loc = comm->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->rank_map->at(i).second]+=recvcounts[i];
       }
 
@@ -133 +133 @@
 
 
-      ::MPI_Gatherv(local_recvbuf, sendcount*num_ep, to_mpi_type(sendtype), tmp_recvbuf, mpi_recvcounts.data(), mpi_displs.data(), to_mpi_type(recvtype), root_mpi_rank, to_mpi_comm(comm.mpi_comm));
+      ::MPI_Gatherv(local_recvbuf, sendcount*num_ep, to_mpi_type(sendtype), tmp_recvbuf, mpi_recvcounts.data(), mpi_displs.data(), to_mpi_type(recvtype), root_mpi_rank, to_mpi_comm(comm->mpi_comm));
     }   
 
@@ -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->rank_map->at(i).first; j++)
+          if(comm->rank_map->at(i).second == comm->rank_map->at(j).second)
           {
             extra += recvcounts[j];
@@ -151 +151 @@
           }  
 
-        offset = mpi_displs[comm.rank_map->at(i).second] +  extra;
+        offset = mpi_displs[comm->rank_map->at(i).second] +  extra;
 
         memcpy(recvbuf+displs[i]*datasize, tmp_recvbuf+offset*datasize, recvcounts[i]*datasize);