Changeset 1642 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_scatterv.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_scatterv.cpp (modified) (5 diffs)

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

@@ -76 +76 @@
     std::vector<int>ranks(ep_size);
 
-    if(mpi_rank == root_mpi_rank) MPI_Gather_local(&ep_rank, 1, MPI_INT, local_ranks.data(), root_ep_loc, comm);
-    else                          MPI_Gather_local(&ep_rank, 1, MPI_INT, local_ranks.data(), 0, comm);
+    if(mpi_rank == root_mpi_rank) MPI_Gather_local(&ep_rank, 1, EP_INT, local_ranks.data(), root_ep_loc, comm);
+    else                          MPI_Gather_local(&ep_rank, 1, EP_INT, local_ranks.data(), 0, comm);
 
 
@@ -94 +94 @@
         my_displs[i] = my_displs[i-1] + recvcounts[i-1];
 
-      ::MPI_Gatherv(local_ranks.data(), num_ep, to_mpi_type(MPI_INT), ranks.data(), recvcounts.data(), my_displs.data(), to_mpi_type(MPI_INT), root_mpi_rank, to_mpi_comm(comm->mpi_comm));
+      ::MPI_Gatherv(local_ranks.data(), num_ep, to_mpi_type(EP_INT), ranks.data(), recvcounts.data(), my_displs.data(), to_mpi_type(EP_INT), root_mpi_rank, to_mpi_comm(comm->mpi_comm));
     }
 
@@ -112 +112 @@
     void* local_sendbuf;
     int local_sendcount;
-    if(mpi_rank == root_mpi_rank) MPI_Reduce_local(&recvcount, &local_sendcount, 1, MPI_INT, MPI_SUM, root_ep_loc, comm);
-    else                          MPI_Reduce_local(&recvcount, &local_sendcount, 1, MPI_INT, MPI_SUM, 0, comm);
+    if(mpi_rank == root_mpi_rank) MPI_Reduce_local(&recvcount, &local_sendcount, 1, EP_INT, EP_SUM, root_ep_loc, comm);
+    else                          MPI_Reduce_local(&recvcount, &local_sendcount, 1, EP_INT, EP_SUM, 0, comm);
 
     if(is_master) 
@@ -119 +119 @@
       local_sendbuf = new void*[datasize * local_sendcount];
  
-      ::MPI_Gather(&local_sendcount, 1, to_mpi_type(MPI_INT), recvcounts.data(), 1, to_mpi_type(MPI_INT), root_mpi_rank, to_mpi_comm(comm->mpi_comm));
+      ::MPI_Gather(&local_sendcount, 1, to_mpi_type(EP_INT), recvcounts.data(), 1, to_mpi_type(EP_INT), root_mpi_rank, to_mpi_comm(comm->mpi_comm));
 
       if(is_root) for(int i=1; i<mpi_size; i++) my_displs[i] = my_displs[i-1] + recvcounts[i-1];
@@ -129 +129 @@
     std::vector<int>local_displs(num_ep, 0);
 
-    MPI_Gather_local(&recvcount, 1, MPI_INT, local_sendcounts.data(), 0, comm);
-    MPI_Bcast_local(local_sendcounts.data(), num_ep, MPI_INT, 0, comm);
+    MPI_Gather_local(&recvcount, 1, EP_INT, local_sendcounts.data(), 0, comm);
+    MPI_Bcast_local(local_sendcounts.data(), num_ep, EP_INT, 0, comm);
     for(int i=1; i<num_ep; i++)
       local_displs[i] = local_displs[i-1] + local_sendcounts[i-1];