Skip to content

Commit 55f2cf0

Browse files
author
Rene Donner
committed
fix sharedarray indexing regression
1 parent b3a1be5 commit 55f2cf0

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

base/sharedarray.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,9 @@ end
280280
convert(::Type{Array}, S::SharedArray) = S.s
281281

282282
# pass through getindex and setindex! - unlike DArrays, these always work on the complete array
283-
getindex(S::SharedArray, I::Real) = getindex(S.s, I)
283+
getindex(S::SharedArray, i::Real) = getindex(S.s, i)
284284

285-
setindex!(S::SharedArray, x, I::Real) = setindex!(S.s, x, I)
285+
setindex!(S::SharedArray, x, i::Real) = setindex!(S.s, x, i)
286286

287287
function fill!(S::SharedArray, v)
288288
vT = convert(eltype(S), v)
@@ -334,10 +334,10 @@ function shmem_randn(dims; kwargs...)
334334
end
335335
shmem_randn(I::Int...; kwargs...) = shmem_randn(I; kwargs...)
336336

337-
similar(S::SharedArray, T, dims::Dims) = SharedArray(T, dims; pids=procs(S))
338-
similar(S::SharedArray, T) = similar(S, T, size(S))
339-
similar(S::SharedArray, dims::Dims) = similar(S, eltype(S), dims)
340-
similar(S::SharedArray) = similar(S, eltype(S), size(S))
337+
similar(S::SharedArray, T, dims::Dims) = similar(S.s, T, dims)
338+
similar(S::SharedArray, T) = similar(S.s, T, size(S))
339+
similar(S::SharedArray, dims::Dims) = similar(S.s, eltype(S), dims)
340+
similar(S::SharedArray) = similar(S.s, eltype(S), size(S))
341341

342342
map(f, S::SharedArray) = (S2 = similar(S); S2[:] = S[:]; map!(f, S2); S2)
343343

test/parallel.jl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ for p in procs(d)
9797
@test d[idxl] == p
9898
end
9999

100+
d = SharedArray(Float64, (2,3))
101+
@test isa(d[:,2], Vector{Float64})
102+
100103
### SharedArrays from a file
101104

102105
# Mapping an existing file

0 commit comments

Comments
 (0)