Changeset 1354 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_dup.cpp

Timestamp:

12/04/17 17:12:00 (6 years ago)

Author:

yushan

Message:

omp dev : unify MPI_Comm type

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_dup.cpp (modified) (6 diffs)

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

@@ -2 +2 @@
 #include <mpi.h>
 #include "ep_declaration.hpp"
+#include "ep_mpi.hpp"
 
 namespace ep_lib
@@ -14 +15 @@
       newcomm->is_ep = comm.is_ep;
 
-      ::MPI_Comm input = static_cast< ::MPI_Comm>(comm.mpi_comm);
-      ::MPI_Comm output;
+      ::MPI_Comm input = to_mpi_comm(comm.mpi_comm);
+      ::MPI_Comm *output = new ::MPI_Comm;
 
       
-      ::MPI_Comm_dup(input, &output);
+      ::MPI_Comm_dup(input, output);
 
       newcomm->mpi_comm = output;
@@ -28 +29 @@
 
     // for intracomm
-    if(comm.mpi_comm == static_cast< ::MPI_Comm >(MPI_COMM_NULL.mpi_comm)) return 0;
+    if(comm.mpi_comm == static_cast< ::MPI_Comm* >(MPI_COMM_NULL.mpi_comm)) return 0;
 
 
@@ -39 +40 @@
       MPI_Info info;
       MPI_Comm *out_comm;
-      ::MPI_Comm mpi_dup;
+      ::MPI_Comm *mpi_dup = new ::MPI_Comm;
 
-      ::MPI_Comm in_comm = static_cast< ::MPI_Comm>(comm.mpi_comm);
+      ::MPI_Comm in_comm = to_mpi_comm(comm.mpi_comm);
 
-      ::MPI_Comm_dup(in_comm, &mpi_dup);
+      ::MPI_Comm_dup(in_comm, mpi_dup);
 
       MPI_Comm_create_endpoints(mpi_dup, num_ep, info, out_comm);
@@ -59 +60 @@
   {
     
-    if(comm.mpi_comm == static_cast< ::MPI_Comm >(MPI_COMM_NULL.mpi_comm)) return 0;
+    if(comm.mpi_comm == static_cast< ::MPI_Comm* >(MPI_COMM_NULL.mpi_comm)) return 0;
 
     int my_rank = comm.ep_comm_ptr->size_rank_info[1].first;
@@ -69 +70 @@
       MPI_Info info;
       MPI_Comm *out_comm;
-      ::MPI_Comm mpi_dup;
+      ::MPI_Comm *mpi_dup = new ::MPI_Comm;
 
-      ::MPI_Comm in_comm = static_cast< ::MPI_Comm>(comm.mpi_comm);
+      ::MPI_Comm in_comm = to_mpi_comm(comm.mpi_comm);
 
-      ::MPI_Comm_dup(in_comm, &mpi_dup);
+      ::MPI_Comm_dup(in_comm, mpi_dup);
 
       MPI_Comm_create_endpoints(mpi_dup, num_ep, info, out_comm);
 
-      ::MPI_Comm mpi_inter;
+      ::MPI_Comm *mpi_inter = new ::MPI_Comm;
 
-      ::MPI_Comm_dup(static_cast< ::MPI_Comm>(comm.ep_comm_ptr->intercomm->mpi_inter_comm), &mpi_inter);
+      ::MPI_Comm_dup(to_mpi_comm(comm.ep_comm_ptr->intercomm->mpi_inter_comm), mpi_inter);
       
       for(int i=0; i<num_ep; i++)