Changeset 1539 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_free.cpp

Timestamp:

06/12/18 11:54:13 (6 years ago)

Author:

yushan

Message:

update intercomm_merge and remove redundant files

File:

• XIOS/dev/branch_openmp/extern/src_ep_dev/ep_free.cpp (modified) (4 diffs)

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

@@ -9 +9 @@
   int MPI_Comm_free(MPI_Comm *comm)
   {
-    if(! (*comm)->is_ep)
-    {
-      return MPI_Comm_free_mpi(comm);
-    }
-
-    else 
-    {
-      if((*comm)->is_intercomm)
-        return MPI_Comm_free_intercomm(comm);
-      else
-        return MPI_Comm_free_intracomm(comm);
-    }
+    if(! (*comm)->is_ep) return MPI_Comm_free_mpi(comm);
+    else return MPI_Comm_free_endpoint(comm);
   }
 
@@ -28 +18 @@
   {
     Debug("MPI_Comm_free with MPI\n");
-
     return ::MPI_Comm_free(to_mpi_comm_ptr((*comm)->mpi_comm));
-    
   }
 
-  int MPI_Comm_free_intracomm(MPI_Comm *comm)
+  int MPI_Comm_free_endpoint(MPI_Comm *comm)
   {
     Debug("MPI_Comm_free with EP_intracomm\n");
@@ -42 +30 @@
     num_ep = (*comm)->ep_comm_ptr->size_rank_info[1].second;
 
-    MPI_Barrier(*comm);
+    MPI_Barrier_local(*comm);
 
     if(ep_rank_loc == 0)
     {
+
+      if((*comm)->is_intercomm)
+      {
+        for(int i=0; i<num_ep; i++)
+        {
+          (*comm)->ep_comm_ptr->comm_list[i]->inter_rank_map->clear();
+#ifdef _showinfo
+          printf("delete (*comm)->ep_comm_ptr->comm_list[%d]->inter_rank_map = %p\n", i, (*comm)->ep_comm_ptr->comm_list[i]->inter_rank_map);
+#endif
+          delete (*comm)->ep_comm_ptr->comm_list[i]->inter_rank_map;
+        }
+      }
+
+
 
 #ifdef _showinfo
@@ -103 +105 @@
 
 
-
-
-
-
-  int MPI_Comm_free_intercomm(MPI_Comm *comm)
-  {
-    int ep_rank;
-    MPI_Comm_rank(*comm, &ep_rank);
-    int ep_rank_loc = (*comm)->ep_comm_ptr->size_rank_info[1].first;
-    int num_ep =      (*comm)->ep_comm_ptr->size_rank_info[1].second;
-    
-    int newcomm_ep_rank =(*comm)->ep_comm_ptr->intercomm->size_rank_info[0].first; 
-    int newcomm_ep_rank_loc = (*comm)->ep_comm_ptr->intercomm->size_rank_info[1].first;
-    int newcomm_num_ep = (*comm)->ep_comm_ptr->intercomm->size_rank_info[1].second;
-
-    return 0;
-    MPI_Barrier(*comm);
-
-    if(ep_rank_loc == 0)
-    {
-      (*comm)->ep_comm_ptr->intercomm->intercomm_rank_map->clear();
-#ifdef _showinfo
-      printf("delete (*comm)->ep_comm_ptr->intercomm->intercomm_rank_map = %p\n", (*comm)->ep_comm_ptr->intercomm->intercomm_rank_map);
-#endif
-      delete (*comm)->ep_comm_ptr->intercomm->intercomm_rank_map;
-
-      (*comm)->ep_comm_ptr->intercomm->local_rank_map->clear();
-#ifdef _showinfo
-      printf("delete (*comm)->ep_comm_ptr->intercomm->local_rank_map = %p\n", (*comm)->ep_comm_ptr->intercomm->local_rank_map);
-#endif
-      delete (*comm)->ep_comm_ptr->intercomm->local_rank_map;
-    }
-
-    if(newcomm_ep_rank_loc == 0)
-    {
-
-#ifdef _showinfo
-      printf("delete (*comm)->my_buffer = %p\n", (*comm)->my_buffer);
-#endif
-      delete (*comm)->my_buffer;
-
-
-      
-#ifdef _showinfo        
-      printf("delete (*comm)->ep_barrier = %p\n", (*comm)->ep_barrier);
-#endif
-      delete (*comm)->ep_barrier;
-      
-
-      (*comm)->ep_rank_map->clear();
-#ifdef _showinfo
-      printf("delete (*comm)->ep_rank_map = %p\n", (*comm)->ep_rank_map);
-#endif
-      delete (*comm)->ep_rank_map;
-      
-#ifdef _showinfo
-      printf("delete (*comm)->ep_comm_ptr->intercomm->mpi_inter_comm = %p\n", (*comm)->ep_comm_ptr->intercomm->mpi_inter_comm);
-#endif
-      ::MPI_Comm_free(to_mpi_comm_ptr((*comm)->ep_comm_ptr->intercomm->mpi_inter_comm));
-
-      for(int i=0; i<newcomm_num_ep; i++)
-      {
-        (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue->clear();
-#ifdef _showinfo
-        printf("delete (*comm)->ep_comm_ptr->comm_list[%d]->ep_comm_ptr->message_queue = %p\n", i, (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue);
-#endif
-        delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue;
-
-#ifdef _showinfo
-        printf("delete (*comm)->ep_comm_ptr->comm_list[%d]->ep_comm_ptr->intercomm = %p\n", i, (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm);
-#endif
-        delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm;        
-          
-
-#ifdef _showinfo
-        printf("delete (*comm)->ep_comm_ptr->comm_list[%d]->ep_comm_ptr = %p\n", i, (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr);
-#endif
-        delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr;
-
-
-#ifdef _showinfo
-        printf("delete (*comm)->ep_comm_ptr->comm_list[%d] = %p\n", i, (*comm)->ep_comm_ptr->comm_list[i]);
-#endif
-        delete (*comm)->ep_comm_ptr->comm_list[i];
-
-      }
-
-#ifdef _showinfo
-      printf("delete (*comm)->mpi_comm = %p\n", (*comm)->mpi_comm);
-#endif
-      ::MPI_Comm_free(to_mpi_comm_ptr((*comm)->mpi_comm));
-      
-#ifdef _showinfo
-      printf("delete (*comm)->ep_comm_ptr->comm_list = %p\n", (*comm)->ep_comm_ptr->comm_list);
-#endif
-      delete[] (*comm)->ep_comm_ptr->comm_list;
-    }
-  }
-
-
 }