Changeset 1067 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_fortran.cpp

Timestamp:

03/08/17 16:55:00 (7 years ago)

Author:

yushan

Message:

server mode OK tested with test_complete

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_fortran.cpp (modified) (9 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_fortran.cpp

@@ -1 @@
-//#include "ep_lib.hpp"
+#include "ep_lib.hpp"
 #include "ep_lib_fortran.hpp"
 #include <mpi.h>
 #include <map>
 #include <utility>
+#include "ep_declaration.hpp"
 
 #ifdef _intelmpi
@@ -26 +27 @@
     fint = ::MPI_Comm_c2f(static_cast< ::MPI_Comm>(comm.mpi_comm));
     #endif
-    std::map<std::pair<int, int>, MPI_Comm  > ::iterator it;
+    std::map<std::pair<int, int>, MPI_Comm > ::iterator it;
     
     it = fc_comm_map.find(std::make_pair(fint, omp_get_thread_num()));
@@ -32 +33 @@
     {
       fc_comm_map.insert(std::make_pair( std::make_pair( fint, omp_get_thread_num()) , comm));
-      //printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
+      printf("EP_Comm_c2f : MAP insert: %d, %d, %p\n", fint, omp_get_thread_num(), &comm);
     }
     
@@ -45 +46 @@
     
     
-    std::map<std::pair<int, int>, MPI_Comm  > ::iterator it;
+    std::map<std::pair<int, int>, MPI_Comm > ::iterator it;
     
     it = fc_comm_map.find(std::make_pair(comm, omp_get_thread_num()));
@@ -51 +52 @@
     {
       MPI_Comm comm_ptr;
-      comm_ptr =  it->second;
-      //printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
+      comm_ptr = it->second;
+      printf("EP_Comm_f2c : MAP find: %d, %d, %p\n", it->first.first, it->first.second, it->second);
       return  comm_ptr;
     }
@@ -58 +59 @@
     {      
       MPI_Comm return_comm;
-      return_comm.mpi_comm = ::MPI_Comm_f2c(comm);
+      if(omp_get_thread_num() == 0)
+      {
+        ::MPI_Comm base_comm = ::MPI_Comm_f2c(comm);
+        if(base_comm != MPI_COMM_NULL_STD)
+        {
+          int num_ep = omp_get_num_threads();
+          MPI_Comm *new_comm;
+          MPI_Info info;
+          MPI_Comm_create_endpoints(base_comm, num_ep, info, new_comm);
+          return_comm = new_comm[omp_get_thread_num()];
+        }
+        return MPI_COMM_NULL;
+      }
+      
+      
       return return_comm;
     }
@@ -122 +137 @@
     fint = ::MPI_Comm_c2f(static_cast< ::MPI_Comm>(comm.mpi_comm));
     
-    std::map<std::pair<int, int>, MPI_Comm  > ::iterator it;
+    std::map<std::pair<int, int>, MPI_Comm > ::iterator it;
     
     it = fc_comm_map.find(std::make_pair(fint, omp_get_thread_num()));
@@ -140 +155 @@
     
     
-    std::map<std::pair<int, int>, MPI_Comm  > ::iterator it;
+    std::map<std::pair<int, int>, MPI_Comm > ::iterator it;
     
     it = fc_comm_map.find(std::make_pair(comm, omp_get_thread_num()));
@@ -147 +162 @@
       MPI_Comm comm_ptr;
       comm_ptr =  it->second;
-      printf("MAP find: %d, %d, %p\n", it->first.first, it->first.second, &comm_ptr);
+      printf("MAP find: %d, %d, %p\n", it->first.first, it->first.second, comm_ptr);
       return  comm_ptr;
     }