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

Timestamp:

03/27/18 20:40:31 (6 years ago)

Author:

yushan

Message:

tests (client, complete, toy, rempa) work fine with 2-level server mode. Tested on ADA (2*2+2)

Location:

XIOS/dev/branch_openmp/extern/src_ep_dev

Files:

• ep_dup.cpp (modified) (1 diff)
• ep_free.cpp (modified) (1 diff)

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

@@ -94 +94 @@
         out_comm[i].ep_comm_ptr->intercomm->remote_rank_map = new RANK_MAP;
 
-        out_comm[i].ep_comm_ptr->intercomm->intercomm_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map;
-        out_comm[i].ep_comm_ptr->intercomm->local_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map;
-        out_comm[i].ep_comm_ptr->intercomm->remote_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map;
+        int map_size = 0;
+        map_size = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map->size();
+        out_comm[i].ep_comm_ptr->intercomm->intercomm_rank_map->resize(map_size);
+        for(int ii=0; ii<map_size; ii++)
+          out_comm[i].ep_comm_ptr->intercomm->intercomm_rank_map->at(ii) = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map->at(ii);
+
+        map_size = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map->size();
+        out_comm[i].ep_comm_ptr->intercomm->local_rank_map->resize(map_size);
+        for(int ii=0; ii<map_size; ii++)
+          out_comm[i].ep_comm_ptr->intercomm->local_rank_map->at(ii) = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map->at(ii);
+
+        map_size = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map->size();
+        out_comm[i].ep_comm_ptr->intercomm->remote_rank_map->resize(map_size);
+        for(int ii=0; ii<map_size; ii++)
+          out_comm[i].ep_comm_ptr->intercomm->remote_rank_map->at(ii) = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map->at(ii);
+
+
+        //out_comm[i].ep_comm_ptr->intercomm->intercomm_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map;
+        //out_comm[i].ep_comm_ptr->intercomm->local_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map;
+        //out_comm[i].ep_comm_ptr->intercomm->remote_rank_map = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map;
 
         out_comm[i].ep_comm_ptr->intercomm->local_comm = comm.ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_comm;        

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

@@ -9 +9 @@
   int MPI_Comm_free(MPI_Comm *comm)
   {
-
     if(! comm->is_ep)
     {