Changeset 1328 for XIOS/dev/branch_openmp/extern/src_ep_dev

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/extern/src_ep_dev

Files:

• ep_fortran.cpp (modified) (2 diffs)
• ep_intercomm.cpp (modified) (1 diff)
• ep_lib.cpp (modified) (1 diff)
• ep_send.cpp (modified) (1 diff)
• ep_type.hpp (modified) (1 diff)

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

@@ -31 +31 @@
       {
         fc_comm_map.insert(std::make_pair( std::make_pair( fint, omp_get_thread_num()) , comm));
-        //printf("EP_Comm_c2f : MAP %p insert: %d, %d, %p\n", &fc_comm_map, fint, omp_get_thread_num(), comm.ep_comm_ptr);
+        printf("EP_Comm_c2f : MAP %p insert: %d, %d, %p\n", &fc_comm_map, fint, omp_get_thread_num(), comm.ep_comm_ptr);
       }
     }
@@ -54 +54 @@
       MPI_Comm comm_ptr;
       comm_ptr = it->second;
-      //printf("EP_Comm_f2c : MAP %p find: %d, %d, %p\n", &fc_comm_map, it->first.first, it->first.second, comm_ptr.ep_comm_ptr);
+      printf("EP_Comm_f2c : MAP %p find: %d, %d, %p\n", &fc_comm_map, it->first.first, it->first.second, comm_ptr.ep_comm_ptr);
       return  comm_ptr;
     }

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

@@ -47 +47 @@
 
       MPI_Waitall(2, request, status);
+
+      //MPI_Send(&leader_ranks[0], 3, static_cast< ::MPI_Datatype>(MPI_INT), remote_leader, tag, peer_comm);
+      //MPI_Recv(&leader_ranks[3], 3, static_cast< ::MPI_Datatype>(MPI_INT), remote_leader, tag, peer_comm, &status[1]);
     }
 

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

@@ -10 +10 @@
 #pragma omp threadprivate(EP_PendingRequests)
 
+
+
 namespace ep_lib
 { 
+  bool MPI_Comm::is_null()
+  {
+    if(!this->is_intercomm)
+      return this->mpi_comm == MPI_COMM_NULL.mpi_comm;
+    else
+      return this->ep_comm_ptr->intercomm->mpi_inter_comm == MPI_COMM_NULL.mpi_comm;
+  }
 
   int tag_combine(int real_tag, int src, int dest)

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

@@ -19 +19 @@
     if(!comm.is_ep)
       return ::MPI_Send(buf, count, to_mpi_type(datatype), dest, tag, to_mpi_comm(comm.mpi_comm));
-
-    MPI_Request request;
-    MPI_Status status;
-    MPI_Isend(buf, count, datatype, dest, tag, comm, &request);
-    MPI_Wait(&request, &status);
-
+    if(comm.is_intercomm)
+    {
+      MPI_Request request;
+      MPI_Status status;
+      MPI_Isend(buf, count, datatype, dest, tag, comm, &request);
+      MPI_Wait(&request, &status);
+    }
+    else
+    {
+      int ep_src_loc  = comm.ep_comm_ptr->size_rank_info[1].first;
+      int ep_dest_loc = comm.ep_comm_ptr->comm_list->rank_map->at(dest).first;
+      int mpi_tag     = tag_combine(tag, ep_src_loc, ep_dest_loc);
+      int mpi_dest    = comm.ep_comm_ptr->comm_list->rank_map->at(dest).second;
+
+      ::MPI_Send(buf, count, to_mpi_type(datatype), mpi_dest, mpi_tag, to_mpi_comm(comm.mpi_comm));
+      //printf("call mpi_send for intracomm, dest = %d, tag = %d\n", dest, tag);
+    }
     //check_sum_send(buf, count, datatype, dest, tag, comm);
 

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

@@ -344 +344 @@
     }
 
+    bool is_null();
+
   };