Changeset 1355 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.hpp

Timestamp:

12/05/17 16:24:42 (7 years ago)

Author:

yushan

Message:

unify MPI_Comm type

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_lib.hpp (modified) (2 diffs)

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

@@ -11 +11 @@
 namespace ep_lib
 {
-#ifdef _intelmpi
+//#ifdef _intelmpi
   typedef int MPI_Datatype;
   typedef int MPI_Op;
-  #define EP_ANY_SOURCE -2 
-  #define EP_ANY_TAG -1 
-#elif _openmpi
-  typedef void* MPI_Datatype;
-  typedef void* MPI_Op;
-  #define EP_ANY_SOURCE -1 
-  #define EP_ANY_TAG -1 
-#endif
+//  #define EP_ANY_SOURCE -2 
+//  #define EP_ANY_TAG -1 
+//#elif _openmpi
+//  typedef void* MPI_Datatype;
+//  typedef void* MPI_Op;
+//  #define EP_ANY_SOURCE -1 
+//  #define EP_ANY_TAG -1 
+//#endif
 
   int MPI_Init_thread(int* argc, char*** argv, int required, int*provided);
@@ -49 +49 @@
   // #endif
   
-  int MPI_Comm_create_endpoints(void* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls); // from EP to create endpoints
+  int MPI_Comm_create_endpoints(int* base_comm_ptr, int num_ep, MPI_Info info, MPI_Comm *& out_comm_hdls); // from EP to create endpoints
 
   int MPI_Send(void *buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm);