Changeset 1347 for XIOS/dev/branch_openmp/extern

Timestamp:

11/27/17 13:46:40 (6 years ago)

Author:

yushan

Message:

dev omp from Ada

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_message.cpp (modified) (3 diffs)

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

@@ -52 +52 @@
       }
       #elif _intelmpi
-      ::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &message, &status); 
+      #pragma omp critical (_mpi_call)
+      {
+        ::MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &status);
+        if(flag)
+        {
+          Debug("find message in mpi comm \n");
+          mpi_source = status.MPI_SOURCE;
+          int tag = status.MPI_TAG;
+          ::MPI_Mprobe(mpi_source, tag, to_mpi_comm(comm.mpi_comm), &message, &status);
+
+        }
+      }
+      //::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &message, &status); 
       #endif
       
@@ -120 +132 @@
       }
       #elif _intelmpi
-      ::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.ep_comm_ptr->intercomm->mpi_inter_comm), &flag, &message, &status);       
+      #pragma omp critical (_mpi_call)
+      {
+        ::MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.ep_comm_ptr->intercomm->mpi_inter_comm), &flag, &status);
+        if(flag)
+        {
+          Debug("find message in mpi comm \n");
+          mpi_source = status.MPI_SOURCE;
+          int tag = status.MPI_TAG;
+          ::MPI_Mprobe(mpi_source, tag, to_mpi_comm(comm.ep_comm_ptr->intercomm->mpi_inter_comm), &message, &status);
+
+        }
+      }
+      //::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.ep_comm_ptr->intercomm->mpi_inter_comm), &flag, &message, &status);       
       #endif
 
@@ -175 +199 @@
       }
       #elif _intelmpi
-      ::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &message, &status);       
+      #pragma omp critical (_mpi_call)
+      {
+        ::MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &status);
+        if(flag)
+        {
+          Debug("find message in mpi comm \n");
+          mpi_source = status.MPI_SOURCE;
+          int tag = status.MPI_TAG;
+          ::MPI_Mprobe(mpi_source, tag, to_mpi_comm(comm.mpi_comm), &message, &status);
+
+        }
+      }
+      //::MPI_Improbe(MPI_ANY_SOURCE, MPI_ANY_TAG, to_mpi_comm(comm.mpi_comm), &flag, &message, &status);       
       #endif