Changeset 1520 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.cpp

Timestamp:

06/04/18 19:25:08 (6 years ago)

Author:

yushan

Message:

save dev. TO DO : test with xios

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.cpp (modified) (8 diffs)

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

@@ -4 +4 @@
 #include <iostream>
 #include <fstream>
+#include "ep_mpi.hpp"
 
 using namespace std;
@@ -14 +15 @@
 namespace ep_lib
 { 
-  bool MPI_Comm::is_null()
-  {
-    if(!this->is_intercomm)
-      return this->mpi_comm == MPI_COMM_NULL.mpi_comm;
-    else
-      return this->ep_comm_ptr->intercomm->mpi_inter_comm == MPI_COMM_NULL.mpi_comm;
-  }
 
   int tag_combine(int real_tag, int src, int dest)
@@ -33 +27 @@
   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 ) )
-      {
-        return i;
-      }
-    }
-    printf("rank not find\n");
+    if(comm->is_intercomm)
+    {
+      for(std::map<int, std::pair< int, std::pair<int, int> > >::iterator it = comm->ep_comm_ptr->intercomm->intercomm_rank_map->begin(); it != comm->ep_comm_ptr->intercomm->intercomm_rank_map->end(); it++)
+      {
+        if(   ( it->second.first  == ep_rank_loc )
+           && ( it->second.second.first == mpi_rank ) )
+        {
+          return it->first;
+        }
+      }
+      printf("rank not find for EP_intercomm\n");
+      int err;
+      return MPI_Abort(comm, err);
+    }
+    
+    for(std::map<int, std::pair<int, int> >::iterator it = comm->ep_rank_map->begin(); it != comm->ep_rank_map->end(); it++)
+    {
+      if(   ( it->second.first  == ep_rank_loc )
+         && ( it->second.second == mpi_rank ) )
+      {
+        return it->first;
+      }
+    }
+    printf("rank not find for EP_intracomm\n");
+    int err;
+    return MPI_Abort(comm, err);
   }
   
-  int get_ep_rank_intercomm(MPI_Comm comm, int ep_rank_loc, int mpi_rank)
-  {
-    // 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 ) )
-      {
-        inter_rank =  i;
-        break;
-      }
-    }
-
-    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);
-        return i;
-      }
-    }
-
-    printf("rank not find\n");
-    
-  }
-
 
   int MPI_Get_count(const MPI_Status *status, MPI_Datatype datatype, int *count)
   {
-
-    ::MPI_Status *mpi_status = static_cast< ::MPI_Status* >(status->mpi_status);
-    ::MPI_Datatype *mpi_datatype = static_cast< ::MPI_Datatype*>(datatype);
-
-    ::MPI_Get_count(mpi_status, *mpi_datatype, count);
+    return ::MPI_Get_count(to_mpi_status_ptr(*status), to_mpi_type(datatype), count);
   }
 
@@ -89 +69 @@
   void check_sum_send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm, int type)
   {
+
     int src_rank;
     int int_count;
@@ -121 +102 @@
   void check_sum_recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, int type)
   {
+
     int dest_rank;
     int int_count;
@@ -147 +129 @@
     }
     else printf("Unable to open file\n");
+
 
   }
@@ -251 +234 @@
 {
   return *(static_cast< MPI_Comm* >(comm));
+} 
+
+MPI_Comm* to_mpi_comm_ptr(void* comm)
+{
+  return static_cast< MPI_Comm* >(comm);
 }  
 
@@ -258 +246 @@
 }
 
-MPI_Info to_mpi_info(void* info)
-{
-  return *(static_cast< MPI_Info* >(info));
-}
-
-
-
-
-
+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));
+}
+
+MPI_Win to_mpi_win(void* win)
+{
+  return *(static_cast< MPI_Win* >(win));
+}
+
+MPI_Aint to_mpi_aint(ep_lib::MPI_Aint aint)
+{
+  return *(static_cast< MPI_Aint* >(aint.mpi_aint));
+}
+
+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);
+}
+
+
+