Skip to content

Disable fill_array calls in DSFMT to fix 6573 #6581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 19, 2014
Merged

Disable fill_array calls in DSFMT to fix 6573 #6581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
385c36d
State was not being passed correctly for rand!(state, array).
ViralBShah Apr 19, 2014
ab04874
Add genrand_close1_open2 back as we need it for randn().
ViralBShah Apr 19, 2014
17913d8
Fix #6573 for now by avoiding the dsfmt_fill_array calls.
ViralBShah Apr 19, 2014
1c7db48
Unfortunately, Makefiles are even simpler than I thought
staticfloat Apr 19, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
119 changes: 52 additions & 67 deletions base/librandom.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ export DSFMT_state, dsfmt_get_min_array_size, dsfmt_get_idstring,
dsfmt_init_by_array, dsfmt_gv_init_by_array,
dsfmt_genrand_close1_open2, dsfmt_gv_genrand_close1_open2,
dsfmt_genrand_close_open, dsfmt_gv_genrand_close_open,
dsfmt_genrand_open_close, dsfmt_gv_genrand_open_close,
dsfmt_genrand_open_open, dsfmt_gv_genrand_open_open,
dsfmt_fill_array_close1_open2!, dsfmt_gv_fill_array_close1_open2!,
dsfmt_fill_array_close_open!, dsfmt_gv_fill_array_close_open!,
dsfmt_fill_array_open_close!, dsfmt_gv_fill_array_open_close!,
dsfmt_fill_array_open_open!, dsfmt_gv_fill_array_open_open!,
dsfmt_genrand_uint32, dsfmt_gv_genrand_uint32,
randmtzig_randn, randmtzig_exprnd,
win32_SystemFunction036!
Expand Down Expand Up @@ -65,76 +60,66 @@ function dsfmt_gv_init_by_array(seed::Vector{Uint32})
seed, length(seed))
end

for (genrand, gv_genrand) in
((:dsfmt_genrand_close1_open2, :dsfmt_gv_genrand_close1_open2),
(:dsfmt_genrand_close_open, :dsfmt_gv_genrand_close_open),
(:dsfmt_genrand_open_close, :dsfmt_gv_genrand_open_close),
(:dsfmt_genrand_open_open, :dsfmt_gv_genrand_open_open))
@eval begin

function ($genrand)(s::DSFMT_state)
ccall(($(string(genrand)),:librandom),
Float64,
(Ptr{Void},),
s.val)
end
function dsfmt_genrand_close_open(s::DSFMT_state)
ccall((:dsfmt_genrand_close_open, :librandom),
Float64,
(Ptr{Void},),
s.val)
end

function ($gv_genrand)()
ccall(($(string(gv_genrand)),:librandom),
Float64,
())
end

end
function dsfmt_gv_genrand_close_open()
ccall((:dsfmt_gv_genrand_close_open, :librandom),
Float64,
())
end

for (genrand_fill, gv_genrand_fill, genrand_fill_name, gv_genrand_fill_name) in
((:dsfmt_fill_array_close1_open2, :dsfmt_gv_fill_array_close1_open2,
:dsfmt_fill_array_close1_open2!, :dsfmt_gv_fill_array_close1_open2!),
(:dsfmt_fill_array_close_open, :dsfmt_gv_fill_array_close_open,
:dsfmt_fill_array_close_open!, :dsfmt_gv_fill_array_close_open!),
(:dsfmt_fill_array_open_close, :dsfmt_gv_fill_array_open_close,
:dsfmt_fill_array_open_close!, :dsfmt_gv_fill_array_open_close!),
(:dsfmt_fill_array_open_open, :dsfmt_gv_fill_array_open_open,
:dsfmt_fill_array_open_open!, :dsfmt_gv_fill_array_open_open!))
@eval begin
function dsfmt_genrand_close1_open2(s::DSFMT_state)
ccall((:dsfmt_genrand_close1_open2, :librandom),
Float64,
(Ptr{Void},),
s.val)
end

function ($genrand_fill_name)(s::DSFMT_state, A::Array{Float64})
n = length(A)
if n <= dsfmt_min_array_size
for i = 1:n
A[i] = rand()
end
else
ccall(($(string(genrand_fill)),:librandom),
Void,
(Ptr{Void}, Ptr{Float64}, Int),
s.val, A, n & 0xfffffffffffffffe)
if isodd(n)
A[n] = rand()
end
end
return A
function dsfmt_gv_genrand_close1_open2()
ccall((:dsfmt_gv_genrand_close1_open2, :librandom),
Float64,
())
end

function dsfmt_fill_array_close_open!(s::DSFMT_state, A::Array{Float64})
n = length(A)
if n <= dsfmt_min_array_size
for i = 1:n
A[i] = dsfmt_genrand_close_open(s)
end
else
ccall((:dsfmt_fill_array_close_open,:librandom),
Void,
(Ptr{Void}, Ptr{Float64}, Int),
s.val, A, n & 0xfffffffffffffffe)
if isodd(n)
A[n] = dsfmt_genrand_close_open(s)
end
end
return A
end

function ($gv_genrand_fill_name)(A::Array{Float64})
n = length(A)
if n <= dsfmt_min_array_size
for i = 1:n
A[i] = rand()
end
else
ccall(($(string(gv_genrand_fill)),:librandom),
Void,
(Ptr{Void}, Int),
A, n & 0xfffffffffffffffe)
if isodd(n)
A[n] = rand()
end
end
return A
function dsfmt_gv_fill_array_close_open!(A::Array{Float64})
n = length(A)
if n <= dsfmt_min_array_size
for i = 1:n
A[i] = dsfmt_gv_genrand_close_open()
end
else
ccall((:dsfmt_gv_fill_array_close_open,:librandom),
Void,
(Ptr{Void}, Int),
A, n & 0xfffffffffffffffe)
if isodd(n)
A[i] = dsfmt_gv_genrand_close_open()
end
end
return A
end

function dsfmt_genrand_uint32(s::DSFMT_state)
Expand Down
6 changes: 4 additions & 2 deletions base/random.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,16 @@ rand(::Type{Int128}) = int128(rand(Uint128))

# Arrays of random numbers

rand!(A::Array{Float64}) = dsfmt_gv_fill_array_close_open!(A)
## Disable fill_array routines to address #6573
#rand!(A::Array{Float64}) = dsfmt_gv_fill_array_close_open!(A)
rand(::Type{Float64}, dims::Dims) = rand!(Array(Float64, dims))
rand(::Type{Float64}, dims::Int...) = rand(Float64, dims)

rand(dims::Dims) = rand(Float64, dims)
rand(dims::Int...) = rand(Float64, dims)

rand!(r::MersenneTwister, A::Array{Float64}) = dsfmt_fill_array_close_open!(r.state, A)
## Disable fill_array routines to address #6573
#rand!(r::MersenneTwister, A::Array{Float64}) = dsfmt_fill_array_close_open!(r.state, A)
rand(r::AbstractRNG, dims::Dims) = rand!(r, Array(Float64, dims))
rand(r::AbstractRNG, dims::Int...) = rand(r, dims)

Expand Down
2 changes: 1 addition & 1 deletion deps/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ dsfmt-$(DSFMT_VER)/config.status: dsfmt-$(DSFMT_VER).tar.gz
$(TAR) -C dsfmt-$(DSFMT_VER) --strip-components 1 -xf dsfmt-$(DSFMT_VER).tar.gz && \
cd dsfmt-$(DSFMT_VER) && patch < ../dSFMT.h.patch && patch < ../dSFMT.c.patch
echo 1 > $@
$(LIBRANDOM_OBJ_SOURCE): dsfmt-$(DSFMT_VER)/config.status dsfmt-$(DSFMT_VER)/dSFMT.c
$(LIBRANDOM_OBJ_SOURCE): dsfmt-$(DSFMT_VER)/config.status
$(CC) $(CPPFLAGS) $(LIBRANDOM_CFLAGS) $(LDFLAGS) dsfmt-$(DSFMT_VER)/dSFMT.c -o librandom.$(SHLIB_EXT) && \
$(INSTALL_NAME_CMD)librandom.$(SHLIB_EXT) librandom.$(SHLIB_EXT)
$(LIBRANDOM_OBJ_TARGET): $(LIBRANDOM_OBJ_SOURCE)
Expand Down
4 changes: 4 additions & 0 deletions test/random.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Issue #6573
srand(0); rand(); x = rand(384);
@test find(x .== rand()) == []

@test rand() != rand()
@test 0.0 <= rand() < 1.0
@test rand(Uint32) >= 0
Expand Down