Changeset 1053 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_reduce.cpp

Timestamp:

02/17/17 17:55:37 (8 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

File:

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

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

@@ -447 +447 @@
     if(!comm.is_ep && comm.mpi_comm)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Reduce(sendbuf, recvbuf, count, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op), root,
                    static_cast< ::MPI_Comm>(comm.mpi_comm));
@@ -473 +470 @@
 
     ::MPI_Aint recvsize, lb;
-    #ifdef _serialized
-    #pragma omp critical (_mpi_call)
-    #endif // _serialized
+
     ::MPI_Type_get_extent(static_cast< ::MPI_Datatype>(datatype), &lb, &recvsize);
 
@@ -489 +484 @@
     if(ep_rank_loc==0)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Reduce(local_recvbuf, recvbuf, count, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op), root_mpi_rank, static_cast< ::MPI_Comm>(comm.mpi_comm));
     }
@@ -522 +514 @@
     if(!comm.is_ep && comm.mpi_comm)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Allreduce(sendbuf, recvbuf, count, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op),
                       static_cast< ::MPI_Comm>(comm.mpi_comm));
@@ -545 +534 @@
 
     ::MPI_Aint recvsize, lb;
-    #ifdef _serialized
-    #pragma omp critical (_mpi_call)
-    #endif // _serialized
+
     ::MPI_Type_get_extent(static_cast< ::MPI_Datatype>(datatype), &lb, &recvsize);
 
@@ -561 +548 @@
     if(ep_rank_loc==0)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Allreduce(local_recvbuf, recvbuf, count, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op), static_cast< ::MPI_Comm>(comm.mpi_comm));
     }
@@ -590 +574 @@
     if(!comm.is_ep && comm.mpi_comm)
     {
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
       ::MPI_Reduce_scatter(sendbuf, recvbuf, recvcounts, static_cast< ::MPI_Datatype>(datatype), static_cast< ::MPI_Op>(op),
                            static_cast< ::MPI_Comm>(comm.mpi_comm));
@@ -616 +597 @@
 
     ::MPI_Aint datasize, lb;
-    #ifdef _serialized
-    #pragma omp critical (_mpi_call)
-    #endif // _serialized
+
     ::MPI_Type_get_extent(static_cast< ::MPI_Datatype>(datatype), &lb, &datasize);
 
@@ -636 +615 @@
         local_recvcnt[i] = accumulate(recvcounts+ep_rank, recvcounts+ep_rank+num_ep, 0);
       }
-      #ifdef _serialized
-      #pragma omp critical (_mpi_call)
-      #endif // _serialized
+
       ::MPI_Reduce_scatter(local_buf, local_buf2, local_recvcnt, static_cast< ::MPI_Datatype>(datatype),
                          static_cast< ::MPI_Op>(op), static_cast< ::MPI_Comm>(comm.mpi_comm));