Changeset 1500 for XIOS/dev/branch_openmp/extern/ep_dev/ep_win.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_win.cpp (modified) (14 diffs)

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

@@ -13 +13 @@
     int rank, rank_loc, num_ep;
     MPI_Comm_rank(comm, &rank);
-    rank_loc = comm.ep_comm_ptr->size_rank_info[1].first;
-    num_ep = comm.ep_comm_ptr->size_rank_info[1].second;
+    rank_loc = comm->ep_comm_ptr->size_rank_info[1].first;
+    num_ep = comm->ep_comm_ptr->size_rank_info[1].second;
     
-    win->is_ep = comm.is_ep;
+    *win = new ep_win;
+    
+    (*win)->is_ep = comm->is_ep;
 
     int num_ep_max;
@@ -22 +24 @@
 
     assert(num_ep_max > 1);
+    
+    info = new ep_info;
     
     
@@ -29 +33 @@
       for(int i=0; i<num_ep_max; i++)
       {
-        win->server_win[i] = new ::MPI_Win;
+        (*win)->server_win[i] = new ::MPI_Win;
       }
 
@@ -35 +39 @@
       for(int i=0; i<num_ep_max; i++)
       {
-        ::MPI_Win_create(base, to_mpi_aint(size), disp_unit, to_mpi_info(info), to_mpi_comm(comm.mpi_comm), static_cast< ::MPI_Win*>(win->server_win[i]));
-        win->comm = comm;
+        ::MPI_Win_create(base, to_mpi_aint(size), disp_unit, to_mpi_info(info), to_mpi_comm(comm->mpi_comm), static_cast< ::MPI_Win*>((*win)->server_win[i]));
+        (*win)->comm = comm;
       }
     }
     else  // client
     {
-      win->client_win = new ::MPI_Win;
+      (*win)->client_win = new ::MPI_Win;
       
       for(int i=0; i<num_ep; i++)
@@ -48 +52 @@
         {
           printf("Calling MPI_Win_create from client, rank = %d\n", rank);
-          ::MPI_Win_create(base, to_mpi_aint(size), disp_unit, to_mpi_info(info), to_mpi_comm(comm.mpi_comm), static_cast< ::MPI_Win*>(win->client_win)); 
-          win->comm = comm;
+          ::MPI_Win_create(base, to_mpi_aint(size), disp_unit, to_mpi_info(info), to_mpi_comm(comm->mpi_comm), static_cast< ::MPI_Win*>((*win)->client_win)); 
+          (*win)->comm = comm;
         }
         MPI_Barrier_local(comm);
@@ -61 +65 @@
           for(int i=0; i<num_ep_max-num_ep; i++)
           {
-            win->null_win[i] = new ::MPI_Win;
-            ::MPI_Win_create(NULL, 0, disp_unit, to_mpi_info(info), to_mpi_comm(comm.mpi_comm), static_cast< ::MPI_Win*>(win->null_win[i])); 
+            (*win)->null_win[i] = new ::MPI_Win;
+            ::MPI_Win_create(NULL, 0, disp_unit, to_mpi_info(info), to_mpi_comm(comm->mpi_comm), static_cast< ::MPI_Win*>((*win)->null_win[i])); 
           }  
         }  
@@ -78 +82 @@
     
 
-    MPI_Comm_rank(win->comm, &rank);
-    rank_loc = win->comm.ep_comm_ptr->size_rank_info[1].first;
-    num_ep = win->comm.ep_comm_ptr->size_rank_info[1].second;
+    MPI_Comm_rank((*win)->comm, &rank);
+    rank_loc = (*win)->comm->ep_comm_ptr->size_rank_info[1].first;
+    num_ep = (*win)->comm->ep_comm_ptr->size_rank_info[1].second;
     
     
     int num_ep_max;
-    MPI_Allreduce(&num_ep, &num_ep_max, 1, MPI_INT, MPI_MAX, win->comm);
+    MPI_Allreduce(&num_ep, &num_ep_max, 1, MPI_INT, MPI_MAX, (*win)->comm);
 
     //printf("rank_loc = %d, thread_num = %d, num_ep_max = %d\n", rank_loc, omp_get_thread_num(), num_ep_max);
@@ -93 +97 @@
       for(int i=0; i<num_ep_max; i++)
       {
-        ::MPI_Win_free(static_cast< ::MPI_Win*>(win->server_win[i]));
+        ::MPI_Win_free(static_cast< ::MPI_Win*>((*win)->server_win[i]));
       }
     }
@@ -103 +107 @@
         {
           printf("Calling MPI_Win_free from client, rank = %d\n", rank);
-          ::MPI_Win_free(static_cast< ::MPI_Win*>(win->client_win)); 
+          ::MPI_Win_free(static_cast< ::MPI_Win*>((*win)->client_win)); 
         }
-        MPI_Barrier_local(win->comm);
+        MPI_Barrier_local((*win)->comm);
       }
 
@@ -115 +119 @@
           for(int i=0; i<num_ep_max-num_ep; i++)
           {
-            ::MPI_Win_free(static_cast< ::MPI_Win*>(win->null_win[i])); 
+            ::MPI_Win_free(static_cast< ::MPI_Win*>((*win)->null_win[i])); 
           }  
         }  
@@ -130 +134 @@
     int rank, rank_loc, num_ep;
     
-    MPI_Comm_rank(win.comm, &rank);
-    rank_loc = win.comm.ep_comm_ptr->size_rank_info[1].first;
-    num_ep = win.comm.ep_comm_ptr->size_rank_info[1].second;
+    MPI_Comm_rank(win->comm, &rank);
+    rank_loc = win->comm->ep_comm_ptr->size_rank_info[1].first;
+    num_ep = win->comm->ep_comm_ptr->size_rank_info[1].second;
     
     int num_ep_max;
-    MPI_Allreduce(&num_ep, &num_ep_max, 1, MPI_INT, MPI_MAX, win.comm);
+    MPI_Allreduce(&num_ep, &num_ep_max, 1, MPI_INT, MPI_MAX, win->comm);
 
     if(num_ep == 1)
@@ -142 +146 @@
       for(int i=0; i<num_ep_max; i++)
       {
-        ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win.server_win[i]));
+        ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win->server_win[i]));
       }
     }
@@ -152 +156 @@
         {
           printf("Calling MPI_Win_fence from client, rank = %d\n", rank);
-          ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win.client_win)); 
+          ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win->client_win)); 
         }
-        MPI_Barrier_local(win.comm);
+        MPI_Barrier_local(win->comm);
       }
 
@@ -164 +168 @@
           for(int i=0; i<num_ep_max-num_ep; i++)
           {
-            ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win.null_win[i])); 
+            ::MPI_Win_fence(assert, *static_cast< ::MPI_Win*>(win->null_win[i])); 
           }  
         }