Changeset 1500 for XIOS/dev/branch_openmp/extern/ep_dev/ep_lib.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_lib.cpp (modified) (6 diffs)

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

@@ -14 +14 @@
 namespace ep_lib
 { 
-  bool MPI_Comm::is_null()
+  bool ep_comm::is_null()
   {
     if(!this->is_intercomm)
-      return this->mpi_comm == MPI_COMM_NULL.mpi_comm;
+      return this->mpi_comm == MPI_COMM_NULL->mpi_comm;
     else
-      return this->ep_comm_ptr->intercomm->mpi_inter_comm == MPI_COMM_NULL.mpi_comm;
+      return this->ep_comm_ptr->intercomm->mpi_inter_comm == MPI_COMM_NULL->mpi_comm;
   }
 
@@ -33 +33 @@
   int get_ep_rank(MPI_Comm comm, int ep_rank_loc, int mpi_rank)
   {
-    for(int i=0; i<comm.rank_map->size(); i++)
-    {
-      if(   ( comm.rank_map->at(i).first  == ep_rank_loc )
-         && ( comm.rank_map->at(i).second == mpi_rank ) )
+    for(int i=0; i<comm->rank_map->size(); i++)
+    {
+      if(   ( comm->rank_map->at(i).first  == ep_rank_loc )
+         && ( comm->rank_map->at(i).second == mpi_rank ) )
       {
         return i;
@@ -48 +48 @@
     // intercomm
     int inter_rank;
-    for(int i=0; i<comm.ep_comm_ptr->intercomm->intercomm_rank_map->size(); i++)
-    {
-      if(   ( comm.ep_comm_ptr->intercomm->intercomm_rank_map->at(i).first  == ep_rank_loc )
-         && ( comm.ep_comm_ptr->intercomm->intercomm_rank_map->at(i).second == mpi_rank ) )
+    for(int i=0; i<comm->ep_comm_ptr->intercomm->intercomm_rank_map->size(); i++)
+    {
+      if(   ( comm->ep_comm_ptr->intercomm->intercomm_rank_map->at(i).first  == ep_rank_loc )
+         && ( comm->ep_comm_ptr->intercomm->intercomm_rank_map->at(i).second == mpi_rank ) )
       {
         inter_rank =  i;
@@ -58 +58 @@
     }
 
-    for(int i=0; i<comm.ep_comm_ptr->intercomm->remote_rank_map->size(); i++)
-    {
-      if(  comm.ep_comm_ptr->intercomm->remote_rank_map->at(i).first  == inter_rank  )
+    for(int i=0; i<comm->ep_comm_ptr->intercomm->remote_rank_map->size(); i++)
+    {
+      if(  comm->ep_comm_ptr->intercomm->remote_rank_map->at(i).first  == inter_rank  )
       {
         //printf("get_ep_rank for intercomm, ep_rank_loc = %d, mpi_rank = %d => ep_src = %d\n", ep_rank_loc, mpi_rank, i);
@@ -258 +258 @@
 }
 
+MPI_Message* to_mpi_message_ptr(ep_lib::MPI_Message message)
+{
+  return static_cast< MPI_Message* >(message->mpi_message);
+}
+
 MPI_Info to_mpi_info(ep_lib::MPI_Info info)
 {
-  return *(static_cast< MPI_Info* >(info.mpi_info));
+  return *(static_cast< MPI_Info* >(info->mpi_info));
 }
 
@@ -273 +278 @@
 }
 
-
-
+MPI_Status* to_mpi_status_ptr(ep_lib::MPI_Status status)
+{
+  return static_cast< MPI_Status* >(status.mpi_status);
+}
+
+MPI_Request* to_mpi_request_ptr(ep_lib::MPI_Request request)
+{
+  return static_cast< MPI_Request* >(request->mpi_request);
+}
+
+
+