Wrapped Iscatter{v}

Author: kshyatt

deps/CMakeLists.txt

@@ -61,6 +61,8 @@ FortranCInterface_HEADER(jlmpi_f2c.h MACRO_NAMESPACE "JLMPI_" SYMBOLS
   MPI_INITIALIZED
   MPI_IPROBE
   MPI_IRECV
+  MPI_ISCATTER
+  MPI_ISCATTERV
   MPI_ISEND
   MPI_OP_CREATE
   MPI_OP_FREE

deps/gen_functions.c

@@ -49,6 +49,8 @@ int main(int argc, char *argv[]) {
   printf("    :MPI_INITIALIZED        => \"%s\",\n", STRING(MPI_INITIALIZED));
   printf("    :MPI_IPROBE             => \"%s\",\n", STRING(MPI_IPROBE));
   printf("    :MPI_IRECV              => \"%s\",\n", STRING(MPI_IRECV));
+  printf("    :MPI_ISCATTER           => \"%s\",\n", STRING(MPI_ISCATTER));
+  printf("    :MPI_ISCATTERV          => \"%s\",\n", STRING(MPI_ISCATTERV));
   printf("    :MPI_ISEND              => \"%s\",\n", STRING(MPI_ISEND));
   printf("    :MPI_OP_CREATE          => \"%s\",\n", STRING(MPI_OP_CREATE));
   printf("    :MPI_OP_FREE            => \"%s\",\n", STRING(MPI_OP_FREE));

src/mpi-base.jl

@@ -556,6 +556,16 @@ function Scatter{T}(sendbuf::MPIBuffertype{T},
     recvbuf
 end
 
+function Iscatter{T}(sendbuf::MPIBuffertype{T},
+                     count::Integer, root::Integer, comm::Comm)
+    rval = Ref{Cint}()
+    recvbuf = Array(T, count)
+    ccall(MPI_ISCATTER, Void,
+          (Ptr{T}, Ptr{Cint}, Ptr{Cint}, Ptr{T}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
+          sendbuf, &count, &mpitype(T), recvbuf, &count, &mpitype(T), &root, &comm.val, rval, &0)
+    Request(rval[], sendbuf), recvbuf
+end
+
 function Scatterv{T}(sendbuf::MPIBuffertype{T},
                      counts::Vector{Cint}, root::Integer,
                      comm::Comm)
@@ -568,6 +578,19 @@ function Scatterv{T}(sendbuf::MPIBuffertype{T},
     recvbuf
 end
 
+function Iscatterv{T}(sendbuf::MPIBuffertype{T},
+                      counts::Vector{Cint}, root::Integer,
+                      comm::Comm)
+    rval = Ref{Cint}()
+    recvbuf = Array(T, counts[Comm_rank(comm) + 1])
+    recvcnt = counts[Comm_rank(comm) + 1]
+    disps = cumsum(counts) - counts
+    ccall(MPI_ISCATTERV, Void,
+          (Ptr{T}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{T}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}, Ptr{Cint}),
+          sendbuf, counts, disps, &mpitype(T), recvbuf, &recvcnt, &mpitype(T), &root, &comm.val, rval, &0)
+    Request(rval[], sendbuf), recvbuf
+end
+
 function Gather{T}(sendbuf::MPIBuffertype{T}, count::Integer,
                    root::Integer, comm::Comm)
     isroot = Comm_rank(comm) == root

test/test_scatter.jl

@@ -14,6 +14,19 @@ function scatter_array(A, root)
     C = MPI.Scatter(B, 1, root, comm)
 end
 
+function iscatter_array(A, root)
+    comm = MPI.COMM_WORLD
+    T = eltype(A)
+    if MPI.Comm_rank(comm) == root
+        B = copy(A)
+    else
+        B = Array(T,1)
+    end
+    req, C = MPI.Iscatter(B, 1, root, comm)
+    MPI.Wait!(req)
+    C
+end
+
 comm = MPI.COMM_WORLD
 root = 0
 
@@ -24,6 +37,9 @@ for typ in MPI.MPIDatatype.types
     A = convert(Vector{typ},collect(1:MPI.Comm_size(comm)))
     B = scatter_array(A, root)
     @test B[1] == convert(typ,MPI.Comm_rank(comm) + 1)
+    A = convert(Vector{typ},collect(1:MPI.Comm_size(comm)))
+    B = iscatter_array(A, root)
+    @test B[1] == convert(typ,MPI.Comm_rank(comm) + 1)
 end
 
 MPI.Finalize()

test/test_scatterv.jl

@@ -14,6 +14,19 @@ function scatterv_array(A, counts::Vector{Cint}, root)
     C = MPI.Scatterv(B, counts, root, comm)
 end
 
+function iscatterv_array(A, counts::Vector{Cint}, root)
+    comm = MPI.COMM_WORLD
+    T = eltype(A)
+    if MPI.Comm_rank(comm) == root
+        B = copy(A)
+    else
+        B = Array(T,1)
+    end
+    req, C = MPI.Iscatterv(B, counts, root, comm)
+    MPI.Wait!(req)
+    C
+end
+
 comm = MPI.COMM_WORLD
 size = MPI.Comm_size(comm)
 rank = MPI.Comm_rank(comm)
@@ -23,11 +36,14 @@ root = 0
 Base.one(::Type{Char}) = '\01'
 
 for typ in MPI.MPIDatatype.types
-
     A = ones(typ, 3 * div(size,2) + mod(size,2))
     counts = Cint[ mod(i,2) + 1 for i in 0:(size-1)]
     B = scatterv_array(A, counts, root)
     @test B == ones(typ, mod(rank,2) + 1)
+    A = ones(typ, 3 * div(size,2) + mod(size,2))
+    counts = Cint[ mod(i,2) + 1 for i in 0:(size-1)]
+    B = iscatterv_array(A, counts, root)
+    @test B == ones(typ, mod(rank,2) + 1)
 end
 
 MPI.Finalize()