Changeset 1368 for XIOS

Timestamp:

12/08/17 11:48:59 (6 years ago)

Author:

yushan

Message:

unify type : MPI_Op

Location:

XIOS/dev/branch_openmp/extern/src_ep_dev

Files:

• ep_declaration.cpp (modified) (1 diff)
• ep_intercomm_kernel.cpp (modified) (1 diff)
• ep_lib.cpp (modified) (1 diff)
• ep_lib.hpp (modified) (1 diff)
• ep_lib_collective.hpp (modified) (1 diff)
• ep_lib_intercomm.hpp (modified) (1 diff)
• ep_lib_local.hpp (modified) (1 diff)

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

@@ -95 +95 @@
 ep_lib::MPI_Datatype MPI_UNSIGNED_CHAR = &MPI_UNSIGNED_CHAR_STD;
 
-ep_lib::MPI_Op MPI_SUM = MPI_SUM_STD;
-ep_lib::MPI_Op MPI_MAX = MPI_MAX_STD;
-ep_lib::MPI_Op MPI_MIN = MPI_MIN_STD;
+ep_lib::MPI_Op MPI_SUM = &MPI_SUM_STD;
+ep_lib::MPI_Op MPI_MAX = &MPI_MAX_STD;
+ep_lib::MPI_Op MPI_MIN = &MPI_MIN_STD;
 
 ep_lib::MPI_Comm MPI_COMM_WORLD(&MPI_COMM_WORLD_STD);

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

@@ -524 +524 @@
     }
 
-    MPI_Allreduce(&new_bcast_root_0, &new_bcast_root, 1, MPI_INT, static_cast< ::MPI_Op>(MPI_SUM), *newintercomm);
+    MPI_Allreduce(&new_bcast_root_0, &new_bcast_root, 1, MPI_INT, MPI_SUM, *newintercomm);
 
 

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

@@ -243 +243 @@
 MPI_Op to_mpi_op(ep_lib::MPI_Op op)
 {
-  return static_cast< MPI_Op >(op);
+  return *static_cast< MPI_Op* >(op);
 }
 

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

@@ -11 +11 @@
 namespace ep_lib
 {
-//#ifdef _intelmpi
   typedef void* 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
+  typedef void* MPI_Op;
 
   int MPI_Init_thread(int* argc, char*** argv, int required, int*provided);

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

@@ -4 +4 @@
 namespace ep_lib
 {
-  #ifdef _intelmpi
-  typedef void* MPI_Datatype;
-  typedef int MPI_Op;
-  #elif _openmpi
+
   typedef void* MPI_Datatype;
   typedef void* MPI_Op;
-  #endif
+
 
   int MPI_Barrier(MPI_Comm comm);

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

@@ -4 +4 @@
 namespace ep_lib
 {
-  #ifdef _intelmpi
-  typedef void* MPI_Datatype;
-  typedef int MPI_Op;
-  #elif _openmpi
+
   typedef void* MPI_Datatype;
   typedef void* MPI_Op;
-  #endif
+
   
   int MPI_Comm_dup_intercomm(MPI_Comm comm, MPI_Comm *newcomm);

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

@@ -4 +4 @@
 namespace ep_lib
 {
-  #ifdef _intelmpi
-  typedef void* MPI_Datatype;
-  typedef int MPI_Op;
-  #elif _openmpi
+
   typedef void* MPI_Datatype;
   typedef void* MPI_Op;
-  #endif
+
 
   int MPI_Reduce_local       (const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int local_root, MPI_Comm comm);