Changeset 1383

Timestamp:

12/19/17 17:16:01 (6 years ago)

Author:

yushan

Message:

dev EP-RMA : MPI_Put, MPI_Get

Location:

XIOS/dev/branch_openmp/extern/ep_dev

Files:

• ep_lib.cpp (modified) (1 diff)
• ep_lib_win.hpp (modified) (1 diff)
• ep_mpi.hpp (modified) (1 diff)
• ep_win.cpp (modified) (1 diff)
• main.cpp (modified) (3 diffs)

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

@@ -265 +265 @@
 }
 
-MPI_Aint to_mpi_aint(void* aint)
-{
-  return *(static_cast< MPI_Aint* >(aint));
-}
-
-
-
-
-
+MPI_Aint to_mpi_aint(ep_lib::MPI_Aint aint)
+{
+  return *(static_cast< MPI_Aint* >(aint.mpi_aint));
+}
+
+
+
+
+

XIOS/dev/branch_openmp/extern/ep_dev/ep_lib_win.hpp

@@ -12 +12 @@
   int MPI_Win_free(MPI_Win *win);
   int MPI_Win_fence(int assert, MPI_Win win);
+  int MPI_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, 
+                  int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win);
+  int MPI_Get(void *origin_addr, int origin_count, MPI_Datatype origin_datatype, 
+                  int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Win win);
 }
 

XIOS/dev/branch_openmp/extern/ep_dev/ep_mpi.hpp

@@ -10 +10 @@
 MPI_Info     to_mpi_info(void* info);
 MPI_Win      to_mpi_win(void* win);
-MPI_Aint      to_mpi_aint(void* aint);
+MPI_Aint     to_mpi_aint(ep_lib::MPI_Aint aint);
 
 #endif // EP_MPI_HPP_INCLUDED

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

@@ -20 +20 @@
     int num_ep_max;
     MPI_Allreduce(&num_ep, &num_ep_max, 1, MPI_INT, MPI_MAX, comm);
+
+    assert(num_ep_max > 1);
     
     

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

@@ -30 +30 @@
   MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
  
-  
-
-
-
-
-
-  //omp_set_num_threads(4);
-
-  
-
   #pragma omp parallel default(shared)
   {
@@ -693 +683 @@
     MPI_Win ep_win;
     MPI_Aint buf_size(1);
-    int buf;
+    int buf = rank;
+    int local_buf = rank;
     MPI_Win_create(&buf, buf_size, sizeof(int), info, comm, &ep_win);
     MPI_Barrier(comm);
@@ -703 +694 @@
     MPI_Barrier(comm);
 
-    MPI_Win_fence(MPI_MODE_NOSUCCEED, ep_win);
-
-    MPI_Barrier(comm);
+    MPI_Win_fence(0, ep_win);
+
+    if(rank == 0)
+    {
+      local_buf = 99;
+      MPI_Aint displs(0);
+      MPI_Put(&local_buf, 1, MPI_INT, size-1, displs, 1, MPI_INT, ep_win);
+    }
+
+    if(rank == size-2)
+    {
+      MPI_Aint displs(0);
+      MPI_Get(&local_buf, 1, MPI_INT, 2, displs, 1, MPI_INT, ep_win);
+    }
+
+
+    MPI_Barrier(comm);
+
+    MPI_Win_fence(0, ep_win);
 
     
     MPI_Win_free(&ep_win);
-    printf("comm free\n");
+    printf("rank = %d, buf = %d, local_buf = %d\n", rank, buf, local_buf);
     
     MPI_Comm_free(&comm);