Merge pull request #70 from JuliaParallel/anj/05

Update to 0.5 changes. The factor function is now in the Primes.jl

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.4
 Compat 0.7.14
+Primes

src/DistributedArrays.jl

@@ -1,15 +1,16 @@
-VERSION >= v"0.4.0-dev+6521" && __precompile__(true)
-
-# TODO
-# - avoid temporary darrays being created by sum, mean, std, etc when called along specific dimensions
-
+__precompile__(true)
 
 module DistributedArrays
 
 using Compat
 
+if VERSION >= v"0.5.0-dev+4340"
+    using Primes
+    using Primes: factor
+end
+
 if VERSION < v"0.5.0-"
-typealias Future RemoteRef
+    typealias Future RemoteRef
 end
 
 importall Base
@@ -675,7 +676,7 @@ function _mapreduce(f, opt, d::DArray)
     end
     reduce(opt, results)
 end
-Base.mapreduce(f, opt::Union{typeof(@functorize |), typeof(@functorize &)}, d::DArray) = _mapreduce(f, opt, d)
+Base.mapreduce(f, opt::Union{typeof(@functorize(|)), typeof(@functorize(&))}, d::DArray) = _mapreduce(f, opt, d)
 Base.mapreduce(f, opt::Function, d::DArray) = _mapreduce(f, opt, d)
 Base.mapreduce(f, opt, d::DArray) = _mapreduce(f, opt, d)
 
@@ -760,6 +761,9 @@ Base.scale!(A::DArray, x::Number) = begin
     return A
 end
 
+# TODO
+# - avoid temporary darrays being created by sum, mean, std, etc when called along specific dimensions
+
 # reduce like
 for (fn, fr) in ((:sum, :+),
                  (:prod, :*),
@@ -783,7 +787,7 @@ for (fn, fr) in ((:any, :|),
                  (:all, :&),
                  (:count, :+))
     @eval begin
-        (Base.$fn)(f::typeof(@functorize identity), d::DArray) = mapreduce(f, @functorize($fr), d)
+        (Base.$fn)(f::typeof(@functorize(identity)), d::DArray) = mapreduce(f, @functorize($fr), d)
         (Base.$fn)(f::Base.Predicate, d::DArray) = mapreduce(f, @functorize($fr), d)
         # (Base.$fn)(f::Base.Func{1}, d::DArray) = mapreduce(f, @functorize $fr, d)
         (Base.$fn)(f::Callable, d::DArray) = mapreduce(f, @functorize($fr), d)
@@ -1037,7 +1041,7 @@ function dot(x::DVector, y::DVector)
             @async push!(results, remotecall_fetch((x, y, i) -> dot(localpart(x), fetch(y, i)), x.pids[i], x, y, i))
         end
     end
-    return reduce(@functorize +, results)
+    return reduce(@functorize(+), results)
 end
 
 function norm(x::DVector, p::Real = 2)

test/REQUIRE

@@ -1 +1,2 @@
 FactCheck 0.2.3-
+StatsBase

test/darray.jl

@@ -568,12 +568,20 @@ check_leaks()
 # Commented out tests that need to be enabled in due course when DArray support is more complete
 facts("test mapslices") do
     a = drand((5,5), workers(), [1, min(nworkers(), 5)])
-    h = mapslices(v -> hist(v,0:0.1:1)[2], a, 1)
+    if VERSION < v"0.5.0-dev+4361"
+        h = mapslices(v -> hist(v,0:0.1:1)[2], a, 1)
+    else
+        h = mapslices(v -> fit(Histogram,v,0:0.1:1).weights, a, 1)
+    end
 #    H = mapslices(v -> hist(v,0:0.1:1)[2], a, 2)
 #    s = mapslices(sort, a, [1])
 #    S = mapslices(sort, a, [2])
     for i = 1:5
-        @fact h[:,i] --> hist(a[:,i],0:0.1:1)[2]
+        if VERSION < v"0.5.0-dev+4361"
+            @fact h[:,i] --> hist(a[:,i],0:0.1:1)[2]
+        else
+            @fact h[:,i] --> fit(Histogram, a[:,i],0:0.1:1).weights
+        end
 #        @fact vec(H[i,:]) => hist(vec(a[i,:]),0:0.1:1)[2]
 #        @fact s[:,i] => sort(a[:,i])
 #        @fact vec(S[i,:]) => sort(vec(a[i,:]))

test/runtests.jl

@@ -1,6 +1,6 @@
 # add at least 3 worker processes
 if nworkers() < 3
-    n = max(3, min(8, CPU_CORES))
+    n = max(3, min(8, Sys.CPU_CORES))
     addprocs(n; exeflags=`--check-bounds=yes`)
 end
 @assert nprocs() > 3
@@ -10,8 +10,9 @@ end
 # https://github.com/JuliaLang/julia/issues/15766. Move back to top when bug is fixed.
 using FactCheck
 using DistributedArrays
+using StatsBase # for fit(Histogram, ...)
+@everywhere using StatsBase # because exported functions are not exported on workers with using
 
-@everywhere blas_set_num_threads(1)
 @everywhere srand(123 + myid())
 
 include("darray.jl")