Changeset 1067 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_kernel.cpp

Timestamp:

03/08/17 16:55:00 (7 years ago)

Author:

yushan

Message:

server mode OK tested with test_complete

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_kernel.cpp (modified) (5 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_intercomm_kernel.cpp

@@ -351 +351 @@
         #pragma omp critical (write_to_tag_list)
         tag_list.push_back(make_pair( make_pair(tag, min(leader_info[0], leader_info[1])) , ep_intercomm));
+        printf("tag_list size = %lu\n", tag_list.size());
       }
 
@@ -419 +420 @@
             *newintercomm =  iter->second[my_position];
             found = true;
+            tag_list.erase(iter);
             break;
           }
@@ -426 +428 @@
 
     MPI_Barrier_local(local_comm);
+    // if(is_proc_master)
+    // {
+    //   for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
+    //   {
+    //     if((*iter).first == make_pair(tag, min(leader_info[0], leader_info[1])))
+    //     {
+    //       tag_list.erase(iter);
+    //       break;
+    //     }
+    //   }
+    // }
 
     int intercomm_ep_rank, intercomm_ep_rank_loc, intercomm_mpi_rank;
@@ -674 +687 @@
             *newintercomm =  iter->second[my_position];
             found = true;
+            tag_list.erase(iter);
             break;
           }
@@ -679 +693 @@
       }
     }
+
+    // if(leader_rank_in_peer[0] < leader_rank_in_peer[1])
+    // {
+    //   for(std::list<std::pair < std::pair<int,int>, MPI_Comm* > >::iterator iter = tag_list.begin(); iter!=tag_list.end(); iter++)
+    //     {
+    //       if((*iter).first == make_pair(tag_label[0], tag_label[1]))
+    //       {
+    //         tag_list.erase(iter);
+    //       }
+    //     }
+    // }