Skip to content

Commit 166642e

Browse files
authored
Merge pull request #86 from JuliaParallel/anj/testset
Use testsets instead of FactCheck.
2 parents 1201e25 + 92065df commit 166642e

File tree

4 files changed

+276
-289
lines changed

4 files changed

+276
-289
lines changed

src/DistributedArrays.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -911,13 +911,17 @@ for f in (:+, :-, :div, :mod, :rem, :&, :|, :$)
911911
B = samedist(A, B)
912912
map_localparts($f, A, B)
913913
end
914+
($f){T}(A::DArray{T}, B::Array{T}) = ($f)(A, distribute(B, A))
915+
($f){T}(A::Array{T}, B::DArray{T}) = ($f)(distribute(A, B), B)
914916
end
915917
end
916918
for f in (:.+, :.-, :.*, :./, :.%, :.<<, :.>>)
917919
@eval begin
918920
function ($f){T}(A::DArray{T}, B::DArray{T})
919921
map_localparts($f, A, B)
920922
end
923+
($f){T}(A::DArray{T}, B::Array{T}) = ($f)(A, distribute(B, A))
924+
($f){T}(A::Array{T}, B::DArray{T}) = ($f)(distribute(A, B), B)
921925
end
922926
end
923927

test/REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
FactCheck 0.2.3-
21
StatsBase
2+
BaseTestNext

0 commit comments

Comments
 (0)