Skip to content

Commit 7e8ef28

Browse files
authored
Merge pull request #128 from JuliaParallel/amitm/0.6fixes
Fixes for Julia 0.6
2 parents 579fcdd + 56cde9a commit 7e8ef28

File tree

3 files changed

+81
-93
lines changed

3 files changed

+81
-93
lines changed

src/sort.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function sample_n_setup_ref(d::DVector, sample_size; kwargs...)
1414
end
1515

1616

17-
function scatter_n_sort_localparts{T}(d, myidx, refs::Array{RemoteChannel}, boundaries::Array{T}; by = identity, kwargs...)
17+
function scatter_n_sort_localparts{T}(d, myidx, refs, boundaries::Array{T}; by = identity, kwargs...)
1818
if d==nothing
1919
sorted = take!(refs[myidx]) # First entry in the remote channel is sorted localpart
2020
else
@@ -73,7 +73,7 @@ function compute_boundaries{T}(d::DVector{T}; kwargs...)
7373
sort!(samples; kwargs...)
7474
samples[1] = typemin(T)
7575

76-
refs=RemoteChannel[x[2] for x in results]
76+
refs=[x[2] for x in results]
7777

7878
boundaries = samples[[1+(x-1)*div(length(samples), np) for x in 1:np]]
7979
push!(boundaries, typemax(T))
@@ -150,7 +150,7 @@ function Base.sort{T}(d::DVector{T}; sample=true, kwargs...)
150150
push!(boundaries, typemax(T))
151151
presorted=false
152152

153-
refs=RemoteChannel[RemoteChannel(p) for p in procs(d)]
153+
refs=[RemoteChannel(p) for p in procs(d)]
154154
else
155155
throw(ArgumentError("keyword arg `sample` must be Boolean, Tuple(Min,Max) or an actual sample of data : " * string(sample)))
156156
end

0 commit comments

Comments
 (0)