Changeset 1500 for XIOS/dev/branch_openmp/extern/ep_dev/ep_free.cpp

Timestamp:

05/28/18 09:54:32 (6 years ago)

Author:

yushan

Message:

save dev

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_free.cpp (modified) (8 diffs)

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

@@ -9 +9 @@
   int MPI_Comm_free(MPI_Comm *comm)
   {
-    if(! comm->is_ep)
+    if(! (*comm)->is_ep)
     {
-      if(comm->mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm))
+      if((*comm)->mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL->mpi_comm))
       {
-        ::MPI_Comm mpi_comm = to_mpi_comm(comm->mpi_comm);
+        ::MPI_Comm mpi_comm = to_mpi_comm((*comm)->mpi_comm);
 
         ::MPI_Comm_free(&mpi_comm);
@@ -21 +21 @@
     }
 
-    else if(comm->is_intercomm)
+    else if((*comm)->is_intercomm)
     {
       return MPI_Comm_free_intercomm(comm);
@@ -30 +30 @@
       int ep_rank_loc, num_ep;
 
-      ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
-      num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
+      ep_rank_loc = (*comm)->ep_comm_ptr->size_rank_info[1].first;
+      num_ep = (*comm)->ep_comm_ptr->size_rank_info[1].second;
 
       MPI_Barrier(*comm);
@@ -39 +39 @@
         Debug("comm is EP, mpi_comm_ptr != NULL\n");
 
-        delete comm->my_buffer;
+        delete (*comm)->my_buffer;
 
 
-        if(comm->ep_barrier != NULL)
+        if((*comm)->ep_barrier != NULL)
         {
-          comm->ep_barrier->~OMPbarrier();
+          (*comm)->ep_barrier->~ep_barrier();
           Debug("ep_barrier freed\n");
         }
 
 
-        if( ! comm->rank_map->empty() )
+        if( ! (*comm)->rank_map->empty() )
         {
-          comm->rank_map->clear();
-          delete comm->rank_map;
+          (*comm)->rank_map->clear();
+          delete (*comm)->rank_map;
           Debug("rank_map emptied\n");
         }
@@ -58 +58 @@
         for(int i=0; i<num_ep; i++)
         {
-          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
-          delete comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue;
+          (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue->clear();
+          delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue;
           Debug("message queue freed\n");
           
 
-          if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr != NULL)
+          if((*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr != NULL)
           {
-            delete comm->ep_comm_ptr->comm_list[i].ep_comm_ptr;
+            delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr;
             Debug("ep_comm_ptr freed\n");
           }
         }
 
-        if( to_mpi_comm(comm->mpi_comm) != *static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm) 
-          && to_mpi_comm(comm->mpi_comm) != *static_cast< ::MPI_Comm*>(MPI_COMM_WORLD.mpi_comm))
+        if( to_mpi_comm((*comm)->mpi_comm) != *static_cast< ::MPI_Comm*>(MPI_COMM_NULL->mpi_comm) 
+          && to_mpi_comm((*comm)->mpi_comm) != *static_cast< ::MPI_Comm*>(MPI_COMM_WORLD->mpi_comm))
         {
-          ::MPI_Comm mpi_comm = to_mpi_comm(comm->mpi_comm);
+          ::MPI_Comm mpi_comm = to_mpi_comm((*comm)->mpi_comm);
           ::MPI_Comm_free(&mpi_comm);
           Debug("mpi_comm freed\n");
         }
 
-       if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
+       //if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
 
       }
@@ -93 +93 @@
     int ep_rank_loc, num_ep;
 
-    ep_rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
-    num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
+    ep_rank_loc = (*comm)->ep_comm_ptr->size_rank_info[1].first;
+    num_ep = (*comm)->ep_comm_ptr->size_rank_info[1].second;
 
     //MPI_Barrier(*comm);
@@ -103 +103 @@
 
 
-      if(comm->ep_barrier != NULL)
+      if((*comm)->ep_barrier != NULL)
       {
-        comm->ep_barrier->~OMPbarrier();
+        (*comm)->ep_barrier->~ep_barrier();
         Debug("ep_barrier freed\n");
       }
 
 
-      if( ! comm->rank_map->empty() )
+      if( ! (*comm)->rank_map->empty() )
       {
-        comm->rank_map->clear();
+        (*comm)->rank_map->clear();
         Debug("rank_map emptied\n");
       }
@@ -118 +118 @@
       for(int i=0; i<num_ep; i++)
       {
-        comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->message_queue->clear();
+        (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->message_queue->clear();
         Debug("message queue freed\n");
 
         #pragma omp critical (memory_free)
-        if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm != NULL)
+        if((*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm != NULL)
         {
-          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->local_rank_map->clear();
-          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->remote_rank_map->clear();
-          comm->ep_comm_ptr->comm_list[i].ep_comm_ptr->intercomm->intercomm_rank_map->clear();
+          (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm->local_rank_map->clear();
+          (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm->remote_rank_map->clear();
+          (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr->intercomm->intercomm_rank_map->clear();
           Debug("intercomm local/remote/intercomm_rank_map emptied\n");
         }  
 
-        if(comm->ep_comm_ptr->comm_list[i].ep_comm_ptr != NULL)
+        if((*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr != NULL)
         {
-          delete comm->ep_comm_ptr->comm_list[i].ep_comm_ptr;
+          delete (*comm)->ep_comm_ptr->comm_list[i]->ep_comm_ptr;
           Debug("ep_comm_ptr freed\n");
         }
       }
 
-      if(comm->mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm))
+      if((*comm)->mpi_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL->mpi_comm))
       {
-        ::MPI_Comm mpi_comm = to_mpi_comm(comm->mpi_comm);
+        ::MPI_Comm mpi_comm = to_mpi_comm((*comm)->mpi_comm);
         ::MPI_Comm_free(&mpi_comm);
         Debug("mpi_comm freed\n");
       }
 
-      if(comm->ep_comm_ptr->intercomm->mpi_inter_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL.mpi_comm))
+      if((*comm)->ep_comm_ptr->intercomm->mpi_inter_comm != static_cast< ::MPI_Comm*>(MPI_COMM_NULL->mpi_comm))
       {
-        ::MPI_Comm mpi_comm = to_mpi_comm(comm->ep_comm_ptr->comm_list->ep_comm_ptr->intercomm->mpi_inter_comm);
+        ::MPI_Comm mpi_comm = to_mpi_comm((*comm)->ep_comm_ptr->comm_list[0]->ep_comm_ptr->intercomm->mpi_inter_comm);
         ::MPI_Comm_free(&mpi_comm);
         Debug("mpi_intercomm freed\n");
       }
 
-     if(comm != NULL) {delete[] comm->ep_comm_ptr->comm_list; Debug("comm freed\n");}
+     if(comm != NULL) {delete[] (*comm)->ep_comm_ptr->comm_list; Debug("comm freed\n");}
 
     }