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

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

@@ -12 +12 @@
                      int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win)
   {
-    int target_mpi_rank   = win.comm.rank_map->at(target_rank).second;
-    int target_local_rank = win.comm.rank_map->at(target_rank).first;
-    int num_ep = win.comm.ep_comm_ptr->size_rank_info[1].second;
+    int target_mpi_rank   = win->comm->rank_map->at(target_rank).second;
+    int target_local_rank = win->comm->rank_map->at(target_rank).first;
+    int num_ep = win->comm->ep_comm_ptr->size_rank_info[1].second;
     if(num_ep==1)
       return  ::MPI_Accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count, to_mpi_type(target_datatype), 
-                               to_mpi_op(op), to_mpi_win(win.server_win[target_local_rank]));
+                               to_mpi_op(op), to_mpi_win(win->server_win[target_local_rank]));
 
     else
         return  ::MPI_Accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count, to_mpi_type(target_datatype), 
-                               to_mpi_op(op), to_mpi_win(win.client_win));
+                               to_mpi_op(op), to_mpi_win(win->client_win));
   }
 
@@ -27 +27 @@
                      int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request *request)
   {
-    int target_mpi_rank   = win.comm.rank_map->at(target_rank).second;
-    int target_local_rank = win.comm.rank_map->at(target_rank).first;
-    int num_ep = win.comm.ep_comm_ptr->size_rank_info[1].second;
+    int target_mpi_rank   = win->comm->rank_map->at(target_rank).second;
+    int target_local_rank = win->comm->rank_map->at(target_rank).first;
+    int num_ep = win->comm->ep_comm_ptr->size_rank_info[1].second;
     ::MPI_Request mpi_request;
 
@@ -35 +35 @@
     {
       int return_value = ::MPI_Raccumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count, to_mpi_type(target_datatype), 
-                                   to_mpi_op(op), to_mpi_win(win.server_win[target_local_rank]), &mpi_request);
-      request->mpi_request = new ::MPI_Request(mpi_request);
+                                   to_mpi_op(op), to_mpi_win(win->server_win[target_local_rank]), &mpi_request);
+      (*request)->mpi_request = new ::MPI_Request(mpi_request);
 
-      request->ep_datatype = origin_datatype;
-      request->type = 1;
+      (*request)->ep_datatype = origin_datatype;
+      (*request)->type = 1;
       return return_value;
     }
@@ -46 +46 @@
     {
       int return_value = ::MPI_Raccumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count, to_mpi_type(target_datatype), 
-                                   to_mpi_op(op), to_mpi_win(win.client_win), &mpi_request);
-      request->mpi_request = new ::MPI_Request(mpi_request);
+                                   to_mpi_op(op), to_mpi_win(win->client_win), &mpi_request);
+      (*request)->mpi_request = new ::MPI_Request(mpi_request);
 
-      request->ep_datatype = origin_datatype;
-      request->type = 1;
+      (*request)->ep_datatype = origin_datatype;
+      (*request)->type = 1;
       return return_value;
     }
@@ -60 +60 @@
                          int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win)
   {
-    int target_mpi_rank   = win.comm.rank_map->at(target_rank).second;
-    int target_local_rank = win.comm.rank_map->at(target_rank).first;
-    int num_ep = win.comm.ep_comm_ptr->size_rank_info[1].second;
+    int target_mpi_rank   = win->comm->rank_map->at(target_rank).second;
+    int target_local_rank = win->comm->rank_map->at(target_rank).first;
+    int num_ep = win->comm->ep_comm_ptr->size_rank_info[1].second;
     if(num_ep==1)
       return ::MPI_Get_accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), result_addr, result_count, to_mpi_type(result_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count,
-                                  to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win.server_win[target_local_rank]));
+                                  to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win->server_win[target_local_rank]));
     else
       return ::MPI_Get_accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), result_addr, result_count, to_mpi_type(result_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count,
-                                  to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win.client_win));
+                                  to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win->client_win));
   }
 
@@ -75 +75 @@
                          int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request *request)
   {
-    int target_mpi_rank   = win.comm.rank_map->at(target_rank).second;
-    int target_local_rank = win.comm.rank_map->at(target_rank).first;
-    int num_ep = win.comm.ep_comm_ptr->size_rank_info[1].second;
+    int target_mpi_rank   = win->comm->rank_map->at(target_rank).second;
+    int target_local_rank = win->comm->rank_map->at(target_rank).first;
+    int num_ep = win->comm->ep_comm_ptr->size_rank_info[1].second;
     ::MPI_Request mpi_request;
     if(num_ep==1)
     {
       int return_value = ::MPI_Rget_accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), result_addr, result_count, to_mpi_type(result_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count,
-                                      to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win.server_win[target_local_rank]), &mpi_request);
-      request->mpi_request = new ::MPI_Request(mpi_request);
+                                      to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win->server_win[target_local_rank]), &mpi_request);
+      (*request)->mpi_request = new ::MPI_Request(mpi_request);
 
-      request->ep_datatype = origin_datatype;
-      request->type = 1;
+      (*request)->ep_datatype = origin_datatype;
+      (*request)->type = 1;
       return return_value;
     }
@@ -92 +92 @@
     {
       int return_value = ::MPI_Rget_accumulate(origin_addr, origin_count, to_mpi_type(origin_datatype), result_addr, result_count, to_mpi_type(result_datatype), target_mpi_rank, to_mpi_aint(target_disp), target_count,
-                                      to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win.client_win), &mpi_request);
-      request->mpi_request = new ::MPI_Request(mpi_request);
+                                      to_mpi_type(target_datatype), to_mpi_op(op), to_mpi_win(win->client_win), &mpi_request);
+      (*request)->mpi_request = new ::MPI_Request(mpi_request);
 
-      request->ep_datatype = origin_datatype;
-      request->type = 1;
+      (*request)->ep_datatype = origin_datatype;
+      (*request)->type = 1;
       return return_value;
     }