Changeset 1518 for XIOS/dev/branch_openmp/extern/ep_dev/ep_dup.cpp

Timestamp:

06/01/18 19:36:12 (6 years ago)

Author:

yushan

Message:

optimisation partially finished. To do : special case for intercomm_create and intercomm_merge

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_dup.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_dup.cpp

@@ -85 +85 @@
         printf("new out_comm[%d]->ep_comm_ptr->intercomm = %p\n", i, out_comm[i]->ep_comm_ptr->intercomm);
 #endif
-        out_comm[i]->ep_comm_ptr->intercomm->mpi_inter_comm = mpi_inter_comm;      
+        out_comm[i]->ep_comm_ptr->intercomm->mpi_inter_comm = mpi_inter_comm;
       }
 
@@ -104 +104 @@
     (*newcomm)->ep_comm_ptr->intercomm->size_rank_info[2] = comm->ep_comm_ptr->intercomm->size_rank_info[2];
 
+    (*newcomm)->ep_comm_ptr->intercomm->intercomm_tag = comm->ep_comm_ptr->intercomm->intercomm_tag;
+
 
     int ep_rank_loc = (*newcomm)->ep_comm_ptr->size_rank_info[1].first;
@@ -109 +111 @@
     if(ep_rank_loc == 0)
     {
-      //printf("in dup , ep_rank_loc = 0 :  ep %d\n", (*newcomm)->ep_comm_ptr->size_rank_info[0].first);
+      int world_rank;
+      MPI_Comm_rank(MPI_COMM_WORLD, &world_rank);
+
       (*newcomm)->ep_comm_ptr->intercomm->intercomm_rank_map = new INTERCOMM_RANK_MAP;
       (*newcomm)->ep_comm_ptr->intercomm->local_rank_map = new EP_RANK_MAP;
 
       *(*newcomm)->ep_comm_ptr->intercomm->intercomm_rank_map = *comm->ep_comm_ptr->intercomm->intercomm_rank_map;
-      *(*newcomm)->ep_comm_ptr->intercomm->local_rank_map = *comm->ep_comm_ptr->intercomm->local_rank_map;
+      *(*newcomm)->ep_comm_ptr->intercomm->local_rank_map     = *comm->ep_comm_ptr->intercomm->local_rank_map;
     }
 
@@ -121 +125 @@
     if(ep_rank_loc !=0 )
     {
-      (*newcomm)->ep_comm_ptr->intercomm->intercomm_rank_map = (*newcomm)->ep_comm_ptr->comm_list[0]->ep_comm_ptr->intercomm->intercomm_rank_map;
-      (*newcomm)->ep_comm_ptr->intercomm->local_rank_map = (*newcomm)->ep_comm_ptr->comm_list[0]->ep_comm_ptr->intercomm->local_rank_map;
+      int target = (*newcomm)->ep_comm_ptr->intercomm->intercomm_tag;
+      (*newcomm)->ep_comm_ptr->intercomm->intercomm_rank_map = (*newcomm)->ep_comm_ptr->comm_list[target]->ep_comm_ptr->intercomm->intercomm_rank_map; 
+      (*newcomm)->ep_comm_ptr->intercomm->local_rank_map     = (*newcomm)->ep_comm_ptr->comm_list[target]->ep_comm_ptr->intercomm->local_rank_map;
     }