Changeset 1354 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_gatherv.cpp

Timestamp:

12/04/17 17:12:00 (7 years ago)

Author:

yushan

Message:

omp dev : unify MPI_Comm type

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_gatherv.cpp (modified) (3 diffs)

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

@@ -26 +26 @@
     int num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
 
-    //if(ep_rank_loc == local_root) printf("local_gatherv : recvcounts = %d %d\n\n", recvcounts[0], recvcounts[1]);
-    //if(ep_rank_loc == local_root) printf("local_gatherv : displs = %d %d\n\n", displs[0], displs[1]);
 
     #pragma omp critical (_gatherv)
@@ -50 +48 @@
     if(!comm.is_ep)
     {
-      ::MPI_Gatherv(const_cast<void*>(sendbuf), sendcount, static_cast< ::MPI_Datatype>(sendtype), recvbuf, const_cast<int*>(input_recvcounts), const_cast<int*>(input_displs),
-                    static_cast< ::MPI_Datatype>(recvtype), root, static_cast< ::MPI_Comm>(comm.mpi_comm));
-      return 0;
+      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));
     }
 
@@ -114 +111 @@
     else                          MPI_Gatherv_local(sendbuf, sendcount, sendtype, local_recvbuf, local_recvcounts.data(), local_displs.data(), 0, comm);
 
-    //if(is_master) printf("local_recvbuf = %d %d %d %d\n", static_cast<int*>(local_recvbuf)[0], static_cast<int*>(local_recvbuf)[1], static_cast<int*>(local_recvbuf)[2], static_cast<int*>(local_recvbuf)[3]);
 
     void* tmp_recvbuf;