Moved randjump(::MersenneTwister, ::steps) out of Future and placed it into Random.

Implemented set_nthreads!() to allocate ThreadRNG at init.

Author: fisiognomico

base/threads.jl

@@ -29,4 +29,22 @@ function resize_nthreads!(A::AbstractVector, copyvalue=A[1])
     return A
 end
 
+"""
+	set_nthreads!(A, origarray::AbstracVector)
+Similar to `resize_nthreads!` but makes a deepcopy per value of the origin array.
+
+If `length(origarray)` is not equal to [`nthreads()`](@ref) it throws an error.
+This function in intended to be used to allocate `origarray` values per-thread,
+and should be called at `__init__` if `A` is a global constant.
+"""
+function set_nthreads!(A::AbstractVector, origarray::AbstractVector)
+	nthr = nthreads()
+	nthr > length(origarray) && throw(ArgumentError("Origin Array must have at least nthreads() elements!"))
+    resize!(A, nthr)
+	@threads for i = 1:nthr
+		A[i] = deepcopy(origarray[i])
+	end
+	return A
+end
+
 end

stdlib/Future/src/Future.jl

@@ -28,19 +28,4 @@ function copy!(dst::AbstractArray, src::AbstractArray)
     copyto!(dst, src)
 end
 
-
-## randjump
-
-"""
-    randjump(r::MersenneTwister, steps::Integer) -> MersenneTwister
-
-Create an initialized `MersenneTwister` object, whose state is moved forward
-(without generating numbers) from `r` by `steps` steps.
-One such step corresponds to the generation of two `Float64` numbers.
-For each different value of `steps`, a large polynomial has to be generated internally.
-One is already pre-computed for `steps=big(10)^20`.
-"""
-randjump(r::MersenneTwister, steps::Integer) =
-    Random._randjump(r, Random.DSFMT.calc_jump(steps))
-
 end # module Future

stdlib/Random/src/RNGs.jl

@@ -555,22 +555,22 @@ end
 
 ### randjump
 
-# Old randjump methods are deprecated, the scalar version is in the Future module.
-
 _randjump(r::MersenneTwister, jumppoly::DSFMT.GF2X) =
     fillcache_zeros!(MersenneTwister(copy(r.seed), DSFMT.dsfmt_jump(r.state, jumppoly)))
 
-function _randjump(mt::MersenneTwister, jumppoly::DSFMT.GF2X, len::Integer)
-    mts = MersenneTwister[]
-    push!(mts, mt)
-    for i in 1:len-1
-        cmt = mts[end]
-        push!(mts, _randjump(cmt, jumppoly))
-    end
-    return mts
-end
+"""
+    randjump(r::MersenneTwister, steps::Integer) -> MersenneTwister
+
+Create an initialized `MersenneTwister` object, whose state is moved forward
+(without generating numbers) from `r` by `steps` steps.
+One such step corresponds to the generation of two `Float64` numbers.
+For each different value of `steps`, a large polynomial has to be generated internally.
+One is already pre-computed for `steps=big(10)^20`.
+"""
+randjump(r::MersenneTwister, steps::Integer) =
+    Random._randjump(r, Random.DSFMT.calc_jump(steps))
 
-const ThreadRNG = Ref{Vector{MersenneTwister}}()
+const ThreadRNG = MersenneTwister[]
 
 """
 	trand(r::Vector{MersenneTwister}) -> Float64
@@ -581,7 +581,7 @@ it relies on `ThreadRNG[]`, a threaded array of `MersenneTwister` objects genera
 `randjump` by taking 10^20 steps from `GLOBAL_RNG`.
 If provided, it can also rely on a vector of `MersenneTwister` generated by the user.
 """
-function trand(r::Vector{MersenneTwister}=ThreadRNG[])
-    rt = r[Threads.threadid()]
+function trand(r::Vector{MersenneTwister}=ThreadRNG)
+    @inbounds rt = r[Threads.threadid()]
     return rand(rt)
 end

stdlib/Random/src/Random.jl

@@ -271,7 +271,8 @@ function __init__()
         Base.showerror_nostdio(ex,
             "WARNING: Error during initialization of module Random")
     end
-    ThreadRNG[] = randjump(GLOBAL_RNG, big(10)^20, Threads.nthreads()) 
+    rand_gens = accumulate(randjump, fill(2^30, Threads.nthreads()); init=GLOBAL_RNG)
+    Threads.set_nthreads!(ThreadRNG, rand_gens)
 end
 
 include("RNGs.jl")

stdlib/Random/src/deprecated.jl

@@ -14,7 +14,7 @@ function randjump(mt::MersenneTwister, jumps::Integer, jumppoly::AbstractString)
     _randjump(mt, DSFMT.GF2X(jumppoly), jumps)
 end
 
-@deprecate randjump(mt::MersenneTwister, jumps::Integer)  randjump(mt, big(10)^20, jumps)
+# @deprecate randjump(mt::MersenneTwister, jumps::Integer)  randjump(mt, big(10)^20, jumps)
 
 function randjump(r::MersenneTwister, steps::Integer, len::Integer)
     Base.depwarn("`randjump(rng, steps::Integer, len::Integer` is deprecated; use `Future.randjump` and `accumulate` instead", :randjump)