Skip to content

Commit d181c0c

Browse files
ViralBShahViralBShah
committed
Move random number generation from src/support to external/random
Addresses issue #67
1 parent 8889fe7 commit d181c0c

14 files changed

+129
-53
lines changed

‎external/Makefile

+16-14
Original file line numberDiff line numberDiff line change
@@ -127,32 +127,34 @@ clean-fdlibm:
127127
rm -f $(FDLIBM_OBJ_SOURCE) $(FDLIBM_OBJ_TARGET)
128128
distclean-fdlibm: clean-fdlibm
129129

130-
## dSFMT ##
130+
## MT ##
131131

132-
DSFMT_OBJ_TARGET = $(EXTROOTLIB)/libdSFMT.$(SHLIB_EXT)
133-
DSFMT_OBJ_SOURCE = dsfmt-$(DSFMT_VER)/libdSFMT.$(SHLIB_EXT)
132+
DSFMT_OBJ_TARGET = $(EXTROOTLIB)/libMT.$(SHLIB_EXT)
133+
DSFMT_OBJ_SOURCE = random/libMT.$(SHLIB_EXT)
134134

135135
compile-dsfmt: $(DSFMT_OBJ_SOURCE)
136136
install-dsfmt: $(DSFMT_OBJ_TARGET)
137137

138-
dsfmt-$(DSFMT_VER).tar.gz:
139-
curl http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.1.tar.gz > $@
140-
dsfmt-$(DSFMT_VER)/Makefile: dsfmt-$(DSFMT_VER).tar.gz
138+
random/dsfmt-$(DSFMT_VER).tar.gz:
139+
cd random && \
140+
curl -o dsfmt-$(DSFMT_VER).tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-$(DSFMT_VER).tar.gz -O http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/mt19937-64.tgz
141+
random/dsfmt-$(DSFMT_VER)/Makefile: random/dsfmt-$(DSFMT_VER).tar.gz
142+
cd random && \
141143
mkdir -p dsfmt-$(DSFMT_VER) && \
142-
tar -C dsfmt-$(DSFMT_VER) --strip-components 1 -xf $<
144+
tar -C dsfmt-$(DSFMT_VER) --strip-components 1 -xf dsfmt-$(DSFMT_VER).tar.gz && \
145+
tar zxf mt19937-64.tgz
143146
touch $@
144-
$(DSFMT_OBJ_SOURCE): dsfmt-$(DSFMT_VER)/Makefile
145-
cd dsfmt-$(DSFMT_VER) && \
146-
$(CC) -O3 -finline-functions -fomit-frame-pointer -DNDEBUG -fno-strict-aliasing --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -DDSFMT_MEXP=19937 -fPIC -shared dSFMT.c -o libdSFMT.$(SHLIB_EXT)
147+
$(DSFMT_OBJ_SOURCE): random/dsfmt-$(DSFMT_VER)/Makefile
148+
cd random && \
149+
$(CC) -O3 -finline-functions -fomit-frame-pointer -DNDEBUG -fno-strict-aliasing --param max-inline-insns-single=1800 -Wmissing-prototypes -Wall -std=c99 -DDSFMT_MEXP=19937 -fPIC -shared jl_random.c dsfmt-2.1/dSFMT.c -I mt19937-64 mt19937-64/mt19937-64.c -o libMT.$(SHLIB_EXT)
147150
$(DSFMT_OBJ_TARGET): $(DSFMT_OBJ_SOURCE)
148151
mkdir -p $(EXTROOTLIB)
149152
cp $< $@
150153

151154
clean-dsfmt:
152-
make -C dSFMT-src-$(DSFMT_VER) clean
153-
rm -f dSFMT-src-$(DSFMT_VER)/*.$(SHLIB_EXT)
154-
distclean-dsfmt:
155-
rm -rf dSFMT-src-$(DSFMT_VER).tar.gz dSFMT-src-$(DSFMT_VER)
155+
rm -f random/libMT.$(SHLIB_EXT)
156+
distclean-dsfmt: clean-dsfmt
157+
cd random && rm -rf *.tgz *.tar.gz dsfmt-$(DSFMT_VER) mt19937-64
156158

157159
## OpenBLAS ##
158160

‎external/random/ieee754.h

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#ifndef __IEEE754_H_
2+
#define __IEEE754_H_
3+
4+
union ieee754_float {
5+
float f;
6+
7+
struct {
8+
#if BYTE_ORDER == BIG_ENDIAN
9+
unsigned int negative:1;
10+
unsigned int exponent:8;
11+
unsigned int mantissa:23;
12+
#endif
13+
#if BYTE_ORDER == LITTLE_ENDIAN
14+
unsigned int mantissa:23;
15+
unsigned int exponent:8;
16+
unsigned int negative:1;
17+
#endif
18+
} ieee;
19+
};
20+
21+
#define IEEE754_FLOAT_BIAS 0x7f
22+
23+
union ieee754_double {
24+
double d;
25+
26+
struct {
27+
#if BYTE_ORDER == BIG_ENDIAN
28+
unsigned int negative:1;
29+
unsigned int exponent:11;
30+
unsigned int mantissa0:20;
31+
unsigned int mantissa1:32;
32+
#endif
33+
#if BYTE_ORDER == LITTLE_ENDIAN
34+
unsigned int mantissa1:32;
35+
unsigned int mantissa0:20;
36+
unsigned int exponent:11;
37+
unsigned int negative:1;
38+
#endif
39+
} ieee;
40+
};
41+
42+
#define IEEE754_DOUBLE_BIAS 0x3ff
43+
44+
union ieee854_long_double {
45+
long double d;
46+
47+
struct {
48+
#if BYTE_ORDER == BIG_ENDIAN
49+
unsigned int negative:1;
50+
unsigned int exponent:15;
51+
unsigned int empty:16;
52+
unsigned int mantissa0:32;
53+
unsigned int mantissa1:32;
54+
#endif
55+
#if BYTE_ORDER == LITTLE_ENDIAN
56+
unsigned int mantissa1:32;
57+
unsigned int mantissa0:32;
58+
unsigned int exponent:15;
59+
unsigned int negative:1;
60+
unsigned int empty:16;
61+
#endif
62+
} ieee;
63+
};
64+
65+
#define IEEE854_LONG_DOUBLE_BIAS 0x3fff
66+
67+
#endif

‎src/support/random.c ‎external/random/jl_random.c

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
/*
22
random numbers
33
*/
4-
#include <stdlib.h>
5-
#include <stdio.h>
6-
#include <math.h>
7-
#include "dtypes.h"
8-
#include "ieee754.h"
9-
#include "utils.h"
10-
#include "random.h"
11-
#include "timefuncs.h"
4+
#include "jl_random.h"
125

136
#include "mt19937ar.c"
147

@@ -69,5 +62,11 @@ void randomseed64(uint64_t s)
6962

7063
void randomize()
7164
{
72-
randomseed64(i64time());
65+
struct timeval now;
66+
uint64_t a;
67+
68+
gettimeofday(&now, NULL);
69+
a = (((u_int64_t)now.tv_sec)<<32) + (u_int64_t)now.tv_usec;
70+
71+
randomseed64(a);
7372
}

‎external/random/jl_random.h

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#ifndef __JL_RANDOM_H_
2+
#define __JL_RANDOM_H_
3+
4+
#include <stdlib.h>
5+
#include <stdio.h>
6+
#include <math.h>
7+
#include <sys/time.h>
8+
#include <stdint.h>
9+
#include "ieee754.h"
10+
11+
double rand_double();
12+
float rand_float();
13+
double randn();
14+
void randomize();
15+
uint32_t genrand_int32();
16+
void randomseed32(uint32_t s);
17+
void randomseed64(uint64_t s);
18+
19+
#endif

‎src/support/mt19937ar.c ‎external/random/mt19937ar.c

File renamed without changes.

‎j/random.j

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
libdsfmt = dlopen("libdSFMT")
1+
libmt = dlopen("libMT")
2+
3+
randomize() = ccall(dlsym(libmt, :randomize), Void, ())
4+
5+
function mt_init()
6+
randomize()
7+
dsfmt_init()
8+
end
29

310
DSFMT_MEXP = int32(19937)
411
DSFMT_STATE = Array(Int32, 1000)
@@ -7,12 +14,12 @@ DSFMT_POOL_SIZE = 4096
714
DSFMT_POOL = Array(Float64, DSFMT_POOL_SIZE)
815
DSFMT_POOL_PTR = DSFMT_POOL_SIZE
916

10-
dsfmt_init() = ccall(dlsym(libdsfmt, :dsfmt_chk_init_gen_rand),
17+
dsfmt_init() = ccall(dlsym(libmt, :dsfmt_chk_init_gen_rand),
1118
Void, (Ptr{Void}, Uint32, Int32),
1219
DSFMT_STATE, uint32(0), DSFMT_MEXP)
1320

1421
dsfmt_fill_array_open_open(A::Array{Float64}, n::Size) =
15-
ccall(dlsym(libdsfmt, :dsfmt_fill_array_open_open),
22+
ccall(dlsym(libmt, :dsfmt_fill_array_open_open),
1623
Void, (Ptr{Void}, Ptr{Float64}, Int32),
1724
DSFMT_STATE, A, n)
1825

@@ -63,12 +70,12 @@ end
6370
randint(n::Int) = randint(one(n), n)
6471

6572
# Floating point random numbers
66-
rand() = ccall(:rand_double, Float64, ())
67-
randf() = ccall(:rand_float, Float32, ())
68-
randui32() = ccall(:genrand_int32, Uint32, ())
69-
randn() = ccall(:randn, Float64, ())
70-
srand(s::Union(Int32,Uint32)) = ccall(:randomseed32, Void, (Uint32,), uint32(s))
71-
srand(s::Union(Int64,Uint64)) = ccall(:randomseed64, Void, (Uint64,), uint64(s))
73+
rand() = ccall(dlsym(libmt, :rand_double), Float64, ())
74+
randf() = ccall(dlsym(libmt, :rand_float), Float32, ())
75+
randui32() = ccall(dlsym(libmt, :genrand_int32), Uint32, ())
76+
randn() = ccall(dlsym(libmt, :randn), Float64, ())
77+
srand(s::Union(Int32,Uint32)) = ccall(dlsym(libmt, :randomseed32), Void, (Uint32,), uint32(s))
78+
srand(s::Union(Int64,Uint64)) = ccall(dlsym(libmt, :randomseed64), Void, (Uint64,), uint64(s))
7279

7380
# Arrays of random numbers
7481
macro rand_matrix_builder(t, f)

‎j/start_image.j

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ libc = ccall(:jl_load_dynamic_library, Ptr{Void}, (Ptr{Uint8},), C_NULL)
1313
libm = dlopen("libm")
1414
libfdm = dlopen("libfdm")
1515

16-
libdsfmt = dlopen("libdSFMT")
16+
libmt = dlopen("libMT")
1717

1818
libpcre = dlopen("libpcre")
1919

‎j/sysimg.j

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ load("intfuncs.j")
4646
load("floatfuncs.j")
4747
load("math.j")
4848
load("math_libm.j")
49-
load("random.j"); dsfmt_init();
49+
load("random.j"); mt_init();
5050
load("combinatorics.j")
5151
load("linalg.j")
5252
load("linalg_blas.j")

‎src/flisp/builtins.c

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <errno.h>
1616
#include "llt.h"
1717
#include "flisp.h"
18-
#include "random.h"
1918

2019
size_t llength(value_t v)
2120
{

‎src/support/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(JULIAHOME)/Make.inc
33

44
SRCS = hashing.c timefuncs.c dblprint.c ptrhash.c operators.c socket.c \
55
utf8.c ios.c cplxprint.c dirpath.c htable.c bitvector.c \
6-
int2str.c dump.c random.c bswap.c lltinit.c arraylist.c
6+
int2str.c dump.c bswap.c lltinit.c arraylist.c
77
OBJS = $(SRCS:%.c=%.o)
88
DOBJS = $(SRCS:%.c=%.do)
99
TARGET = libllt.a

‎src/support/hashing.c

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "hashing.h"
1010
#include "timefuncs.h"
1111
#include "ios.h"
12-
#include "random.h"
1312

1413
uint_t nextipow2(uint_t i)
1514
{

‎src/support/llt.h

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "ptrhash.h"
1313
#include "bitvector.h"
1414
#include "dirpath.h"
15-
#include "random.h"
1615

1716
DLLEXPORT void llt_init();
1817

‎src/support/lltinit.c

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ void llt_init()
2020
{
2121
locale_is_utf8 = u8_is_locale_utf8(setlocale(LC_ALL, ""));
2222

23-
randomize();
24-
2523
ios_init_stdstreams();
2624

2725
D_PNAN = strtod("+NaN",NULL);

‎src/support/random.h

-13
This file was deleted.

0 commit comments

Comments
 (0)