Merge pull request #135 from JuliaParallel/amitm/fixfor0.6

Define a hash function for DArray
JuliaParallel · May 5, 2017 · 12a9596 · 12a9596
2 parents f707410 + 0a70e38
commit 12a9596
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/darray.jl b/src/darray.jl
@@ -66,6 +66,8 @@ localtype{T,N,D}(::Type{SubDArray{T,N,D}}) = localtype(D)
 localtype(A::SubOrDArray) = localtype(typeof(A))
 localtype(A::AbstractArray) = typeof(A)
 
+Base.hash(d::DArray, h::UInt) = Base.hash(d.id, h)
+
 ## core constructors ##
 
 function DArray(id, init, dims, pids, idxs, cuts)

diff --git a/test/darray.jl b/test/darray.jl
@@ -1,6 +1,6 @@
 using SpecialFunctions
 
-@testset "test distribute" begin
+@testset "test distribute and other constructors" begin
     A = rand(1:100, (100,100))
 
     @testset "test default distribute" begin
@@ -40,6 +40,11 @@ using SpecialFunctions
         close(DA1)
         close(DA2)
     end
+
+    @testset "Global DArray serialization issue #134" begin
+        global A134 = drandn(1)
+        @test DArray(I -> DistributedArrays.localpart(A134), A134) == A134
+    end
 end
 
 check_leaks()