Changeset 1328 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_send.cpp

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_send.cpp (modified) (1 diff)

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

@@ -19 +19 @@
     if(!comm.is_ep)
       return ::MPI_Send(buf, count, to_mpi_type(datatype), dest, tag, to_mpi_comm(comm.mpi_comm));
-
-    MPI_Request request;
-    MPI_Status status;
-    MPI_Isend(buf, count, datatype, dest, tag, comm, &request);
-    MPI_Wait(&request, &status);
-
+    if(comm.is_intercomm)
+    {
+      MPI_Request request;
+      MPI_Status status;
+      MPI_Isend(buf, count, datatype, dest, tag, comm, &request);
+      MPI_Wait(&request, &status);
+    }
+    else
+    {
+      int ep_src_loc  = comm.ep_comm_ptr->size_rank_info[1].first;
+      int ep_dest_loc = comm.ep_comm_ptr->comm_list->rank_map->at(dest).first;
+      int mpi_tag     = tag_combine(tag, ep_src_loc, ep_dest_loc);
+      int mpi_dest    = comm.ep_comm_ptr->comm_list->rank_map->at(dest).second;
+
+      ::MPI_Send(buf, count, to_mpi_type(datatype), mpi_dest, mpi_tag, to_mpi_comm(comm.mpi_comm));
+      //printf("call mpi_send for intracomm, dest = %d, tag = %d\n", dest, tag);
+    }
     //check_sum_send(buf, count, datatype, dest, tag, comm);