do not pass pid 1 as first pid to check_same_host

works around julialang issue JuliaLang/julia#26699 when running across multiple machines
JuliaParallel · Apr 5, 2018 · 867b543 · 867b543
1 parent e7ca616
commit 867b543
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/array/sort.jl b/src/array/sort.jl
@@ -120,9 +120,8 @@ end
 const use_shared_array = Ref(true)
 function _promote_array{T,S}(x::AbstractArray{T}, y::AbstractArray{S})
     Q = promote_type(T,S)
-    samehost = Distributed.check_same_host(procs())
     ok = (isa(x, Array) || isa(x, SharedArray)) && (isa(y, Array) || isa(y, SharedArray))
-    if use_shared_array[] && samehost && ok && isbits(Q)
+    if ok && isbits(Q) && use_shared_array[] && Distributed.check_same_host([workers()..., 1])
         return SharedArray{Q}(length(x)+length(y), pids=procs())
     else
         return similar(x, Q, length(x)+length(y))

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -5,5 +5,7 @@ using Dagger
 
 include("domain.jl")
 include("array.jl")
+println(STDERR, "tests done. cleaning up...")
 Dagger.cleanup()
 #include("cache.jl")
+println(STDERR, "all done.")