Skip to content

Commit

Permalink
Merge pull request #10486 from amitmurthy/amitm/rm_darray_comp
Browse files Browse the repository at this point in the history
remove darray construction from comprehension in @parallel
  • Loading branch information
jakebolewski committed Mar 12, 2015
2 parents 5b6468a + 50c96a7 commit 165f1c6
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
5 changes: 0 additions & 5 deletions base/linalg/distributed.jl

This file was deleted.

12 changes: 0 additions & 12 deletions base/multi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1473,18 +1473,6 @@ macro parallel(args...)
na = length(args)
if na==1
loop = args[1]
if isa(loop,Expr) && loop.head === :comprehension
ex = loop.args[1]
loop.args[1] = esc(ex)
nd = length(loop.args)-1
ranges = map(e->esc(e.args[2]), loop.args[2:end])
for i=1:nd
var = loop.args[1+i].args[1]
loop.args[1+i] = :( $(esc(var)) = ($(ranges[i]))[I[$i]] )
end
return :( DArray((I::(UnitRange{Int}...))->($loop),
tuple($(map(r->:(length($r)),ranges)...))) )
end
elseif na==2
reducer = args[1]
loop = args[2]
Expand Down

0 comments on commit 165f1c6

Please sign in to comment.