11function Base. ctranspose {T} (D:: DArray{T,2} )
22 DArray (reverse (size (D)), procs (D)) do I
3- lp = Array (T, map (length, I))
3+ lp = Array {T} ( map (length, I))
44 rp = convert (Array, D[reverse (I)... ])
55 ctranspose! (lp, rp)
66 end
77end
88
99function Base. transpose {T} (D:: DArray{T,2} )
1010 DArray (reverse (size (D)), procs (D)) do I
11- lp = Array (T, map (length, I))
11+ lp = Array {T} ( map (length, I))
1212 rp = convert (Array, D[reverse (I)... ])
1313 transpose! (lp, rp)
1414 end
@@ -91,7 +91,7 @@ function A_mul_B!(α::Number, A::DMatrix, x::AbstractVector, β::Number, y::DVec
9191 end
9292
9393 # Multiply on each tile of A
94- R = Array ( Future, size (A. pids)... )
94+ R = Array { Future} ( size (A. pids)... )
9595 for j = 1 : size (A. pids, 2 )
9696 xj = x[A. cuts[2 ][j]: A. cuts[2 ][j + 1 ] - 1 ]
9797 for i = 1 : size (A. pids, 1 )
@@ -135,7 +135,7 @@ function Ac_mul_B!(α::Number, A::DMatrix, x::AbstractVector, β::Number, y::DVe
135135 end
136136
137137 # Multiply on each tile of A
138- R = Array ( Future, reverse (size (A. pids))... )
138+ R = Array { Future} ( reverse (size (A. pids))... )
139139 for j = 1 : size (A. pids, 1 )
140140 xj = x[A. cuts[1 ][j]: A. cuts[1 ][j + 1 ] - 1 ]
141141 for i = 1 : size (A. pids, 2 )
@@ -201,9 +201,9 @@ function _matmatmul!(α::Number, A::DMatrix, B::AbstractMatrix, β::Number, C::D
201201
202202 # Multiply on each tile of A
203203 if tA == ' N'
204- R = Array ( Future, size (procs (A))... , size (procs (C), 2 ))
204+ R = Array { Future} ( size (procs (A))... , size (procs (C), 2 ))
205205 else
206- R = Array ( Future, reverse (size (procs (A)))... , size (procs (C), 2 ))
206+ R = Array { Future} ( reverse (size (procs (A)))... , size (procs (C), 2 ))
207207 end
208208 for j = 1 : size (A. pids, Ad2)
209209 for k = 1 : size (C. pids, 2 )
@@ -258,12 +258,12 @@ _matmul_op = (t,s) -> t*s + t*s
258258
259259function (* )(A:: DMatrix , x:: AbstractVector )
260260 T = Base. promote_op (_matmul_op, eltype (A), eltype (x))
261- y = DArray (I -> Array (T, map (length, I)), (size (A, 1 ),), procs (A)[:,1 ], (size (procs (A), 1 ),))
261+ y = DArray (I -> Array {T} ( map (length, I)), (size (A, 1 ),), procs (A)[:,1 ], (size (procs (A), 1 ),))
262262 return A_mul_B! (one (T), A, x, zero (T), y)
263263end
264264function (* )(A:: DMatrix , B:: AbstractMatrix )
265265 T = Base. promote_op (_matmul_op, eltype (A), eltype (B))
266- C = DArray (I -> Array (T, map (length, I)),
266+ C = DArray (I -> Array {T} ( map (length, I)),
267267 (size (A, 1 ), size (B, 2 )),
268268 procs (A)[:,1 : min (size (procs (A), 2 ), size (procs (B), 2 ))],
269269 (size (procs (A), 1 ), min (size (procs (A), 2 ), size (procs (B), 2 ))))
@@ -272,15 +272,15 @@ end
272272
273273function Ac_mul_B (A:: DMatrix , x:: AbstractVector )
274274 T = Base. promote_op (_matmul_op, eltype (A), eltype (x))
275- y = DArray (I -> Array (T, map (length, I)),
275+ y = DArray (I -> Array {T} ( map (length, I)),
276276 (size (A, 2 ),),
277277 procs (A)[1 ,:],
278278 (size (procs (A), 2 ),))
279279 return Ac_mul_B! (one (T), A, x, zero (T), y)
280280end
281281function Ac_mul_B (A:: DMatrix , B:: AbstractMatrix )
282282 T = Base. promote_op (_matmul_op, eltype (A), eltype (B))
283- C = DArray (I -> Array (T, map (length, I)), (size (A, 2 ),
283+ C = DArray (I -> Array {T} ( map (length, I)), (size (A, 2 ),
284284 size (B, 2 )),
285285 procs (A)[1 : min (size (procs (A), 1 ), size (procs (B), 2 )),:],
286286 (size (procs (A), 2 ), min (size (procs (A), 1 ), size (procs (B), 2 ))))
0 commit comments