Merge pull request #110 from fverdugo/fix_gather

Fix gather

Author: fverdugo

src/mpi_array.jl

@@ -296,8 +296,10 @@ end
 function gather_impl!(
     rcv::MPIArray, snd::MPIArray,
     destination, ::Type{T}) where T <: AbstractVector
+    Tv = eltype(snd.item)
     @assert rcv.comm === snd.comm
     @assert isa(rcv.item,JaggedArray)
+    @assert eltype(eltype(rcv.item)) == Tv
     comm = snd.comm
     if isa(destination,Integer)
         root = destination-1
@@ -308,14 +310,14 @@ function gather_impl!(
             rcv_buffer = MPI.VBuffer(rcv.item.data,counts)
             MPI.Gatherv!(MPI.IN_PLACE,rcv_buffer,root,comm)
         else
-            MPI.Gatherv!(snd.item,nothing,root,comm)
+            MPI.Gatherv!(convert(Vector{Tv},snd.item),nothing,root,comm)
         end
     else
         @assert destination === :all
         @assert length(rcv.item) == MPI.Comm_size(comm)
         counts = ptrs_to_counts(rcv.item.ptrs)
         rcv_buffer = MPI.VBuffer(rcv.item.data,counts)
-        MPI.Allgatherv!(snd.item,rcv_buffer,comm)
+        MPI.Allgatherv!(convert(Vector{Tv},snd.item),rcv_buffer,comm)
     end
     rcv
 end
@@ -541,18 +543,18 @@ function exchange_impl!(
 end
 
 # This should go eventually into MPI.jl! 
-Issend(data, comm::MPI.Comm, req::MPI.AbstractRequest=MPI.Request(); dest::Integer, tag::Integer=0) =
+Issend(data, comm::MPI.Comm, req=MPI.Request(); dest::Integer, tag::Integer=0) =
     Issend(data, dest, tag, comm, req)
 
-function Issend(buf::MPI.Buffer, dest::Integer, tag::Integer, comm::MPI.Comm, req::MPI.AbstractRequest=MPI.Request())
+function Issend(buf::MPI.Buffer, dest::Integer, tag::Integer, comm::MPI.Comm, req=MPI.Request())
     @assert MPI.isnull(req)
     # int MPI_Issend(const void* buf, int count, MPI_Datatype datatype, int dest,
     #               int tag, MPI_Comm comm, MPI_Request *request)
     MPI.API.MPI_Issend(buf.data, buf.count, buf.datatype, dest, tag, comm, req)
     MPI.setbuffer!(req, buf)
     return req
 end
-Issend(data, dest::Integer, tag::Integer, comm::MPI.Comm, req::MPI.AbstractRequest=MPI.Request()) =
+Issend(data, dest::Integer, tag::Integer, comm::MPI.Comm, req=MPI.Request()) =
     Issend(MPI.Buffer_send(data), dest, tag, comm, req)
 
 

test/mpi_array/drivers/mpi_array_tests.jl

@@ -1,12 +1,26 @@
 module MPIArrayTests
 
 using PartitionedArrays
+using Test
 
 with_mpi() do distribute
     rank = distribute(LinearIndices((4,)))
     display(rank)
     rank = distribute(LinearIndices((2,2)))
     display(rank)
+
+    n = 4
+    row_partition = uniform_partition(rank,n)
+    my_own_to_global = map(own_to_global,row_partition)
+    ids = gather(my_own_to_global)
+    map_main(ids) do myids
+        @test myids == [[1],[2],[3],[4]]
+    end
+    ids = gather(my_own_to_global,destination=:all)
+    map(ids) do myids
+        @test myids == [[1],[2],[3],[4]]
+    end
+
 end
 
 end # module