Skip to content

Commit 8e16562

Browse files
committed
Don't use deprecated Array syntax
1 parent 5c3ffd1 commit 8e16562

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/darray.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ type DArray{T,N,A} <: AbstractArray{T,N}
5656
end
5757

5858
eltype{T}(::Type{DArray{T}}) = T
59-
empty_localpart(T,N,A) = convert(A, Array(T, ntuple(zero, N)))
59+
empty_localpart(T,N,A) = convert(A, Array{T}(ntuple(zero, N)))
6060

6161
typealias SubDArray{T,N,D<:DArray} SubArray{T,N,D}
6262
typealias SubOrDArray{T,N} Union{DArray{T,N}, SubDArray{T,N}}
@@ -177,14 +177,14 @@ function DArray(refs)
177177
id = next_did()
178178

179179
npids = [r.where for r in refs]
180-
nsizes = Array(Tuple, dimdist)
180+
nsizes = Array{Tuple}(dimdist)
181181
@sync for i in 1:length(refs)
182182
let i=i
183183
@async nsizes[i] = remotecall_fetch(sz_localpart_ref, npids[i], refs[i], id)
184184
end
185185
end
186186

187-
nindexes = Array(NTuple{length(dimdist),UnitRange{Int}}, dimdist...)
187+
nindexes = Array{NTuple{length(dimdist),UnitRange{Int}}}(dimdist...)
188188

189189
for i in 1:length(nindexes)
190190
subidx = ind2sub(dimdist, i)
@@ -231,7 +231,7 @@ DArray(init, d::DArray) = DArray(next_did(), init, size(d), procs(d), d.indexes,
231231

232232
sz_localpart_ref(ref, id) = size(fetch(ref))
233233

234-
Base.similar(d::DArray, T::Type, dims::Dims) = DArray(I->Array(T, map(length,I)), dims, procs(d))
234+
Base.similar(d::DArray, T::Type, dims::Dims) = DArray(I->Array{T}(map(length,I)), dims, procs(d))
235235
Base.similar(d::DArray, T::Type) = similar(d, T, size(d))
236236
Base.similar{T}(d::DArray{T}, dims::Dims) = similar(d, T, dims)
237237
Base.similar{T}(d::DArray{T}) = similar(d, T, size(d))
@@ -284,7 +284,7 @@ end
284284
function chunk_idxs(dims, chunks)
285285
cuts = map(defaultdist, dims, chunks)
286286
n = length(dims)
287-
idxs = Array(NTuple{n,UnitRange{Int}},chunks...)
287+
idxs = Array{NTuple{n,UnitRange{Int}}}(chunks...)
288288
for cidx in CartesianRange(tuple(chunks...))
289289
idxs[cidx.I...] = ntuple(i -> (cuts[i][cidx[i]]:cuts[i][cidx[i] + 1] - 1), n)
290290
end
@@ -456,7 +456,7 @@ end
456456
Base.convert{T,N,S<:AbstractArray}(::Type{DArray{T,N,S}}, A::S) = distribute(convert(AbstractArray{T,N}, A))
457457

458458
Base.convert{S,T,N}(::Type{Array{S,N}}, d::DArray{T,N}) = begin
459-
a = Array(S, size(d))
459+
a = Array{S}(size(d))
460460
@sync begin
461461
for i = 1:length(d.pids)
462462
@async a[d.indexes[i]...] = chunk(d, i)
@@ -475,7 +475,7 @@ Base.convert{S,T,N}(::Type{Array{S,N}}, s::SubDArray{T,N}) = begin
475475
return chunk(d, l...)
476476
end
477477
end
478-
a = Array(S, size(s))
478+
a = Array{S}(size(s))
479479
a[[1:size(a,i) for i=1:N]...] = s
480480
return a
481481
end
@@ -484,7 +484,7 @@ function Base.convert{T,N}(::Type{DArray}, SD::SubArray{T,N})
484484
D = SD.parent
485485
DArray(size(SD), procs(D)) do I
486486
TR = typeof(SD.indexes[1])
487-
lindices = Array(TR, 0)
487+
lindices = Array{TR}(0)
488488
for (i,r) in zip(I, SD.indexes)
489489
st = step(r)
490490
lrstart = first(r) + st*(first(i)-1)
@@ -508,7 +508,7 @@ Base.reshape{T,S<:Array}(A::DArray{T,1,S}, d::Dims) = begin
508508
d1offs = first(I[1])
509509
nd = length(I)
510510

511-
B = Array(T,sz)
511+
B = Array{T}(sz)
512512
nr = size(B,1)
513513
sztail = size(B)[2:end]
514514

0 commit comments

Comments
 (0)