From 594cc6e68b10d2671bc232cdf6a5bb539f2847c2 Mon Sep 17 00:00:00 2001
From: Adrien El Zein <adrizein@gmail.com>
Date: Sun, 23 Apr 2017 11:37:38 +0200
Subject: [PATCH] fix(nogil): make functions callable with nogil

---
 cyrandom/__init__.pxd |  1 +
 cyrandom/cyrandom.pxd | 16 ++++++++--------
 cyrandom/cyrandom.pyx | 18 +++++++++---------
 setup.py              |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)
 create mode 100644 cyrandom/__init__.pxd

diff --git a/cyrandom/__init__.pxd b/cyrandom/__init__.pxd
new file mode 100644
index 0000000..f246772
--- /dev/null
+++ b/cyrandom/__init__.pxd
@@ -0,0 +1 @@
+from cyrandom cimport *
diff --git a/cyrandom/cyrandom.pxd b/cyrandom/cyrandom.pxd
index 143995e..53a9ae3 100644
--- a/cyrandom/cyrandom.pxd
+++ b/cyrandom/cyrandom.pxd
@@ -1,15 +1,15 @@
-cpdef double random()
+cpdef double random() nogil
 
-cdef unsigned short bit_length(unsigned long n)
+cdef unsigned short bit_length(unsigned long n) nogil
 
-cdef unsigned long getrandbits(unsigned short k)
+cdef unsigned long getrandbits(unsigned short k) nogil
 
-cpdef long randrange(long start, long stop)
+cpdef long randrange(long start, long stop) nogil
 
-cpdef long randint(long a, long b)
+cpdef long randint(long a, long b) nogil
 
-cpdef double uniform(double a, double b)
+cpdef double uniform(double a, double b) nogil
 
-cpdef double triangular(double low=?, double high=?, double mode=?)
+cpdef double triangular(double low=?, double high=?, double mode=?) nogil
 
-cpdef long triangular_int(long low, long high, long mode)
+cpdef long triangular_int(long low, long high, long mode) nogil
diff --git a/cyrandom/cyrandom.pyx b/cyrandom/cyrandom.pyx
index fa92d91..7c7939f 100644
--- a/cyrandom/cyrandom.pyx
+++ b/cyrandom/cyrandom.pyx
@@ -13,13 +13,13 @@ from ._mersenne cimport genrand_int32, genrand_res53
 random_seed()
 
 
-cpdef double random():
+cpdef double random() nogil:
     """Return a double between 0.0 and 1.0
     """
     return genrand_res53()
 
 
-cdef unsigned short bit_length(unsigned long n):
+cdef unsigned short bit_length(unsigned long n) nogil:
     cdef unsigned short length = 0
     while n != 0:
         length += 1
@@ -27,11 +27,11 @@ cdef unsigned short bit_length(unsigned long n):
     return length
 
 
-cdef unsigned long getrandbits(unsigned short k):
+cdef unsigned long getrandbits(unsigned short k) nogil:
     return genrand_int32() >> (32 - k)
 
 
-cpdef long randrange(long start, long stop):
+cpdef long randrange(long start, long stop) nogil:
     """Choose a random item from range(start, stop).
 
     This fixes the problem with randint() which includes the
@@ -41,13 +41,13 @@ cpdef long randrange(long start, long stop):
     return start + _randbelow(width)
 
 
-cpdef long randint(long a, long b):
+cpdef long randint(long a, long b) nogil:
     """Return random integer in range [a, b], including both end points.
     """
     return randrange(a, b+1)
 
 
-cdef unsigned long _randbelow(unsigned long n):
+cdef unsigned long _randbelow(unsigned long n) nogil:
     """Return a random int in the range [0,n).  Raises ValueError if n==0.
     """
     _getrandbits = getrandbits
@@ -104,13 +104,13 @@ def choose_weighted(tuple population, tuple cum_weights):
     return population[bisect(cum_weights, random() * total)]
 
 
-cpdef double uniform(double a, double b):
+cpdef double uniform(double a, double b) nogil:
     """Get a random number in the range [a, b) or [a, b] depending on rounding.
     """
     return a + (b-a) * genrand_res53()
 
 
-cpdef double triangular(double low=0.0, double high=1.0, double mode=0.5):
+cpdef double triangular(double low=0.0, double high=1.0, double mode=0.5) nogil:
     """Triangular distribution.
 
     Continuous distribution bounded by given lower and upper limits,
@@ -127,7 +127,7 @@ cpdef double triangular(double low=0.0, double high=1.0, double mode=0.5):
     return low + (high - low) * sqrt(u * c)
 
 
-cpdef long triangular_int(long low, long high, long mode):
+cpdef long triangular_int(long low, long high, long mode) nogil:
     cdef double c, u = genrand_res53()
     c = (mode - low) / (high - low)
     if u > c:
diff --git a/setup.py b/setup.py
index 6f27ff6..e76bce6 100644
--- a/setup.py
+++ b/setup.py
@@ -37,5 +37,5 @@
     ],
     keywords='cyrandom random rng cython',
     packages=['cyrandom'],
-    package_data={'cyrandom': ['cyrandom.pxd']},
+    package_data={'cyrandom': ['cyrandom.pxd', '__init__.pxd']},
     ext_modules=ext)