Merge pull request #144 from JuliaParallel/anj/axpy

Make axpy! work for arrays of arbitrary dimensionality

Author: andreasnoack

src/linalg.jl

@@ -19,12 +19,15 @@ const DMatrix{T,A} = DArray{T,2,A}
 
 # Level 1
 
-function axpy!(α, x::DVector, y::DVector)
+function axpy!(α, x::DArray, y::DArray)
     if length(x) != length(y)
         throw(DimensionMismatch("vectors must have same length"))
     end
-    @sync for p in procs(y)
-        @async remotecall_fetch(() -> (Base.axpy!(α, localpart(x), localpart(y)); nothing), p)
+    asyncmap(procs(y)) do p
+        @async remotecall_fetch(p) do
+            Base.axpy!(α, localpart(x), localpart(y))
+            return nothing
+        end
     end
     return y
 end

test/darray.jl

@@ -824,13 +824,15 @@ end
 check_leaks()
 
 @testset "test axpy!" begin
-    x = drandn(20)
-    y = drandn(20)
+    for (x, y) in ((drandn(20), drandn(20)),
+                   (drandn(20, 2), drandn(20, 2)))
+
+        @test Array(LinAlg.axpy!(2.0, x, copy(y))) ≈ LinAlg.axpy!(2.0, Array(x), Array(y))
+        @test_throws DimensionMismatch LinAlg.axpy!(2.0, x, zeros(length(x) + 1))
+        close(x)
+        close(y)
+    end
 
-    @test norm(convert(Array, LinAlg.axpy!(2.0, x, copy(y))) - LinAlg.axpy!(2.0, convert(Array, x), convert(Array, y))) < sqrt(eps())
-    @test_throws DimensionMismatch LinAlg.axpy!(2.0, x, zeros(length(x) + 1))
-    close(x)
-    close(y)
     d_closeall()  # close the temporaries created above
 end