@@ -56,7 +56,7 @@ type DArray{T,N,A} <: AbstractArray{T,N}
56
56
end
57
57
58
58
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)))
60
60
61
61
typealias SubDArray{T,N,D<: DArray } SubArray{T,N,D}
62
62
typealias SubOrDArray{T,N} Union{DArray{T,N}, SubDArray{T,N}}
@@ -177,14 +177,14 @@ function DArray(refs)
177
177
id = next_did ()
178
178
179
179
npids = [r. where for r in refs]
180
- nsizes = Array ( Tuple, dimdist)
180
+ nsizes = Array { Tuple} ( dimdist)
181
181
@sync for i in 1 : length (refs)
182
182
let i= i
183
183
@async nsizes[i] = remotecall_fetch (sz_localpart_ref, npids[i], refs[i], id)
184
184
end
185
185
end
186
186
187
- nindexes = Array ( NTuple{length (dimdist),UnitRange{Int}}, dimdist... )
187
+ nindexes = Array { NTuple{length(dimdist),UnitRange{Int}}} ( dimdist... )
188
188
189
189
for i in 1 : length (nindexes)
190
190
subidx = ind2sub (dimdist, i)
@@ -231,7 +231,7 @@ DArray(init, d::DArray) = DArray(next_did(), init, size(d), procs(d), d.indexes,
231
231
232
232
sz_localpart_ref (ref, id) = size (fetch (ref))
233
233
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))
235
235
Base. similar (d:: DArray , T:: Type ) = similar (d, T, size (d))
236
236
Base. similar {T} (d:: DArray{T} , dims:: Dims ) = similar (d, T, dims)
237
237
Base. similar {T} (d:: DArray{T} ) = similar (d, T, size (d))
284
284
function chunk_idxs (dims, chunks)
285
285
cuts = map (defaultdist, dims, chunks)
286
286
n = length (dims)
287
- idxs = Array ( NTuple{n,UnitRange{Int}}, chunks... )
287
+ idxs = Array { NTuple{n,UnitRange{Int}}} ( chunks... )
288
288
for cidx in CartesianRange (tuple (chunks... ))
289
289
idxs[cidx. I... ] = ntuple (i -> (cuts[i][cidx[i]]: cuts[i][cidx[i] + 1 ] - 1 ), n)
290
290
end
456
456
Base. convert {T,N,S<:AbstractArray} (:: Type{DArray{T,N,S}} , A:: S ) = distribute (convert (AbstractArray{T,N}, A))
457
457
458
458
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))
460
460
@sync begin
461
461
for i = 1 : length (d. pids)
462
462
@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
475
475
return chunk (d, l... )
476
476
end
477
477
end
478
- a = Array (S, size (s))
478
+ a = Array {S} ( size (s))
479
479
a[[1 : size (a,i) for i= 1 : N]. .. ] = s
480
480
return a
481
481
end
@@ -484,7 +484,7 @@ function Base.convert{T,N}(::Type{DArray}, SD::SubArray{T,N})
484
484
D = SD. parent
485
485
DArray (size (SD), procs (D)) do I
486
486
TR = typeof (SD. indexes[1 ])
487
- lindices = Array (TR, 0 )
487
+ lindices = Array {TR} ( 0 )
488
488
for (i,r) in zip (I, SD. indexes)
489
489
st = step (r)
490
490
lrstart = first (r) + st* (first (i)- 1 )
@@ -508,7 +508,7 @@ Base.reshape{T,S<:Array}(A::DArray{T,1,S}, d::Dims) = begin
508
508
d1offs = first (I[1 ])
509
509
nd = length (I)
510
510
511
- B = Array (T, sz)
511
+ B = Array {T} ( sz)
512
512
nr = size (B,1 )
513
513
sztail = size (B)[2 : end ]
514
514
0 commit comments