Merge pull request #206 from barche/accumulate

Add onesided accumulate functions

Author: vchuravy

README.md

@@ -266,6 +266,8 @@ Julia Function (assuming `import MPI`) | Fortran Function
  `MPI.Get`                             | [`MPI_Get`](https://www.open-mpi.org/doc/v3.0/man3/MPI_Get.3.php)
  `MPI.Put`                             | [`MPI_Put`](https://www.open-mpi.org/doc/v3.0/man3/MPI_Put.3.php)
  `MPI.Fetch_and_op`                    | [`MPI_Fetch_and_op`](https://www.open-mpi.org/doc/v3.0/man3/MPI_Fetch_and_op.3.php)
+ `MPI.Accumulate`                      | [`MPI_Accumulate`](https://www.open-mpi.org/doc/v3.0/man3/MPI_Accumulate.3.php)
+ `MPI.Get_accumulate`                      | [`MPI_Get_accumulate`](https://www.open-mpi.org/doc/v3.0/man3/MPI_Get_accumulate.3.php)
 
 [Julia]: http://julialang.org/
 [MPI]: http://www.mpi-forum.org/

deps/CMakeLists.txt

@@ -27,6 +27,7 @@ include(FortranCInterface)
 # Keep these function names sorted alphabetically
 FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_ABORT
+  MPI_ACCUMULATE
   MPI_ALLGATHER
   MPI_ALLGATHERV
   MPI_ALLREDUCE
@@ -51,6 +52,7 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_GATHER
   MPI_GATHERV
   MPI_GET
+  MPI_GET_ACCUMULATE
   MPI_GET_ADDRESS
   MPI_GET_COUNT
   MPI_GET_PROCESSOR_NAME

deps/gen_functions.c

@@ -18,6 +18,7 @@ int main(int argc, char *argv[]) {
   printf("\n");
   printf("const _mpi_functions = Dict{Symbol, String}(\n");
   printf("    :MPI_ABORT              => \"%s\",\n", STRING(MPI_ABORT));
+  printf("    :MPI_ACCUMULATE         => \"%s\",\n", STRING(MPI_ACCUMULATE));
   printf("    :MPI_ALLGATHER          => \"%s\",\n", STRING(MPI_ALLGATHER));
   printf("    :MPI_ALLGATHERV         => \"%s\",\n", STRING(MPI_ALLGATHERV));
   printf("    :MPI_ALLREDUCE          => \"%s\",\n", STRING(MPI_ALLREDUCE));
@@ -41,6 +42,7 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_GATHER             => \"%s\",\n", STRING(MPI_GATHER));
   printf("    :MPI_GATHERV            => \"%s\",\n", STRING(MPI_GATHERV));
   printf("    :MPI_GET                => \"%s\",\n", STRING(MPI_GET));
+  printf("    :MPI_GET_ACCUMULATE     => \"%s\",\n", STRING(MPI_GET_ACCUMULATE));
   printf("    :MPI_GET_ADDRESS        => \"%s\",\n", STRING(MPI_GET_ADDRESS));
   printf("    :MPI_GET_COUNT          => \"%s\",\n", STRING(MPI_GET_COUNT));
   printf("    :MPI_GET_PROCESSOR_NAME => \"%s\",\n",

src/mpi-base.jl

@@ -929,6 +929,18 @@ function Fetch_and_op(sourceval::MPIBuffertype{T}, returnval::MPIBuffertype{T},
           sourceval, returnval, mpitype(T), target_rank, target_disp, op.val, win)
 end
 
+function Accumulate(origin_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, op::Op, win::Win) where T
+    ccall(MPI_ACCUMULATE, Void,
+          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
+          origin_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), op.val, win.val, 0)
+end
+
+function Get_accumulate(origin_buffer::MPIBuffertype{T}, result_buffer::MPIBuffertype{T}, count::Integer, target_rank::Integer, target_disp::Integer, op::Op, win::Win) where T
+    ccall(MPI_GET_ACCUMULATE, Void,
+          (Ptr{T}, Ref{Cint}, Ref{Cint}, Ptr{T}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cptrdiff_t}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}, Ref{Cint}),
+          origin_buffer, count, mpitype(T), result_buffer, count, mpitype(T), target_rank, Cptrdiff_t(target_disp), count, mpitype(T), op.val, win.val, 0)
+end
+
 function Get_address(location::MPIBuffertype{T}) where T
     addr = Ref{Cptrdiff_t}(0)
     ccall(MPI_GET_ADDRESS, Void, (Ptr{T}, Ref{Cptrdiff_t}, Ref{Cint}), location, addr, 0)

src/win_mpiconstants.jl

@@ -55,6 +55,7 @@ const HAVE_MPI_COMM_C2F = false
 const libmpi = "msmpi.dll"
 
 const MPI_ABORT = (:MPI_ABORT, libmpi)
+const MPI_ACCUMULATE = (:MPI_ACCUMULATE, libmpi)
 const MPI_ALLREDUCE = (:MPI_ALLREDUCE, libmpi)
 const MPI_INIT = (:MPI_INIT, libmpi)
 const MPI_CANCEL = (:MPI_CANCEL, libmpi)
@@ -93,6 +94,7 @@ const MPI_SEND = (:MPI_SEND, libmpi)
 const MPI_SCAN = (:MPI_SCAN, libmpi)
 const MPI_EXSCAN = (:MPI_EXSCAN, libmpi)
 const MPI_GET = (:MPI_GET, libmpi)
+const MPI_GET_ACCUMULATE = (:MPI_GET_ACCUMULATE, libmpi)
 const MPI_GET_ADDRESS = (:MPI_GET_ADDRESS, libmpi)
 const MPI_GET_COUNT = (:MPI_GET_COUNT, libmpi)
 const MPI_GATHER = (:MPI_GATHER, libmpi)

test/test_onesided.jl

@@ -36,6 +36,50 @@ if rank == 0
   @test buf == collect(0:N-1)
 end
 
+MPI.Barrier(comm)
+
+if rank == 1
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 1, 0, win)
+  fill!(buf,3)
+  MPI.Win_unlock(1,win)
+end
+
+MPI.Barrier(comm)
+
+if rank == 0
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 0, 0, win)
+  fill!(buf, 2)
+  MPI.Win_unlock(0,win)
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 1, 0, win)
+  result = similar(buf)
+  MPI.Get_accumulate(buf, result, length(buf), 1, 0, MPI.SUM, win)
+  MPI.Win_unlock(1,win)
+  @test all(result .== 3)
+end
+
+MPI.Barrier(comm)
+
+if rank == 1
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 1, 0, win)
+  @test all(buf .== 5)
+  fill!(buf,-2)
+  MPI.Win_unlock(1,win)
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 0, 0, win)
+  MPI.Accumulate(buf, length(buf), 0, 0, MPI.SUM, win)
+  MPI.Win_unlock(0,win)
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 1, 0, win)
+  fill!(buf,1)
+  MPI.Win_unlock(1,win)
+end
+
+MPI.Barrier(comm)
+
+if rank == 0
+  MPI.Win_lock(MPI.LOCK_EXCLUSIVE, 0, 0, win)
+  @test all(buf .== 0)
+  MPI.Win_unlock(0,win)
+end
+
 MPI.Barrier(comm)
 MPI.Win_free(win)
 MPI.Barrier(comm)