Changeset 1746 for XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_probe.cpp

Timestamp:

10/17/19 17:22:04 (5 years ago)

Author:

yushan

Message:

Generic_testcase: remove _openmpi _intelmpi flags. EP library is no longer sensitive to the underlying MPI library. Tested on Irene with generic_testcase

File:

• XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_probe.cpp (modified) (2 diffs)

XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_probe.cpp

@@ -24 +24 @@
     ::MPI_Message mpi_message;
 
-    #ifdef _openmpi
-    #pragma omp critical (_mpi_call)
+    //#ifdef _openmpi
+    ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
+    /*#pragma omp critical (_mpi_call)
     {
       ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_status);
@@ -32 +33 @@
         ::MPI_Mprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), &mpi_message, &mpi_status);
       }
-    }
-    #elif _intelmpi
-    ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
-    #endif
+    }*/
+    //#elif _intelmpi
+    //::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
+    //#endif
       
     status->mpi_status = new ::MPI_Status(mpi_status);