[Numpy-svn] r8475 - trunk/numpy/random/mtrand

numpy-svn at scipy.org numpy-svn at scipy.org
Fri Jul 9 04:11:55 EDT 2010


Author: ptvirtan
Date: 2010-07-09 03:11:54 -0500 (Fri, 09 Jul 2010)
New Revision: 8475

Modified:
   trunk/numpy/random/mtrand/mtrand.c
Log:
GEN: random: Regenerate mtrand.c

Modified: trunk/numpy/random/mtrand/mtrand.c
===================================================================
--- trunk/numpy/random/mtrand/mtrand.c	2010-07-09 08:11:39 UTC (rev 8474)
+++ trunk/numpy/random/mtrand/mtrand.c	2010-07-09 08:11:54 UTC (rev 8475)
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12 on Mon Feb 22 20:43:03 2010 */
+/* Generated by Cython 0.12.1 on Mon Jul  5 13:47:19 2010 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -6,6 +6,7 @@
 #ifndef Py_PYTHON_H
     #error Python headers needed to compile C extensions, please install development version of Python.
 #else
+
 #ifndef PY_LONG_LONG
   #define PY_LONG_LONG LONG_LONG
 #endif
@@ -17,6 +18,7 @@
   #define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
   #define PyDict_Contains(d,o)   PySequence_Contains(d,o)
 #endif
+
 #if PY_VERSION_HEX < 0x02050000
   typedef int Py_ssize_t;
   #define PY_SSIZE_T_MAX INT_MAX
@@ -26,7 +28,9 @@
   #define PyInt_AsSsize_t(o)   PyInt_AsLong(o)
   #define PyNumber_Index(o)    PyNumber_Int(o)
   #define PyIndex_Check(o)     PyNumber_Check(o)
+  #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
 #endif
+
 #if PY_VERSION_HEX < 0x02060000
   #define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
   #define Py_TYPE(ob)   (((PyObject*)(ob))->ob_type)
@@ -36,17 +40,17 @@
   #define PyType_Modified(t)
 
   typedef struct {
-       void *buf;
-       PyObject *obj;
-       Py_ssize_t len;
-       Py_ssize_t itemsize;
-       int readonly;
-       int ndim;
-       char *format;
-       Py_ssize_t *shape;
-       Py_ssize_t *strides;
-       Py_ssize_t *suboffsets;
-       void *internal;
+     void *buf;
+     PyObject *obj;
+     Py_ssize_t len;
+     Py_ssize_t itemsize;
+     int readonly;
+     int ndim;
+     char *format;
+     Py_ssize_t *shape;
+     Py_ssize_t *strides;
+     Py_ssize_t *suboffsets;
+     void *internal;
   } Py_buffer;
 
   #define PyBUF_SIMPLE 0
@@ -60,18 +64,22 @@
   #define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
 
 #endif
+
 #if PY_MAJOR_VERSION < 3
   #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
 #else
   #define __Pyx_BUILTIN_MODULE_NAME "builtins"
 #endif
+
 #if PY_MAJOR_VERSION >= 3
   #define Py_TPFLAGS_CHECKTYPES 0
   #define Py_TPFLAGS_HAVE_INDEX 0
 #endif
+
 #if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
   #define Py_TPFLAGS_HAVE_NEWBUFFER 0
 #endif
+
 #if PY_MAJOR_VERSION >= 3
   #define PyBaseString_Type            PyUnicode_Type
   #define PyString_Type                PyUnicode_Type
@@ -80,6 +88,7 @@
   #define PyBytes_Type                 PyString_Type
   #define PyBytes_CheckExact           PyString_CheckExact
 #endif
+
 #if PY_MAJOR_VERSION >= 3
   #define PyInt_Type                   PyLong_Type
   #define PyInt_Check(op)              PyLong_Check(op)
@@ -99,10 +108,13 @@
 #else
   #define __Pyx_PyNumber_Divide(x,y)         PyNumber_Divide(x,y)
   #define __Pyx_PyNumber_InPlaceDivide(x,y)  PyNumber_InPlaceDivide(x,y)
+
 #endif
+
 #if PY_MAJOR_VERSION >= 3
   #define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)
 #endif
+
 #if !defined(WIN32) && !defined(MS_WINDOWS)
   #ifndef __stdcall
     #define __stdcall
@@ -116,6 +128,7 @@
 #else
   #define _USE_MATH_DEFINES
 #endif
+
 #if PY_VERSION_HEX < 0x02050000
   #define __Pyx_GetAttrString(o,n)   PyObject_GetAttrString((o),((char *)(n)))
   #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
@@ -125,6 +138,7 @@
   #define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
   #define __Pyx_DelAttrString(o,n)   PyObject_DelAttrString((o),(n))
 #endif
+
 #if PY_VERSION_HEX < 0x02050000
   #define __Pyx_NAMESTR(n) ((char *)(n))
   #define __Pyx_DOCSTR(n)  ((char *)(n))
@@ -147,12 +161,14 @@
 #include "distributions.h"
 #include "initarray.h"
 
-#ifdef __GNUC__
-#define INLINE __inline__
-#elif _WIN32
-#define INLINE __inline
-#else
-#define INLINE 
+#ifndef CYTHON_INLINE
+  #if defined(__GNUC__)
+    #define CYTHON_INLINE __inline__
+  #elif defined(_MSC_VER)
+    #define CYTHON_INLINE __inline
+  #else
+    #define CYTHON_INLINE 
+  #endif
 #endif
 
 typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
@@ -174,8 +190,8 @@
 #define __Pyx_PyBytes_AsUString(s)        ((unsigned char*) __Pyx_PyBytes_AsString(s))
 
 #define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
 
 #if !defined(T_PYSSIZET)
 #if PY_VERSION_HEX < 0x02050000
@@ -239,9 +255,9 @@
 #endif
 #endif
 
-static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
-static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
+static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
 
 #define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
 
@@ -291,7 +307,7 @@
 
 typedef long (*__pyx_t_6mtrand_rk_discd)(rk_state *, double);
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":522
+/* "mtrand.pyx":522
  *     return sum
  * 
  * cdef class RandomState:             # <<<<<<<<<<<<<<
@@ -358,14 +374,8 @@
 
 static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[],     PyObject *kwds2, PyObject *values[], Py_ssize_t num_pos_args,     const char* function_name); /*proto*/
 
-static INLINE PyObject* __Pyx_Type(PyObject* o) {
-    PyObject* type = (PyObject*) Py_TYPE(o);
-    Py_INCREF(type);
-    return type;
-}
 
-
-static INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
     PyObject *r;
     if (!j) return NULL;
     r = PyObject_GetItem(o, j);
@@ -378,7 +388,7 @@
                                                     __Pyx_GetItemInt_List_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     if (likely(o != Py_None)) {
         if (likely((0 <= i) & (i < PyList_GET_SIZE(o)))) {
             PyObject *r = PyList_GET_ITEM(o, i);
@@ -398,7 +408,7 @@
                                                     __Pyx_GetItemInt_Tuple_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     if (likely(o != Py_None)) {
         if (likely((0 <= i) & (i < PyTuple_GET_SIZE(o)))) {
             PyObject *r = PyTuple_GET_ITEM(o, i);
@@ -419,7 +429,7 @@
                                                     __Pyx_GetItemInt_Fast(o, i, size <= sizeof(long)) : \
                                                     __Pyx_GetItemInt_Generic(o, to_py_func(i)))
 
-static INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
+static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fits_long) {
     PyObject *r;
     if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
         r = PyList_GET_ITEM(o, i);
@@ -438,21 +448,21 @@
     return r;
 }
 
-static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
+static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
 
-static INLINE void __Pyx_RaiseTooManyValuesError(void);
+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void);
 
 static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t index); /*proto*/
 static int __Pyx_EndUnpack(PyObject *); /*proto*/
 
 static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
-static INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict,
+static CYTHON_INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict,
     const char* function_name, int kw_allowed); /*proto*/
 
-static INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
+static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
 
-static INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
+static CYTHON_INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
     if (likely(PyList_CheckExact(L))) {
         if (PyList_Append(L, x) < 0) return NULL;
         Py_INCREF(Py_None);
@@ -472,7 +482,7 @@
                                                     __Pyx_SetItemInt_Fast(o, i, v, size <= sizeof(long)) : \
                                                     __Pyx_SetItemInt_Generic(o, to_py_func(i), v))
 
-static INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) {
+static CYTHON_INLINE int __Pyx_SetItemInt_Generic(PyObject *o, PyObject *j, PyObject *v) {
     int r;
     if (!j) return -1;
     r = PyObject_SetItem(o, j, v);
@@ -480,7 +490,7 @@
     return r;
 }
 
-static INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, int fits_long) {
+static CYTHON_INLINE int __Pyx_SetItemInt_Fast(PyObject *o, Py_ssize_t i, PyObject *v, int fits_long) {
     if (PyList_CheckExact(o) && ((0 <= i) & (i < PyList_GET_SIZE(o)))) {
         Py_INCREF(v);
         Py_DECREF(PyList_GET_ITEM(o, i));
@@ -495,49 +505,49 @@
     }
 }
 
-static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
 
-static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 
-static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
+static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
 
-static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
+static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
 
-static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
+static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
 
-static INLINE char __Pyx_PyInt_AsChar(PyObject *);
+static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);
 
-static INLINE short __Pyx_PyInt_AsShort(PyObject *);
+static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);
 
-static INLINE int __Pyx_PyInt_AsInt(PyObject *);
+static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);
 
-static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
+static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
 
-static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
+static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
 
-static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
+static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
 
-static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
+static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
 
-static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
+static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
 
-static INLINE long __Pyx_PyInt_AsLong(PyObject *);
+static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);
 
-static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
+static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
 
-static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
+static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
 
-static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
+static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
 
-static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size);  /*proto*/
+static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name, long size, int strict);  /*proto*/
 
 static PyObject *__Pyx_ImportModule(const char *name); /*proto*/
 
@@ -1010,7 +1020,7 @@
 static PyObject *__pyx_k_33;
 static PyObject *__pyx_k_43;
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":128
+/* "mtrand.pyx":128
  * import numpy as np
  * 
  * cdef object cont0_array(rk_state *state, rk_cont0 func, object size):             # <<<<<<<<<<<<<<
@@ -1033,7 +1043,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":134
+  /* "mtrand.pyx":134
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1043,7 +1053,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":135
+    /* "mtrand.pyx":135
  * 
  *     if size is None:
  *         return func(state)             # <<<<<<<<<<<<<<
@@ -1060,7 +1070,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":137
+    /* "mtrand.pyx":137
  *         return func(state)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1094,7 +1104,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":138
+    /* "mtrand.pyx":138
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1103,7 +1113,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":139
+    /* "mtrand.pyx":139
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1112,7 +1122,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":140
+    /* "mtrand.pyx":140
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1122,7 +1132,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":141
+      /* "mtrand.pyx":141
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)             # <<<<<<<<<<<<<<
@@ -1132,7 +1142,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":142
+    /* "mtrand.pyx":142
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)
  *         return array             # <<<<<<<<<<<<<<
@@ -1162,7 +1172,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":145
+/* "mtrand.pyx":145
  * 
  * 
  * cdef object cont1_array_sc(rk_state *state, rk_cont1 func, object size, double a):             # <<<<<<<<<<<<<<
@@ -1185,7 +1195,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":151
+  /* "mtrand.pyx":151
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1195,7 +1205,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":152
+    /* "mtrand.pyx":152
  * 
  *     if size is None:
  *         return func(state, a)             # <<<<<<<<<<<<<<
@@ -1212,7 +1222,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":154
+    /* "mtrand.pyx":154
  *         return func(state, a)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1246,7 +1256,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":155
+    /* "mtrand.pyx":155
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1255,7 +1265,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":156
+    /* "mtrand.pyx":156
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1264,7 +1274,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":157
+    /* "mtrand.pyx":157
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1274,7 +1284,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":158
+      /* "mtrand.pyx":158
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)             # <<<<<<<<<<<<<<
@@ -1284,7 +1294,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":159
+    /* "mtrand.pyx":159
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)
  *         return array             # <<<<<<<<<<<<<<
@@ -1314,7 +1324,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":161
+/* "mtrand.pyx":161
  *         return array
  * 
  * cdef object cont1_array(rk_state *state, rk_cont1 func, object size, ndarray oa):             # <<<<<<<<<<<<<<
@@ -1343,7 +1353,7 @@
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":170
+  /* "mtrand.pyx":170
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1353,7 +1363,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":171
+    /* "mtrand.pyx":171
  * 
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -1367,7 +1377,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":172
+    /* "mtrand.pyx":172
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1376,7 +1386,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":173
+    /* "mtrand.pyx":173
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_DOUBLE)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1385,7 +1395,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":174
+    /* "mtrand.pyx":174
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)             # <<<<<<<<<<<<<<
@@ -1399,7 +1409,7 @@
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":175
+    /* "mtrand.pyx":175
  *         array_data = <double *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1409,7 +1419,7 @@
     __pyx_t_3 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":176
+      /* "mtrand.pyx":176
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])             # <<<<<<<<<<<<<<
@@ -1418,7 +1428,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":177
+      /* "mtrand.pyx":177
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])
  *             PyArray_ITER_NEXT(itera)             # <<<<<<<<<<<<<<
@@ -1431,7 +1441,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":179
+    /* "mtrand.pyx":179
  *             PyArray_ITER_NEXT(itera)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1465,7 +1475,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":180
+    /* "mtrand.pyx":180
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1474,7 +1484,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":182
+    /* "mtrand.pyx":182
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array,
  *                                                 <void *>oa)             # <<<<<<<<<<<<<<
@@ -1488,7 +1498,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":183
+    /* "mtrand.pyx":183
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array,
  *                                                 <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -1498,7 +1508,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":184
+      /* "mtrand.pyx":184
  *                                                 <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -1520,7 +1530,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":185
+    /* "mtrand.pyx":185
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1530,7 +1540,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":186
+      /* "mtrand.pyx":186
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1539,7 +1549,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":187
+      /* "mtrand.pyx":187
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])             # <<<<<<<<<<<<<<
@@ -1548,7 +1558,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":188
+      /* "mtrand.pyx":188
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -1560,7 +1570,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":189
+  /* "mtrand.pyx":189
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *     return array             # <<<<<<<<<<<<<<
@@ -1591,7 +1601,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":191
+/* "mtrand.pyx":191
  *     return array
  * 
  * cdef object cont2_array_sc(rk_state *state, rk_cont2 func, object size, double a,             # <<<<<<<<<<<<<<
@@ -1614,7 +1624,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":198
+  /* "mtrand.pyx":198
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1624,7 +1634,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":199
+    /* "mtrand.pyx":199
  * 
  *     if size is None:
  *         return func(state, a, b)             # <<<<<<<<<<<<<<
@@ -1641,7 +1651,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":201
+    /* "mtrand.pyx":201
  *         return func(state, a, b)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1675,7 +1685,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":202
+    /* "mtrand.pyx":202
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -1684,7 +1694,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":203
+    /* "mtrand.pyx":203
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1693,7 +1703,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":204
+    /* "mtrand.pyx":204
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -1703,7 +1713,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":205
+      /* "mtrand.pyx":205
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b)             # <<<<<<<<<<<<<<
@@ -1713,7 +1723,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a, __pyx_v_b);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":206
+    /* "mtrand.pyx":206
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b)
  *         return array             # <<<<<<<<<<<<<<
@@ -1743,7 +1753,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":209
+/* "mtrand.pyx":209
  * 
  * 
  * cdef object cont2_array(rk_state *state, rk_cont2 func, object size,             # <<<<<<<<<<<<<<
@@ -1771,7 +1781,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":219
+  /* "mtrand.pyx":219
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -1781,7 +1791,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":220
+    /* "mtrand.pyx":220
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)             # <<<<<<<<<<<<<<
@@ -1795,7 +1805,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":221
+    /* "mtrand.pyx":221
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -1809,7 +1819,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":222
+    /* "mtrand.pyx":222
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>oa, <void *>ob)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1818,7 +1828,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":223
+    /* "mtrand.pyx":223
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1828,7 +1838,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":224
+      /* "mtrand.pyx":224
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -1837,7 +1847,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":225
+      /* "mtrand.pyx":225
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1846,7 +1856,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":226
+      /* "mtrand.pyx":226
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])             # <<<<<<<<<<<<<<
@@ -1855,7 +1865,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":227
+      /* "mtrand.pyx":227
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -1868,7 +1878,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":229
+    /* "mtrand.pyx":229
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -1902,7 +1912,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":230
+    /* "mtrand.pyx":230
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -1911,7 +1921,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":231
+    /* "mtrand.pyx":231
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)             # <<<<<<<<<<<<<<
@@ -1925,7 +1935,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":232
+    /* "mtrand.pyx":232
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -1935,7 +1945,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":233
+      /* "mtrand.pyx":233
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>oa, <void *>ob)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -1957,7 +1967,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":234
+    /* "mtrand.pyx":234
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -1967,7 +1977,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":235
+      /* "mtrand.pyx":235
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -1976,7 +1986,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":236
+      /* "mtrand.pyx":236
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -1985,7 +1995,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":237
+      /* "mtrand.pyx":237
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])             # <<<<<<<<<<<<<<
@@ -1994,7 +2004,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":238
+      /* "mtrand.pyx":238
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -2003,7 +2013,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":239
+      /* "mtrand.pyx":239
  *             array_data[i] = func(state, oa_data[0], ob_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -2015,7 +2025,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":240
+  /* "mtrand.pyx":240
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)
  *     return array             # <<<<<<<<<<<<<<
@@ -2046,7 +2056,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":242
+/* "mtrand.pyx":242
  *     return array
  * 
  * cdef object cont3_array_sc(rk_state *state, rk_cont3 func, object size, double a,             # <<<<<<<<<<<<<<
@@ -2069,7 +2079,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":250
+  /* "mtrand.pyx":250
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2079,7 +2089,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":251
+    /* "mtrand.pyx":251
  * 
  *     if size is None:
  *         return func(state, a, b, c)             # <<<<<<<<<<<<<<
@@ -2096,7 +2106,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":253
+    /* "mtrand.pyx":253
  *         return func(state, a, b, c)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -2130,7 +2140,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":254
+    /* "mtrand.pyx":254
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2139,7 +2149,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":255
+    /* "mtrand.pyx":255
  *         array = <ndarray>np.empty(size, np.float64)
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2148,7 +2158,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":256
+    /* "mtrand.pyx":256
  *         length = PyArray_SIZE(array)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2158,7 +2168,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":257
+      /* "mtrand.pyx":257
  *         array_data = <double *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b, c)             # <<<<<<<<<<<<<<
@@ -2168,7 +2178,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a, __pyx_v_b, __pyx_v_c);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":258
+    /* "mtrand.pyx":258
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a, b, c)
  *         return array             # <<<<<<<<<<<<<<
@@ -2198,7 +2208,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":260
+/* "mtrand.pyx":260
  *         return array
  * 
  * cdef object cont3_array(rk_state *state, rk_cont3 func, object size, ndarray oa,             # <<<<<<<<<<<<<<
@@ -2228,7 +2238,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":272
+  /* "mtrand.pyx":272
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2238,7 +2248,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":273
+    /* "mtrand.pyx":273
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)             # <<<<<<<<<<<<<<
@@ -2252,7 +2262,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":274
+    /* "mtrand.pyx":274
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)             # <<<<<<<<<<<<<<
@@ -2266,7 +2276,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":275
+    /* "mtrand.pyx":275
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>oa, <void *>ob, <void *>oc)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2275,7 +2285,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":276
+    /* "mtrand.pyx":276
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_DOUBLE)
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2285,7 +2295,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":277
+      /* "mtrand.pyx":277
  *         array_data = <double *>array.data
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -2294,7 +2304,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":278
+      /* "mtrand.pyx":278
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2303,7 +2313,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":279
+      /* "mtrand.pyx":279
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -2312,7 +2322,7 @@
  */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":280
+      /* "mtrand.pyx":280
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])             # <<<<<<<<<<<<<<
@@ -2321,7 +2331,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]), (__pyx_v_oc_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":281
+      /* "mtrand.pyx":281
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2334,7 +2344,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":283
+    /* "mtrand.pyx":283
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)             # <<<<<<<<<<<<<<
@@ -2368,7 +2378,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":284
+    /* "mtrand.pyx":284
  *     else:
  *         array = <ndarray>np.empty(size, np.float64)
  *         array_data = <double *>array.data             # <<<<<<<<<<<<<<
@@ -2377,7 +2387,7 @@
  */
     __pyx_v_array_data = ((double *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":286
+    /* "mtrand.pyx":286
  *         array_data = <double *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>oa,
  *                                                 <void *>ob, <void *>oc)             # <<<<<<<<<<<<<<
@@ -2391,7 +2401,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":287
+    /* "mtrand.pyx":287
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>oa,
  *                                                 <void *>ob, <void *>oc)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -2401,7 +2411,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":288
+      /* "mtrand.pyx":288
  *                                                 <void *>ob, <void *>oc)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -2423,7 +2433,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":289
+    /* "mtrand.pyx":289
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2433,7 +2443,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":290
+      /* "mtrand.pyx":290
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2442,7 +2452,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":291
+      /* "mtrand.pyx":291
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -2451,7 +2461,7 @@
  */
       __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":292
+      /* "mtrand.pyx":292
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)             # <<<<<<<<<<<<<<
@@ -2460,7 +2470,7 @@
  */
       __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 3));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":293
+      /* "mtrand.pyx":293
  *             ob_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])             # <<<<<<<<<<<<<<
@@ -2469,7 +2479,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]), (__pyx_v_ob_data[0]), (__pyx_v_oc_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":294
+      /* "mtrand.pyx":294
  *             oc_data = <double *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2481,7 +2491,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":295
+  /* "mtrand.pyx":295
  *             array_data[i] = func(state, oa_data[0], ob_data[0], oc_data[0])
  *             PyArray_MultiIter_NEXT(multi)
  *     return array             # <<<<<<<<<<<<<<
@@ -2513,7 +2523,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":297
+/* "mtrand.pyx":297
  *     return array
  * 
  * cdef object disc0_array(rk_state *state, rk_disc0 func, object size):             # <<<<<<<<<<<<<<
@@ -2536,7 +2546,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":303
+  /* "mtrand.pyx":303
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2546,7 +2556,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":304
+    /* "mtrand.pyx":304
  * 
  *     if size is None:
  *         return func(state)             # <<<<<<<<<<<<<<
@@ -2563,7 +2573,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":306
+    /* "mtrand.pyx":306
  *         return func(state)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2592,7 +2602,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":307
+    /* "mtrand.pyx":307
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2601,7 +2611,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":308
+    /* "mtrand.pyx":308
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2610,7 +2620,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":309
+    /* "mtrand.pyx":309
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2620,7 +2630,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":310
+      /* "mtrand.pyx":310
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)             # <<<<<<<<<<<<<<
@@ -2630,7 +2640,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":311
+    /* "mtrand.pyx":311
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state)
  *         return array             # <<<<<<<<<<<<<<
@@ -2660,7 +2670,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":313
+/* "mtrand.pyx":313
  *         return array
  * 
  * cdef object discnp_array_sc(rk_state *state, rk_discnp func, object size, long n, double p):             # <<<<<<<<<<<<<<
@@ -2683,7 +2693,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":319
+  /* "mtrand.pyx":319
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2693,7 +2703,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":320
+    /* "mtrand.pyx":320
  * 
  *     if size is None:
  *         return func(state, n, p)             # <<<<<<<<<<<<<<
@@ -2710,7 +2720,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":322
+    /* "mtrand.pyx":322
  *         return func(state, n, p)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2739,7 +2749,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":323
+    /* "mtrand.pyx":323
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -2748,7 +2758,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":324
+    /* "mtrand.pyx":324
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2757,7 +2767,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":325
+    /* "mtrand.pyx":325
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -2767,7 +2777,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":326
+      /* "mtrand.pyx":326
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)             # <<<<<<<<<<<<<<
@@ -2777,7 +2787,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_p);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":327
+    /* "mtrand.pyx":327
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)
  *         return array             # <<<<<<<<<<<<<<
@@ -2807,7 +2817,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":329
+/* "mtrand.pyx":329
  *         return array
  * 
  * cdef object discnp_array(rk_state *state, rk_discnp func, object size, ndarray on, ndarray op):             # <<<<<<<<<<<<<<
@@ -2835,7 +2845,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":338
+  /* "mtrand.pyx":338
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -2845,7 +2855,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":339
+    /* "mtrand.pyx":339
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -2859,7 +2869,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":340
+    /* "mtrand.pyx":340
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -2873,7 +2883,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":341
+    /* "mtrand.pyx":341
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2882,7 +2892,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":342
+    /* "mtrand.pyx":342
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -2892,7 +2902,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":343
+      /* "mtrand.pyx":343
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -2901,7 +2911,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":344
+      /* "mtrand.pyx":344
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -2910,7 +2920,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":345
+      /* "mtrand.pyx":345
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -2919,7 +2929,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":346
+      /* "mtrand.pyx":346
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -2932,7 +2942,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":348
+    /* "mtrand.pyx":348
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -2961,7 +2971,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":349
+    /* "mtrand.pyx":349
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -2970,7 +2980,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":350
+    /* "mtrand.pyx":350
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -2984,7 +2994,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":351
+    /* "mtrand.pyx":351
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -2994,7 +3004,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":352
+      /* "mtrand.pyx":352
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3016,7 +3026,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":353
+    /* "mtrand.pyx":353
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3026,7 +3036,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":354
+      /* "mtrand.pyx":354
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3035,7 +3045,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":355
+      /* "mtrand.pyx":355
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3044,7 +3054,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":356
+      /* "mtrand.pyx":356
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3053,7 +3063,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":357
+      /* "mtrand.pyx":357
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -3062,7 +3072,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":358
+      /* "mtrand.pyx":358
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -3074,7 +3084,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":360
+  /* "mtrand.pyx":360
  *             PyArray_MultiIter_NEXTi(multi, 2)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -3105,7 +3115,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":362
+/* "mtrand.pyx":362
  *     return array
  * 
  * cdef object discdd_array_sc(rk_state *state, rk_discdd func, object size, double n, double p):             # <<<<<<<<<<<<<<
@@ -3128,7 +3138,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":368
+  /* "mtrand.pyx":368
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3138,7 +3148,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":369
+    /* "mtrand.pyx":369
  * 
  *     if size is None:
  *         return func(state, n, p)             # <<<<<<<<<<<<<<
@@ -3155,7 +3165,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":371
+    /* "mtrand.pyx":371
  *         return func(state, n, p)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3184,7 +3194,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":372
+    /* "mtrand.pyx":372
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -3193,7 +3203,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":373
+    /* "mtrand.pyx":373
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3202,7 +3212,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":374
+    /* "mtrand.pyx":374
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -3212,7 +3222,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":375
+      /* "mtrand.pyx":375
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)             # <<<<<<<<<<<<<<
@@ -3222,7 +3232,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_p);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":376
+    /* "mtrand.pyx":376
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, p)
  *         return array             # <<<<<<<<<<<<<<
@@ -3252,7 +3262,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":378
+/* "mtrand.pyx":378
  *         return array
  * 
  * cdef object discdd_array(rk_state *state, rk_discdd func, object size, ndarray on, ndarray op):             # <<<<<<<<<<<<<<
@@ -3280,7 +3290,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":387
+  /* "mtrand.pyx":387
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3290,7 +3300,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":388
+    /* "mtrand.pyx":388
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -3304,7 +3314,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":389
+    /* "mtrand.pyx":389
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -3318,7 +3328,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":390
+    /* "mtrand.pyx":390
  *         multi = <broadcast> PyArray_MultiIterNew(2, <void *>on, <void *>op)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3327,7 +3337,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":391
+    /* "mtrand.pyx":391
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3337,7 +3347,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":392
+      /* "mtrand.pyx":392
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -3346,7 +3356,7 @@
  */
       __pyx_v_on_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":393
+      /* "mtrand.pyx":393
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3355,7 +3365,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":394
+      /* "mtrand.pyx":394
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 0)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3364,7 +3374,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":395
+      /* "mtrand.pyx":395
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3377,7 +3387,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":397
+    /* "mtrand.pyx":397
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3406,7 +3416,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":398
+    /* "mtrand.pyx":398
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3415,7 +3425,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":399
+    /* "mtrand.pyx":399
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)             # <<<<<<<<<<<<<<
@@ -3429,7 +3439,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":400
+    /* "mtrand.pyx":400
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -3439,7 +3449,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":401
+      /* "mtrand.pyx":401
  *         multi = <broadcast>PyArray_MultiIterNew(3, <void*>array, <void *>on, <void *>op)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3461,7 +3471,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":402
+    /* "mtrand.pyx":402
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3471,7 +3481,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":403
+      /* "mtrand.pyx":403
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3480,7 +3490,7 @@
  */
       __pyx_v_on_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":404
+      /* "mtrand.pyx":404
  *         for i from 0 <= i < multi.size:
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3489,7 +3499,7 @@
  */
       __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":405
+      /* "mtrand.pyx":405
  *             on_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])             # <<<<<<<<<<<<<<
@@ -3498,7 +3508,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_op_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":406
+      /* "mtrand.pyx":406
  *             op_data = <double *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -3507,7 +3517,7 @@
  */
       PyArray_MultiIter_NEXTi(__pyx_v_multi, 1);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":407
+      /* "mtrand.pyx":407
  *             array_data[i] = func(state, on_data[0], op_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *             PyArray_MultiIter_NEXTi(multi, 2)             # <<<<<<<<<<<<<<
@@ -3519,7 +3529,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":409
+  /* "mtrand.pyx":409
  *             PyArray_MultiIter_NEXTi(multi, 2)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -3550,7 +3560,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":411
+/* "mtrand.pyx":411
  *     return array
  * 
  * cdef object discnmN_array_sc(rk_state *state, rk_discnmN func, object size,             # <<<<<<<<<<<<<<
@@ -3573,7 +3583,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":418
+  /* "mtrand.pyx":418
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3583,7 +3593,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":419
+    /* "mtrand.pyx":419
  * 
  *     if size is None:
  *         return func(state, n, m, N)             # <<<<<<<<<<<<<<
@@ -3600,7 +3610,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":421
+    /* "mtrand.pyx":421
  *         return func(state, n, m, N)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3629,7 +3639,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":422
+    /* "mtrand.pyx":422
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -3638,7 +3648,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":423
+    /* "mtrand.pyx":423
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3647,7 +3657,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":424
+    /* "mtrand.pyx":424
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -3657,7 +3667,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":425
+      /* "mtrand.pyx":425
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, m, N)             # <<<<<<<<<<<<<<
@@ -3667,7 +3677,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_n, __pyx_v_m, __pyx_v_N);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":426
+    /* "mtrand.pyx":426
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, n, m, N)
  *         return array             # <<<<<<<<<<<<<<
@@ -3697,7 +3707,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":428
+/* "mtrand.pyx":428
  *         return array
  * 
  * cdef object discnmN_array(rk_state *state, rk_discnmN func, object size,             # <<<<<<<<<<<<<<
@@ -3727,7 +3737,7 @@
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":439
+  /* "mtrand.pyx":439
  *     cdef broadcast multi
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -3737,7 +3747,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":440
+    /* "mtrand.pyx":440
  * 
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)             # <<<<<<<<<<<<<<
@@ -3751,7 +3761,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":441
+    /* "mtrand.pyx":441
  *     if size is None:
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -3765,7 +3775,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":442
+    /* "mtrand.pyx":442
  *         multi = <broadcast> PyArray_MultiIterNew(3, <void *>on, <void *>om, <void *>oN)
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3774,7 +3784,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":443
+    /* "mtrand.pyx":443
  *         array = <ndarray> PyArray_SimpleNew(multi.nd, multi.dimensions, NPY_LONG)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3784,7 +3794,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":444
+      /* "mtrand.pyx":444
  *         array_data = <long *>array.data
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)             # <<<<<<<<<<<<<<
@@ -3793,7 +3803,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 0));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":445
+      /* "mtrand.pyx":445
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3802,7 +3812,7 @@
  */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":446
+      /* "mtrand.pyx":446
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 0)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3811,7 +3821,7 @@
  */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":447
+      /* "mtrand.pyx":447
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])             # <<<<<<<<<<<<<<
@@ -3820,7 +3830,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_om_data[0]), (__pyx_v_oN_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":448
+      /* "mtrand.pyx":448
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3833,7 +3843,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":450
+    /* "mtrand.pyx":450
  *             PyArray_MultiIter_NEXT(multi)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -3862,7 +3872,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":451
+    /* "mtrand.pyx":451
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -3871,7 +3881,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":453
+    /* "mtrand.pyx":453
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>on, <void *>om,
  *                                                 <void *>oN)             # <<<<<<<<<<<<<<
@@ -3885,7 +3895,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":454
+    /* "mtrand.pyx":454
  *         multi = <broadcast>PyArray_MultiIterNew(4, <void*>array, <void *>on, <void *>om,
  *                                                 <void *>oN)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -3895,7 +3905,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":455
+      /* "mtrand.pyx":455
  *                                                 <void *>oN)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -3917,7 +3927,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":456
+    /* "mtrand.pyx":456
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -3927,7 +3937,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":457
+      /* "mtrand.pyx":457
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -3936,7 +3946,7 @@
  */
       __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":458
+      /* "mtrand.pyx":458
  *         for i from 0 <= i < multi.size:
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)             # <<<<<<<<<<<<<<
@@ -3945,7 +3955,7 @@
  */
       __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 2));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":459
+      /* "mtrand.pyx":459
  *             on_data = <long *>PyArray_MultiIter_DATA(multi, 1)
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)             # <<<<<<<<<<<<<<
@@ -3954,7 +3964,7 @@
  */
       __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi, 3));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":460
+      /* "mtrand.pyx":460
  *             om_data = <long *>PyArray_MultiIter_DATA(multi, 2)
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])             # <<<<<<<<<<<<<<
@@ -3963,7 +3973,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_on_data[0]), (__pyx_v_om_data[0]), (__pyx_v_oN_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":461
+      /* "mtrand.pyx":461
  *             oN_data = <long *>PyArray_MultiIter_DATA(multi, 3)
  *             array_data[i] = func(state, on_data[0], om_data[0], oN_data[0])
  *             PyArray_MultiIter_NEXT(multi)             # <<<<<<<<<<<<<<
@@ -3975,7 +3985,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":463
+  /* "mtrand.pyx":463
  *             PyArray_MultiIter_NEXT(multi)
  * 
  *     return array             # <<<<<<<<<<<<<<
@@ -4007,7 +4017,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":465
+/* "mtrand.pyx":465
  *     return array
  * 
  * cdef object discd_array_sc(rk_state *state, rk_discd func, object size, double a):             # <<<<<<<<<<<<<<
@@ -4030,7 +4040,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":471
+  /* "mtrand.pyx":471
  *     cdef long i
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -4040,7 +4050,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":472
+    /* "mtrand.pyx":472
  * 
  *     if size is None:
  *         return func(state, a)             # <<<<<<<<<<<<<<
@@ -4057,7 +4067,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":474
+    /* "mtrand.pyx":474
  *         return func(state, a)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -4086,7 +4096,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_4);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":475
+    /* "mtrand.pyx":475
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -4095,7 +4105,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":476
+    /* "mtrand.pyx":476
  *         array = <ndarray>np.empty(size, int)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4104,7 +4114,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":477
+    /* "mtrand.pyx":477
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -4114,7 +4124,7 @@
     __pyx_t_5 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":478
+      /* "mtrand.pyx":478
  *         array_data = <long *>array.data
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)             # <<<<<<<<<<<<<<
@@ -4124,7 +4134,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, __pyx_v_a);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":479
+    /* "mtrand.pyx":479
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, a)
  *         return array             # <<<<<<<<<<<<<<
@@ -4154,7 +4164,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":481
+/* "mtrand.pyx":481
  *         return array
  * 
  * cdef object discd_array(rk_state *state, rk_discd func, object size, ndarray oa):             # <<<<<<<<<<<<<<
@@ -4183,7 +4193,7 @@
   __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_itera = ((PyArrayIterObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":490
+  /* "mtrand.pyx":490
  *     cdef flatiter itera
  * 
  *     if size is None:             # <<<<<<<<<<<<<<
@@ -4193,7 +4203,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":491
+    /* "mtrand.pyx":491
  * 
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)             # <<<<<<<<<<<<<<
@@ -4207,7 +4217,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":492
+    /* "mtrand.pyx":492
  *     if size is None:
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)
  *         length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -4216,7 +4226,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":493
+    /* "mtrand.pyx":493
  *         array = <ndarray>PyArray_SimpleNew(oa.nd, oa.dimensions, NPY_LONG)
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4225,7 +4235,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":494
+    /* "mtrand.pyx":494
  *         length = PyArray_SIZE(array)
  *         array_data = <long *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)             # <<<<<<<<<<<<<<
@@ -4239,7 +4249,7 @@
     __pyx_v_itera = ((PyArrayIterObject *)__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":495
+    /* "mtrand.pyx":495
  *         array_data = <long *>array.data
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -4249,7 +4259,7 @@
     __pyx_t_3 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":496
+      /* "mtrand.pyx":496
  *         itera = <flatiter>PyArray_IterNew(<object>oa)
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])             # <<<<<<<<<<<<<<
@@ -4258,7 +4268,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (((double *)__pyx_v_itera->dataptr)[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":497
+      /* "mtrand.pyx":497
  *         for i from 0 <= i < length:
  *             array_data[i] = func(state, (<double *>(itera.dataptr))[0])
  *             PyArray_ITER_NEXT(itera)             # <<<<<<<<<<<<<<
@@ -4271,7 +4281,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":499
+    /* "mtrand.pyx":499
  *             PyArray_ITER_NEXT(itera)
  *     else:
  *         array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -4300,7 +4310,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":500
+    /* "mtrand.pyx":500
  *     else:
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -4309,7 +4319,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":501
+    /* "mtrand.pyx":501
  *         array = <ndarray>np.empty(size, int)
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)             # <<<<<<<<<<<<<<
@@ -4323,7 +4333,7 @@
     __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":502
+    /* "mtrand.pyx":502
  *         array_data = <long *>array.data
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):             # <<<<<<<<<<<<<<
@@ -4333,7 +4343,7 @@
     __pyx_t_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject));
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":503
+      /* "mtrand.pyx":503
  *         multi = <broadcast>PyArray_MultiIterNew(2, <void *>array, <void *>oa)
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")             # <<<<<<<<<<<<<<
@@ -4355,7 +4365,7 @@
     }
     __pyx_L6:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":504
+    /* "mtrand.pyx":504
  *         if (multi.size != PyArray_SIZE(array)):
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:             # <<<<<<<<<<<<<<
@@ -4365,7 +4375,7 @@
     __pyx_t_3 = __pyx_v_multi->size;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":505
+      /* "mtrand.pyx":505
  *             raise ValueError("size is not compatible with inputs")
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)             # <<<<<<<<<<<<<<
@@ -4374,7 +4384,7 @@
  */
       __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi, 1));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":506
+      /* "mtrand.pyx":506
  *         for i from 0 <= i < multi.size:
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])             # <<<<<<<<<<<<<<
@@ -4383,7 +4393,7 @@
  */
       (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state, (__pyx_v_oa_data[0]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":507
+      /* "mtrand.pyx":507
  *             oa_data = <double *>PyArray_MultiIter_DATA(multi, 1)
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)             # <<<<<<<<<<<<<<
@@ -4395,7 +4405,7 @@
   }
   __pyx_L3:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":508
+  /* "mtrand.pyx":508
  *             array_data[i] = func(state, oa_data[0])
  *             PyArray_MultiIter_NEXTi(multi, 1)
  *     return array             # <<<<<<<<<<<<<<
@@ -4426,7 +4436,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":510
+/* "mtrand.pyx":510
  *     return array
  * 
  * cdef double kahan_sum(double *darr, long n):             # <<<<<<<<<<<<<<
@@ -4444,7 +4454,7 @@
   long __pyx_t_1;
   __Pyx_RefNannySetupContext("kahan_sum");
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":513
+  /* "mtrand.pyx":513
  *     cdef double c, y, t, sum
  *     cdef long i
  *     sum = darr[0]             # <<<<<<<<<<<<<<
@@ -4453,7 +4463,7 @@
  */
   __pyx_v_sum = (__pyx_v_darr[0]);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":514
+  /* "mtrand.pyx":514
  *     cdef long i
  *     sum = darr[0]
  *     c = 0.0             # <<<<<<<<<<<<<<
@@ -4462,7 +4472,7 @@
  */
   __pyx_v_c = 0.0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":515
+  /* "mtrand.pyx":515
  *     sum = darr[0]
  *     c = 0.0
  *     for i from 1 <= i < n:             # <<<<<<<<<<<<<<
@@ -4472,7 +4482,7 @@
   __pyx_t_1 = __pyx_v_n;
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":516
+    /* "mtrand.pyx":516
  *     c = 0.0
  *     for i from 1 <= i < n:
  *         y = darr[i] - c             # <<<<<<<<<<<<<<
@@ -4481,7 +4491,7 @@
  */
     __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":517
+    /* "mtrand.pyx":517
  *     for i from 1 <= i < n:
  *         y = darr[i] - c
  *         t = sum + y             # <<<<<<<<<<<<<<
@@ -4490,7 +4500,7 @@
  */
     __pyx_v_t = (__pyx_v_sum + __pyx_v_y);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":518
+    /* "mtrand.pyx":518
  *         y = darr[i] - c
  *         t = sum + y
  *         c = (t-sum) - y             # <<<<<<<<<<<<<<
@@ -4499,7 +4509,7 @@
  */
     __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":519
+    /* "mtrand.pyx":519
  *         t = sum + y
  *         c = (t-sum) - y
  *         sum = t             # <<<<<<<<<<<<<<
@@ -4509,7 +4519,7 @@
     __pyx_v_sum = __pyx_v_t;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":520
+  /* "mtrand.pyx":520
  *         c = (t-sum) - y
  *         sum = t
  *     return sum             # <<<<<<<<<<<<<<
@@ -4525,7 +4535,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":557
+/* "mtrand.pyx":557
  *     cdef rk_state *internal_state
  * 
  *     def __init__(self, seed=None):             # <<<<<<<<<<<<<<
@@ -4578,7 +4588,7 @@
   return -1;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":558
+  /* "mtrand.pyx":558
  * 
  *     def __init__(self, seed=None):
  *         self.internal_state = <rk_state*>PyMem_Malloc(sizeof(rk_state))             # <<<<<<<<<<<<<<
@@ -4587,7 +4597,7 @@
  */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state *)PyMem_Malloc((sizeof(rk_state))));
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":560
+  /* "mtrand.pyx":560
  *         self.internal_state = <rk_state*>PyMem_Malloc(sizeof(rk_state))
  * 
  *         self.seed(seed)             # <<<<<<<<<<<<<<
@@ -4620,7 +4630,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":562
+/* "mtrand.pyx":562
  *         self.seed(seed)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -4634,7 +4644,7 @@
   __Pyx_RefNannySetupContext("__dealloc__");
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":563
+  /* "mtrand.pyx":563
  * 
  *     def __dealloc__(self):
  *         if self.internal_state != NULL:             # <<<<<<<<<<<<<<
@@ -4644,7 +4654,7 @@
   __pyx_t_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != NULL);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":564
+    /* "mtrand.pyx":564
  *     def __dealloc__(self):
  *         if self.internal_state != NULL:
  *             PyMem_Free(self.internal_state)             # <<<<<<<<<<<<<<
@@ -4653,7 +4663,7 @@
  */
     PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":565
+    /* "mtrand.pyx":565
  *         if self.internal_state != NULL:
  *             PyMem_Free(self.internal_state)
  *             self.internal_state = NULL             # <<<<<<<<<<<<<<
@@ -4669,7 +4679,7 @@
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":567
+/* "mtrand.pyx":567
  *             self.internal_state = NULL
  * 
  *     def seed(self, seed=None):             # <<<<<<<<<<<<<<
@@ -4686,8 +4696,8 @@
   PyObject *__pyx_v_iseed;
   PyObject *__pyx_r = NULL;
   int __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
-  unsigned long __pyx_t_3;
+  unsigned long __pyx_t_2;
+  PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
   static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__seed,0};
   __Pyx_RefNannySetupContext("seed");
@@ -4731,7 +4741,7 @@
   arrayObject_obj = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_iseed = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":588
+  /* "mtrand.pyx":588
  *         cdef rk_error errcode
  *         cdef ndarray obj "arrayObject_obj"
  *         if seed is None:             # <<<<<<<<<<<<<<
@@ -4741,7 +4751,7 @@
   __pyx_t_1 = (__pyx_v_seed == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":589
+    /* "mtrand.pyx":589
  *         cdef ndarray obj "arrayObject_obj"
  *         if seed is None:
  *             errcode = rk_randomseed(self.internal_state)             # <<<<<<<<<<<<<<
@@ -4752,48 +4762,45 @@
     goto __pyx_L6;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":590
+  /* "mtrand.pyx":590
  *         if seed is None:
  *             errcode = rk_randomseed(self.internal_state)
  *         elif type(seed) is int:             # <<<<<<<<<<<<<<
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):
  */
-  __pyx_t_2 = ((PyObject *)__Pyx_Type(__pyx_v_seed)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 590; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
-  __pyx_t_1 = (__pyx_t_2 == ((PyObject*)&PyInt_Type));
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_1 = (((PyObject *)Py_TYPE(__pyx_v_seed)) == ((PyObject *)((PyObject*)&PyInt_Type)));
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":591
+    /* "mtrand.pyx":591
  *             errcode = rk_randomseed(self.internal_state)
  *         elif type(seed) is int:
  *             rk_seed(seed, self.internal_state)             # <<<<<<<<<<<<<<
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)
  */
-    __pyx_t_3 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_seed); if (unlikely((__pyx_t_3 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    rk_seed(__pyx_t_3, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
+    __pyx_t_2 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_seed); if (unlikely((__pyx_t_2 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    rk_seed(__pyx_t_2, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L6;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":592
+  /* "mtrand.pyx":592
  *         elif type(seed) is int:
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):             # <<<<<<<<<<<<<<
  *             iseed = int(seed)
  *             rk_seed(iseed, self.internal_state)
  */
-  __pyx_t_2 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_4 = PyObject_GetAttr(__pyx_t_2, __pyx_n_s__integer); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_GetName(__pyx_m, __pyx_n_s__np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_t_4 = PyObject_GetAttr(__pyx_t_3, __pyx_n_s__integer); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_1 = PyObject_IsInstance(__pyx_v_seed, __pyx_t_4); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":593
+    /* "mtrand.pyx":593
  *             rk_seed(seed, self.internal_state)
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)             # <<<<<<<<<<<<<<
@@ -4805,41 +4812,41 @@
     __Pyx_INCREF(__pyx_v_seed);
     PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_seed);
     __Pyx_GIVEREF(__pyx_v_seed);
-    __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_2);
+    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyInt_Type)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_v_iseed);
-    __pyx_v_iseed = __pyx_t_2;
-    __pyx_t_2 = 0;
+    __pyx_v_iseed = __pyx_t_3;
+    __pyx_t_3 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":594
+    /* "mtrand.pyx":594
  *         elif isinstance(seed, np.integer):
  *             iseed = int(seed)
  *             rk_seed(iseed, self.internal_state)             # <<<<<<<<<<<<<<
  *         else:
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)
  */
-    __pyx_t_3 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_iseed); if (unlikely((__pyx_t_3 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    rk_seed(__pyx_t_3, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
+    __pyx_t_2 = __Pyx_PyInt_AsUnsignedLong(__pyx_v_iseed); if (unlikely((__pyx_t_2 == (unsigned long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 594; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    rk_seed(__pyx_t_2, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
     goto __pyx_L6;
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":596
+    /* "mtrand.pyx":596
  *             rk_seed(iseed, self.internal_state)
  *         else:
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)             # <<<<<<<<<<<<<<
  *             init_by_array(self.internal_state, <unsigned long *>(obj.data),
  *                 obj.dimensions[0])
  */
-    __pyx_t_2 = PyArray_ContiguousFromObject(__pyx_v_seed, NPY_LONG, 1, 1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_t_2)));
+    __pyx_t_3 = PyArray_ContiguousFromObject(__pyx_v_seed, NPY_LONG, 1, 1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_INCREF(((PyObject *)((PyArrayObject *)__pyx_t_3)));
     __Pyx_DECREF(((PyObject *)arrayObject_obj));
-    arrayObject_obj = ((PyArrayObject *)__pyx_t_2);
-    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    arrayObject_obj = ((PyArrayObject *)__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":598
+    /* "mtrand.pyx":598
  *             obj = <ndarray>PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1)
  *             init_by_array(self.internal_state, <unsigned long *>(obj.data),
  *                 obj.dimensions[0])             # <<<<<<<<<<<<<<
@@ -4853,7 +4860,7 @@
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_AddTraceback("mtrand.RandomState.seed");
   __pyx_r = NULL;
@@ -4867,7 +4874,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":600
+/* "mtrand.pyx":600
  *                 obj.dimensions[0])
  * 
  *     def get_state(self):             # <<<<<<<<<<<<<<
@@ -4887,7 +4894,7 @@
   __Pyx_RefNannySetupContext("get_state");
   arrayObject_state = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":631
+  /* "mtrand.pyx":631
  *         """
  *         cdef ndarray state "arrayObject_state"
  *         state = <ndarray>np.empty(624, np.uint)             # <<<<<<<<<<<<<<
@@ -4921,7 +4928,7 @@
   arrayObject_state = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":632
+  /* "mtrand.pyx":632
  *         cdef ndarray state "arrayObject_state"
  *         state = <ndarray>np.empty(624, np.uint)
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))             # <<<<<<<<<<<<<<
@@ -4930,7 +4937,7 @@
  */
   memcpy(((void *)arrayObject_state->data), ((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key), (624 * (sizeof(long))));
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":633
+  /* "mtrand.pyx":633
  *         state = <ndarray>np.empty(624, np.uint)
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))
  *         state = <ndarray>np.asarray(state, np.uint32)             # <<<<<<<<<<<<<<
@@ -4964,7 +4971,7 @@
   arrayObject_state = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":634
+  /* "mtrand.pyx":634
  *         memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long))
  *         state = <ndarray>np.asarray(state, np.uint32)
  *         return ('MT19937', state, self.internal_state.pos,             # <<<<<<<<<<<<<<
@@ -4975,7 +4982,7 @@
   __pyx_t_2 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 634; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":635
+  /* "mtrand.pyx":635
  *         state = <ndarray>np.asarray(state, np.uint32)
  *         return ('MT19937', state, self.internal_state.pos,
  *             self.internal_state.has_gauss, self.internal_state.gauss)             # <<<<<<<<<<<<<<
@@ -5023,7 +5030,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":637
+/* "mtrand.pyx":637
  *             self.internal_state.has_gauss, self.internal_state.gauss)
  * 
  *     def set_state(self, state):             # <<<<<<<<<<<<<<
@@ -5058,7 +5065,7 @@
   __pyx_v_has_gauss = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_cached_gaussian = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":686
+  /* "mtrand.pyx":686
  *         cdef ndarray obj "arrayObject_obj"
  *         cdef int pos
  *         algorithm_name = state[0]             # <<<<<<<<<<<<<<
@@ -5071,7 +5078,7 @@
   __pyx_v_algorithm_name = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":687
+  /* "mtrand.pyx":687
  *         cdef int pos
  *         algorithm_name = state[0]
  *         if algorithm_name != 'MT19937':             # <<<<<<<<<<<<<<
@@ -5084,7 +5091,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":688
+    /* "mtrand.pyx":688
  *         algorithm_name = state[0]
  *         if algorithm_name != 'MT19937':
  *             raise ValueError("algorithm must be 'MT19937'")             # <<<<<<<<<<<<<<
@@ -5106,7 +5113,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":689
+  /* "mtrand.pyx":689
  *         if algorithm_name != 'MT19937':
  *             raise ValueError("algorithm must be 'MT19937'")
  *         key, pos = state[1:3]             # <<<<<<<<<<<<<<
@@ -5144,7 +5151,7 @@
     __pyx_v_pos = __pyx_t_5;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":690
+  /* "mtrand.pyx":690
  *             raise ValueError("algorithm must be 'MT19937'")
  *         key, pos = state[1:3]
  *         if len(state) == 3:             # <<<<<<<<<<<<<<
@@ -5155,7 +5162,7 @@
   __pyx_t_2 = (__pyx_t_7 == 3);
   if (__pyx_t_2) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":691
+    /* "mtrand.pyx":691
  *         key, pos = state[1:3]
  *         if len(state) == 3:
  *             has_gauss = 0             # <<<<<<<<<<<<<<
@@ -5166,7 +5173,7 @@
     __Pyx_DECREF(__pyx_v_has_gauss);
     __pyx_v_has_gauss = __pyx_int_0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":692
+    /* "mtrand.pyx":692
  *         if len(state) == 3:
  *             has_gauss = 0
  *             cached_gaussian = 0.0             # <<<<<<<<<<<<<<
@@ -5182,7 +5189,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":694
+    /* "mtrand.pyx":694
  *             cached_gaussian = 0.0
  *         else:
  *             has_gauss, cached_gaussian = state[3:5]             # <<<<<<<<<<<<<<
@@ -5222,7 +5229,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":695
+  /* "mtrand.pyx":695
  *         else:
  *             has_gauss, cached_gaussian = state[3:5]
  *         try:             # <<<<<<<<<<<<<<
@@ -5237,7 +5244,7 @@
     __Pyx_XGOTREF(__pyx_save_exc_tb);
     /*try:*/ {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":696
+      /* "mtrand.pyx":696
  *             has_gauss, cached_gaussian = state[3:5]
  *         try:
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_ULONG, 1, 1)             # <<<<<<<<<<<<<<
@@ -5261,7 +5268,7 @@
     __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":697
+    /* "mtrand.pyx":697
  *         try:
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_ULONG, 1, 1)
  *         except TypeError:             # <<<<<<<<<<<<<<
@@ -5276,7 +5283,7 @@
       __Pyx_GOTREF(__pyx_t_1);
       __Pyx_GOTREF(__pyx_t_4);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":699
+      /* "mtrand.pyx":699
  *         except TypeError:
  *             # compatibility -- could be an older pickle
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)             # <<<<<<<<<<<<<<
@@ -5308,7 +5315,7 @@
     __pyx_L14_try_end:;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":700
+  /* "mtrand.pyx":700
  *             # compatibility -- could be an older pickle
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)
  *         if obj.dimensions[0] != 624:             # <<<<<<<<<<<<<<
@@ -5318,7 +5325,7 @@
   __pyx_t_2 = ((arrayObject_obj->dimensions[0]) != 624);
   if (__pyx_t_2) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":701
+    /* "mtrand.pyx":701
  *             obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1)
  *         if obj.dimensions[0] != 624:
  *             raise ValueError("state must be 624 longs")             # <<<<<<<<<<<<<<
@@ -5340,7 +5347,7 @@
   }
   __pyx_L17:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":702
+  /* "mtrand.pyx":702
  *         if obj.dimensions[0] != 624:
  *             raise ValueError("state must be 624 longs")
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))             # <<<<<<<<<<<<<<
@@ -5349,7 +5356,7 @@
  */
   memcpy(((void *)((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key), ((void *)arrayObject_obj->data), (624 * (sizeof(long))));
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":703
+  /* "mtrand.pyx":703
  *             raise ValueError("state must be 624 longs")
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))
  *         self.internal_state.pos = pos             # <<<<<<<<<<<<<<
@@ -5358,7 +5365,7 @@
  */
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":704
+  /* "mtrand.pyx":704
  *         memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long))
  *         self.internal_state.pos = pos
  *         self.internal_state.has_gauss = has_gauss             # <<<<<<<<<<<<<<
@@ -5368,14 +5375,14 @@
   __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_v_has_gauss); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->has_gauss = __pyx_t_5;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":705
+  /* "mtrand.pyx":705
  *         self.internal_state.pos = pos
  *         self.internal_state.has_gauss = has_gauss
  *         self.internal_state.gauss = cached_gaussian             # <<<<<<<<<<<<<<
  * 
  *     # Pickling support:
  */
-  __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_cached_gaussian); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_cached_gaussian); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->gauss = __pyx_t_8;
 
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
@@ -5400,7 +5407,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":708
+/* "mtrand.pyx":708
  * 
  *     # Pickling support:
  *     def __getstate__(self):             # <<<<<<<<<<<<<<
@@ -5415,7 +5422,7 @@
   PyObject *__pyx_t_2 = NULL;
   __Pyx_RefNannySetupContext("__getstate__");
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":709
+  /* "mtrand.pyx":709
  *     # Pickling support:
  *     def __getstate__(self):
  *         return self.get_state()             # <<<<<<<<<<<<<<
@@ -5445,7 +5452,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":711
+/* "mtrand.pyx":711
  *         return self.get_state()
  * 
  *     def __setstate__(self, state):             # <<<<<<<<<<<<<<
@@ -5461,7 +5468,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("__setstate__");
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":712
+  /* "mtrand.pyx":712
  * 
  *     def __setstate__(self, state):
  *         self.set_state(state)             # <<<<<<<<<<<<<<
@@ -5495,7 +5502,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":714
+/* "mtrand.pyx":714
  *         self.set_state(state)
  * 
  *     def __reduce__(self):             # <<<<<<<<<<<<<<
@@ -5511,7 +5518,7 @@
   PyObject *__pyx_t_3 = NULL;
   __Pyx_RefNannySetupContext("__reduce__");
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":715
+  /* "mtrand.pyx":715
  * 
  *     def __reduce__(self):
  *         return (np.random.__RandomState_ctor, (), self.get_state())             # <<<<<<<<<<<<<<
@@ -5561,7 +5568,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":718
+/* "mtrand.pyx":718
  * 
  *     # Basic distributions:
  *     def random_sample(self, size=None):             # <<<<<<<<<<<<<<
@@ -5613,7 +5620,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":759
+  /* "mtrand.pyx":759
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_double, size)             # <<<<<<<<<<<<<<
@@ -5639,7 +5646,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":761
+/* "mtrand.pyx":761
  *         return cont0_array(self.internal_state, rk_double, size)
  * 
  *     def tomaxint(self, size=None):             # <<<<<<<<<<<<<<
@@ -5691,7 +5698,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":787
+  /* "mtrand.pyx":787
  * 
  *         """
  *         return disc0_array(self.internal_state, rk_long, size)             # <<<<<<<<<<<<<<
@@ -5717,7 +5724,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":789
+/* "mtrand.pyx":789
  *         return disc0_array(self.internal_state, rk_long, size)
  * 
  *     def randint(self, low, high=None, size=None):             # <<<<<<<<<<<<<<
@@ -5804,7 +5811,7 @@
   __Pyx_INCREF(__pyx_v_size);
   arrayObject = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":845
+  /* "mtrand.pyx":845
  *         cdef long i
  * 
  *         if high is None:             # <<<<<<<<<<<<<<
@@ -5814,7 +5821,7 @@
   __pyx_t_1 = (__pyx_v_high == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":846
+    /* "mtrand.pyx":846
  * 
  *         if high is None:
  *             lo = 0             # <<<<<<<<<<<<<<
@@ -5823,7 +5830,7 @@
  */
     __pyx_v_lo = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":847
+    /* "mtrand.pyx":847
  *         if high is None:
  *             lo = 0
  *             hi = low             # <<<<<<<<<<<<<<
@@ -5836,7 +5843,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":849
+    /* "mtrand.pyx":849
  *             hi = low
  *         else:
  *             lo = low             # <<<<<<<<<<<<<<
@@ -5846,7 +5853,7 @@
     __pyx_t_2 = __Pyx_PyInt_AsLong(__pyx_v_low); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_lo = __pyx_t_2;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":850
+    /* "mtrand.pyx":850
  *         else:
  *             lo = low
  *             hi = high             # <<<<<<<<<<<<<<
@@ -5858,7 +5865,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":852
+  /* "mtrand.pyx":852
  *             hi = high
  * 
  *         diff = hi - lo - 1             # <<<<<<<<<<<<<<
@@ -5867,7 +5874,7 @@
  */
   __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":853
+  /* "mtrand.pyx":853
  * 
  *         diff = hi - lo - 1
  *         if diff < 0:             # <<<<<<<<<<<<<<
@@ -5877,7 +5884,7 @@
   __pyx_t_1 = (__pyx_v_diff < 0);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":854
+    /* "mtrand.pyx":854
  *         diff = hi - lo - 1
  *         if diff < 0:
  *             raise ValueError("low >= high")             # <<<<<<<<<<<<<<
@@ -5899,7 +5906,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":856
+  /* "mtrand.pyx":856
  *             raise ValueError("low >= high")
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -5909,7 +5916,7 @@
   __pyx_t_1 = (__pyx_v_size == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":857
+    /* "mtrand.pyx":857
  * 
  *         if size is None:
  *             return <long>rk_interval(diff, self.internal_state) + lo             # <<<<<<<<<<<<<<
@@ -5926,7 +5933,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":859
+    /* "mtrand.pyx":859
  *             return <long>rk_interval(diff, self.internal_state) + lo
  *         else:
  *             array = <ndarray>np.empty(size, int)             # <<<<<<<<<<<<<<
@@ -5955,7 +5962,7 @@
     arrayObject = ((PyArrayObject *)__pyx_t_5);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":860
+    /* "mtrand.pyx":860
  *         else:
  *             array = <ndarray>np.empty(size, int)
  *             length = PyArray_SIZE(array)             # <<<<<<<<<<<<<<
@@ -5964,7 +5971,7 @@
  */
     __pyx_v_length = PyArray_SIZE(arrayObject);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":861
+    /* "mtrand.pyx":861
  *             array = <ndarray>np.empty(size, int)
  *             length = PyArray_SIZE(array)
  *             array_data = <long *>array.data             # <<<<<<<<<<<<<<
@@ -5973,7 +5980,7 @@
  */
     __pyx_v_array_data = ((long *)arrayObject->data);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":862
+    /* "mtrand.pyx":862
  *             length = PyArray_SIZE(array)
  *             array_data = <long *>array.data
  *             for i from 0 <= i < length:             # <<<<<<<<<<<<<<
@@ -5983,7 +5990,7 @@
     __pyx_t_2 = __pyx_v_length;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":863
+      /* "mtrand.pyx":863
  *             array_data = <long *>array.data
  *             for i from 0 <= i < length:
  *                 array_data[i] = lo + <long>rk_interval(diff, self.internal_state)             # <<<<<<<<<<<<<<
@@ -5993,7 +6000,7 @@
       (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long)rk_interval(__pyx_v_diff, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)));
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":864
+    /* "mtrand.pyx":864
  *             for i from 0 <= i < length:
  *                 array_data[i] = lo + <long>rk_interval(diff, self.internal_state)
  *             return array             # <<<<<<<<<<<<<<
@@ -6026,7 +6033,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":866
+/* "mtrand.pyx":866
  *             return array
  * 
  *     def bytes(self, unsigned int length):             # <<<<<<<<<<<<<<
@@ -6053,7 +6060,7 @@
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_bytestring = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":889
+  /* "mtrand.pyx":889
  *         """
  *         cdef void *bytes
  *         bytestring = empty_py_bytes(length, &bytes)             # <<<<<<<<<<<<<<
@@ -6066,7 +6073,7 @@
   __pyx_v_bytestring = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":890
+  /* "mtrand.pyx":890
  *         cdef void *bytes
  *         bytestring = empty_py_bytes(length, &bytes)
  *         rk_fill(bytes, length, self.internal_state)             # <<<<<<<<<<<<<<
@@ -6075,7 +6082,7 @@
  */
   rk_fill(__pyx_v_bytes, __pyx_v_length, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":891
+  /* "mtrand.pyx":891
  *         bytestring = empty_py_bytes(length, &bytes)
  *         rk_fill(bytes, length, self.internal_state)
  *         return bytestring             # <<<<<<<<<<<<<<
@@ -6100,7 +6107,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":893
+/* "mtrand.pyx":893
  *         return bytestring
  * 
  *     def uniform(self, low=0.0, high=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -6191,7 +6198,7 @@
   __pyx_v_odiff = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_temp = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":968
+  /* "mtrand.pyx":968
  *         cdef object temp
  * 
  *         flow = PyFloat_AsDouble(low)             # <<<<<<<<<<<<<<
@@ -6200,7 +6207,7 @@
  */
   __pyx_v_flow = PyFloat_AsDouble(__pyx_v_low);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":969
+  /* "mtrand.pyx":969
  * 
  *         flow = PyFloat_AsDouble(low)
  *         fhigh = PyFloat_AsDouble(high)             # <<<<<<<<<<<<<<
@@ -6209,7 +6216,7 @@
  */
   __pyx_v_fhigh = PyFloat_AsDouble(__pyx_v_high);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":970
+  /* "mtrand.pyx":970
  *         flow = PyFloat_AsDouble(low)
  *         fhigh = PyFloat_AsDouble(high)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -6219,7 +6226,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":971
+    /* "mtrand.pyx":971
  *         fhigh = PyFloat_AsDouble(high)
  *         if not PyErr_Occurred():
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)             # <<<<<<<<<<<<<<
@@ -6236,7 +6243,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":972
+  /* "mtrand.pyx":972
  *         if not PyErr_Occurred():
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -6245,7 +6252,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":973
+  /* "mtrand.pyx":973
  *             return cont2_array_sc(self.internal_state, rk_uniform, size, flow, fhigh-flow)
  *         PyErr_Clear()
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6259,7 +6266,7 @@
   __pyx_v_olow = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":974
+  /* "mtrand.pyx":974
  *         PyErr_Clear()
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6273,7 +6280,7 @@
   __pyx_v_ohigh = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":975
+  /* "mtrand.pyx":975
  *         olow = <ndarray>PyArray_FROM_OTF(low, NPY_DOUBLE, NPY_ALIGNED)
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)
  *         temp = np.subtract(ohigh, olow)             # <<<<<<<<<<<<<<
@@ -6301,7 +6308,7 @@
   __pyx_v_temp = __pyx_t_4;
   __pyx_t_4 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":976
+  /* "mtrand.pyx":976
  *         ohigh = <ndarray>PyArray_FROM_OTF(high, NPY_DOUBLE, NPY_ALIGNED)
  *         temp = np.subtract(ohigh, olow)
  *         Py_INCREF(temp) # needed to get around Pyrex's automatic reference-counting             # <<<<<<<<<<<<<<
@@ -6310,7 +6317,7 @@
  */
   Py_INCREF(__pyx_v_temp);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":978
+  /* "mtrand.pyx":978
  *         Py_INCREF(temp) # needed to get around Pyrex's automatic reference-counting
  *                         #  rules because EnsureArray steals a reference
  *         odiff = <ndarray>PyArray_EnsureArray(temp)             # <<<<<<<<<<<<<<
@@ -6324,7 +6331,7 @@
   __pyx_v_odiff = ((PyArrayObject *)__pyx_t_4);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":979
+  /* "mtrand.pyx":979
  *                         #  rules because EnsureArray steals a reference
  *         odiff = <ndarray>PyArray_EnsureArray(temp)
  *         return cont2_array(self.internal_state, rk_uniform, size, olow, odiff)             # <<<<<<<<<<<<<<
@@ -6360,7 +6367,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":981
+/* "mtrand.pyx":981
  *         return cont2_array(self.internal_state, rk_uniform, size, olow, odiff)
  * 
  *     def rand(self, *args):             # <<<<<<<<<<<<<<
@@ -6384,7 +6391,7 @@
   __pyx_v_args = __pyx_args;
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1019
+  /* "mtrand.pyx":1019
  * 
  *         """
  *         if len(args) == 0:             # <<<<<<<<<<<<<<
@@ -6395,7 +6402,7 @@
   __pyx_t_2 = (__pyx_t_1 == 0);
   if (__pyx_t_2) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1020
+    /* "mtrand.pyx":1020
  *         """
  *         if len(args) == 0:
  *             return self.random_sample()             # <<<<<<<<<<<<<<
@@ -6415,7 +6422,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1022
+    /* "mtrand.pyx":1022
  *             return self.random_sample()
  *         else:
  *             return self.random_sample(size=args)             # <<<<<<<<<<<<<<
@@ -6454,7 +6461,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1024
+/* "mtrand.pyx":1024
  *             return self.random_sample(size=args)
  * 
  *     def randn(self, *args):             # <<<<<<<<<<<<<<
@@ -6478,7 +6485,7 @@
   __pyx_v_args = __pyx_args;
   __Pyx_INCREF((PyObject *)__pyx_v_self);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1075
+  /* "mtrand.pyx":1075
  * 
  *         """
  *         if len(args) == 0:             # <<<<<<<<<<<<<<
@@ -6489,7 +6496,7 @@
   __pyx_t_2 = (__pyx_t_1 == 0);
   if (__pyx_t_2) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1076
+    /* "mtrand.pyx":1076
  *         """
  *         if len(args) == 0:
  *             return self.standard_normal()             # <<<<<<<<<<<<<<
@@ -6509,7 +6516,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1078
+    /* "mtrand.pyx":1078
  *             return self.standard_normal()
  *         else:
  *             return self.standard_normal(args)             # <<<<<<<<<<<<<<
@@ -6550,7 +6557,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1080
+/* "mtrand.pyx":1080
  *             return self.standard_normal(args)
  * 
  *     def random_integers(self, low, high=None, size=None):             # <<<<<<<<<<<<<<
@@ -6628,7 +6635,7 @@
   __Pyx_INCREF(__pyx_v_high);
   __Pyx_INCREF(__pyx_v_size);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1152
+  /* "mtrand.pyx":1152
  * 
  *         """
  *         if high is None:             # <<<<<<<<<<<<<<
@@ -6638,7 +6645,7 @@
   __pyx_t_1 = (__pyx_v_high == Py_None);
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1153
+    /* "mtrand.pyx":1153
  *         """
  *         if high is None:
  *             high = low             # <<<<<<<<<<<<<<
@@ -6649,7 +6656,7 @@
     __Pyx_DECREF(__pyx_v_high);
     __pyx_v_high = __pyx_v_low;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1154
+    /* "mtrand.pyx":1154
  *         if high is None:
  *             high = low
  *             low = 1             # <<<<<<<<<<<<<<
@@ -6663,7 +6670,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1155
+  /* "mtrand.pyx":1155
  *             high = low
  *             low = 1
  *         return self.randint(low, high+1, size)             # <<<<<<<<<<<<<<
@@ -6712,7 +6719,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1158
+/* "mtrand.pyx":1158
  * 
  *     # Complicated, continuous distributions:
  *     def standard_normal(self, size=None):             # <<<<<<<<<<<<<<
@@ -6764,7 +6771,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1188
+  /* "mtrand.pyx":1188
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_gauss, size)             # <<<<<<<<<<<<<<
@@ -6790,7 +6797,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1190
+/* "mtrand.pyx":1190
  *         return cont0_array(self.internal_state, rk_gauss, size)
  * 
  *     def normal(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -6878,7 +6885,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1275
+  /* "mtrand.pyx":1275
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -6887,7 +6894,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1276
+  /* "mtrand.pyx":1276
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -6896,7 +6903,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1277
+  /* "mtrand.pyx":1277
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -6906,7 +6913,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1278
+    /* "mtrand.pyx":1278
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -6916,7 +6923,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1279
+      /* "mtrand.pyx":1279
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -6938,7 +6945,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1280
+    /* "mtrand.pyx":1280
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_normal, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -6955,7 +6962,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1282
+  /* "mtrand.pyx":1282
  *             return cont2_array_sc(self.internal_state, rk_normal, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -6964,7 +6971,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1284
+  /* "mtrand.pyx":1284
  *         PyErr_Clear()
  * 
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6978,7 +6985,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1285
+  /* "mtrand.pyx":1285
  * 
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -6992,7 +6999,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1286
+  /* "mtrand.pyx":1286
  *         oloc = <ndarray>PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0)):             # <<<<<<<<<<<<<<
@@ -7034,7 +7041,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1287
+    /* "mtrand.pyx":1287
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7056,7 +7063,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1288
+  /* "mtrand.pyx":1288
  *         if np.any(np.less_equal(oscale, 0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_normal, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -7091,7 +7098,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1290
+/* "mtrand.pyx":1290
  *         return cont2_array(self.internal_state, rk_normal, size, oloc, oscale)
  * 
  *     def beta(self, a, b, size=None):             # <<<<<<<<<<<<<<
@@ -7177,7 +7184,7 @@
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ob = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1330
+  /* "mtrand.pyx":1330
  *         cdef double fa, fb
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -7186,7 +7193,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1331
+  /* "mtrand.pyx":1331
  * 
  *         fa = PyFloat_AsDouble(a)
  *         fb = PyFloat_AsDouble(b)             # <<<<<<<<<<<<<<
@@ -7195,7 +7202,7 @@
  */
   __pyx_v_fb = PyFloat_AsDouble(__pyx_v_b);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1332
+  /* "mtrand.pyx":1332
  *         fa = PyFloat_AsDouble(a)
  *         fb = PyFloat_AsDouble(b)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7205,7 +7212,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1333
+    /* "mtrand.pyx":1333
  *         fb = PyFloat_AsDouble(b)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -7215,7 +7222,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1334
+      /* "mtrand.pyx":1334
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -7237,7 +7244,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1335
+    /* "mtrand.pyx":1335
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             if fb <= 0:             # <<<<<<<<<<<<<<
@@ -7247,7 +7254,7 @@
     __pyx_t_1 = (__pyx_v_fb <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1336
+      /* "mtrand.pyx":1336
  *                 raise ValueError("a <= 0")
  *             if fb <= 0:
  *                 raise ValueError("b <= 0")             # <<<<<<<<<<<<<<
@@ -7269,7 +7276,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1337
+    /* "mtrand.pyx":1337
  *             if fb <= 0:
  *                 raise ValueError("b <= 0")
  *             return cont2_array_sc(self.internal_state, rk_beta, size, fa, fb)             # <<<<<<<<<<<<<<
@@ -7286,7 +7293,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1339
+  /* "mtrand.pyx":1339
  *             return cont2_array_sc(self.internal_state, rk_beta, size, fa, fb)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7295,7 +7302,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1341
+  /* "mtrand.pyx":1341
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7309,7 +7316,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1342
+  /* "mtrand.pyx":1342
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7323,7 +7330,7 @@
   __pyx_v_ob = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1343
+  /* "mtrand.pyx":1343
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0)):             # <<<<<<<<<<<<<<
@@ -7365,7 +7372,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1344
+    /* "mtrand.pyx":1344
  *         ob = <ndarray>PyArray_FROM_OTF(b, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -7387,7 +7394,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1345
+  /* "mtrand.pyx":1345
  *         if np.any(np.less_equal(oa, 0)):
  *             raise ValueError("a <= 0")
  *         if np.any(np.less_equal(ob, 0)):             # <<<<<<<<<<<<<<
@@ -7429,7 +7436,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1346
+    /* "mtrand.pyx":1346
  *             raise ValueError("a <= 0")
  *         if np.any(np.less_equal(ob, 0)):
  *             raise ValueError("b <= 0")             # <<<<<<<<<<<<<<
@@ -7451,7 +7458,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1347
+  /* "mtrand.pyx":1347
  *         if np.any(np.less_equal(ob, 0)):
  *             raise ValueError("b <= 0")
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)             # <<<<<<<<<<<<<<
@@ -7486,7 +7493,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1349
+/* "mtrand.pyx":1349
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)
  * 
  *     def exponential(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -7559,7 +7566,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1390
+  /* "mtrand.pyx":1390
  *         cdef double fscale
  * 
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -7568,7 +7575,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1391
+  /* "mtrand.pyx":1391
  * 
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7578,7 +7585,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1392
+    /* "mtrand.pyx":1392
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -7588,7 +7595,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1393
+      /* "mtrand.pyx":1393
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7610,7 +7617,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1394
+    /* "mtrand.pyx":1394
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont1_array_sc(self.internal_state, rk_exponential, size, fscale)             # <<<<<<<<<<<<<<
@@ -7627,7 +7634,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1396
+  /* "mtrand.pyx":1396
  *             return cont1_array_sc(self.internal_state, rk_exponential, size, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7636,7 +7643,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1398
+  /* "mtrand.pyx":1398
  *         PyErr_Clear()
  * 
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7650,7 +7657,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1399
+  /* "mtrand.pyx":1399
  * 
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -7694,7 +7701,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1400
+    /* "mtrand.pyx":1400
  *         oscale = <ndarray> PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -7716,7 +7723,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1401
+  /* "mtrand.pyx":1401
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont1_array(self.internal_state, rk_exponential, size, oscale)             # <<<<<<<<<<<<<<
@@ -7749,7 +7756,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1403
+/* "mtrand.pyx":1403
  *         return cont1_array(self.internal_state, rk_exponential, size, oscale)
  * 
  *     def standard_exponential(self, size=None):             # <<<<<<<<<<<<<<
@@ -7801,7 +7808,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1429
+  /* "mtrand.pyx":1429
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_standard_exponential, size)             # <<<<<<<<<<<<<<
@@ -7827,7 +7834,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1431
+/* "mtrand.pyx":1431
  *         return cont0_array(self.internal_state, rk_standard_exponential, size)
  * 
  *     def standard_gamma(self, shape, size=None):             # <<<<<<<<<<<<<<
@@ -7897,7 +7904,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oshape = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1501
+  /* "mtrand.pyx":1501
  *         cdef double fshape
  * 
  *         fshape = PyFloat_AsDouble(shape)             # <<<<<<<<<<<<<<
@@ -7906,7 +7913,7 @@
  */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1502
+  /* "mtrand.pyx":1502
  * 
  *         fshape = PyFloat_AsDouble(shape)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -7916,7 +7923,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1503
+    /* "mtrand.pyx":1503
  *         fshape = PyFloat_AsDouble(shape)
  *         if not PyErr_Occurred():
  *             if fshape <= 0:             # <<<<<<<<<<<<<<
@@ -7926,7 +7933,7 @@
     __pyx_t_1 = (__pyx_v_fshape <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1504
+      /* "mtrand.pyx":1504
  *         if not PyErr_Occurred():
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -7948,7 +7955,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1505
+    /* "mtrand.pyx":1505
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")
  *             return cont1_array_sc(self.internal_state, rk_standard_gamma, size, fshape)             # <<<<<<<<<<<<<<
@@ -7965,7 +7972,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1507
+  /* "mtrand.pyx":1507
  *             return cont1_array_sc(self.internal_state, rk_standard_gamma, size, fshape)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -7974,7 +7981,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1508
+  /* "mtrand.pyx":1508
  * 
  *         PyErr_Clear()
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -7988,7 +7995,7 @@
   __pyx_v_oshape = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1509
+  /* "mtrand.pyx":1509
  *         PyErr_Clear()
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):             # <<<<<<<<<<<<<<
@@ -8032,7 +8039,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1510
+    /* "mtrand.pyx":1510
  *         oshape = <ndarray> PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8054,7 +8061,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1511
+  /* "mtrand.pyx":1511
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)             # <<<<<<<<<<<<<<
@@ -8087,7 +8094,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1513
+/* "mtrand.pyx":1513
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)
  * 
  *     def gamma(self, shape, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -8172,7 +8179,7 @@
   __pyx_v_oshape = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1586
+  /* "mtrand.pyx":1586
  *         cdef double fshape, fscale
  * 
  *         fshape = PyFloat_AsDouble(shape)             # <<<<<<<<<<<<<<
@@ -8181,7 +8188,7 @@
  */
   __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1587
+  /* "mtrand.pyx":1587
  * 
  *         fshape = PyFloat_AsDouble(shape)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -8190,7 +8197,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1588
+  /* "mtrand.pyx":1588
  *         fshape = PyFloat_AsDouble(shape)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -8200,7 +8207,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1589
+    /* "mtrand.pyx":1589
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fshape <= 0:             # <<<<<<<<<<<<<<
@@ -8210,7 +8217,7 @@
     __pyx_t_1 = (__pyx_v_fshape <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1590
+      /* "mtrand.pyx":1590
  *         if not PyErr_Occurred():
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8232,7 +8239,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1591
+    /* "mtrand.pyx":1591
  *             if fshape <= 0:
  *                 raise ValueError("shape <= 0")
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -8242,7 +8249,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1592
+      /* "mtrand.pyx":1592
  *                 raise ValueError("shape <= 0")
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8264,7 +8271,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1593
+    /* "mtrand.pyx":1593
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_gamma, size, fshape, fscale)             # <<<<<<<<<<<<<<
@@ -8281,7 +8288,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1595
+  /* "mtrand.pyx":1595
  *             return cont2_array_sc(self.internal_state, rk_gamma, size, fshape, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -8290,7 +8297,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1596
+  /* "mtrand.pyx":1596
  * 
  *         PyErr_Clear()
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8304,7 +8311,7 @@
   __pyx_v_oshape = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1597
+  /* "mtrand.pyx":1597
  *         PyErr_Clear()
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8318,7 +8325,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1598
+  /* "mtrand.pyx":1598
  *         oshape = <ndarray>PyArray_FROM_OTF(shape, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):             # <<<<<<<<<<<<<<
@@ -8362,7 +8369,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1599
+    /* "mtrand.pyx":1599
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8384,7 +8391,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1600
+  /* "mtrand.pyx":1600
  *         if np.any(np.less_equal(oshape, 0.0)):
  *             raise ValueError("shape <= 0")
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -8428,7 +8435,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1601
+    /* "mtrand.pyx":1601
  *             raise ValueError("shape <= 0")
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8450,7 +8457,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1602
+  /* "mtrand.pyx":1602
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_gamma, size, oshape, oscale)             # <<<<<<<<<<<<<<
@@ -8485,7 +8492,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1604
+/* "mtrand.pyx":1604
  *         return cont2_array(self.internal_state, rk_gamma, size, oshape, oscale)
  * 
  *     def f(self, dfnum, dfden, size=None):             # <<<<<<<<<<<<<<
@@ -8571,7 +8578,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_odfden = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1688
+  /* "mtrand.pyx":1688
  *         cdef double fdfnum, fdfden
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)             # <<<<<<<<<<<<<<
@@ -8580,7 +8587,7 @@
  */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1689
+  /* "mtrand.pyx":1689
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)             # <<<<<<<<<<<<<<
@@ -8589,7 +8596,7 @@
  */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1690
+  /* "mtrand.pyx":1690
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -8599,7 +8606,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1691
+    /* "mtrand.pyx":1691
  *         fdfden = PyFloat_AsDouble(dfden)
  *         if not PyErr_Occurred():
  *             if fdfnum <= 0:             # <<<<<<<<<<<<<<
@@ -8609,7 +8616,7 @@
     __pyx_t_1 = (__pyx_v_fdfnum <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1692
+      /* "mtrand.pyx":1692
  *         if not PyErr_Occurred():
  *             if fdfnum <= 0:
  *                 raise ValueError("shape <= 0")             # <<<<<<<<<<<<<<
@@ -8631,7 +8638,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1693
+    /* "mtrand.pyx":1693
  *             if fdfnum <= 0:
  *                 raise ValueError("shape <= 0")
  *             if fdfden <= 0:             # <<<<<<<<<<<<<<
@@ -8641,7 +8648,7 @@
     __pyx_t_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1694
+      /* "mtrand.pyx":1694
  *                 raise ValueError("shape <= 0")
  *             if fdfden <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -8663,7 +8670,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1695
+    /* "mtrand.pyx":1695
  *             if fdfden <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_f, size, fdfnum, fdfden)             # <<<<<<<<<<<<<<
@@ -8680,7 +8687,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1697
+  /* "mtrand.pyx":1697
  *             return cont2_array_sc(self.internal_state, rk_f, size, fdfnum, fdfden)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -8689,7 +8696,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1699
+  /* "mtrand.pyx":1699
  *         PyErr_Clear()
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8703,7 +8710,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1700
+  /* "mtrand.pyx":1700
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -8717,7 +8724,7 @@
   __pyx_v_odfden = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1701
+  /* "mtrand.pyx":1701
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odfnum, 0.0)):             # <<<<<<<<<<<<<<
@@ -8761,7 +8768,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1702
+    /* "mtrand.pyx":1702
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odfnum, 0.0)):
  *             raise ValueError("dfnum <= 0")             # <<<<<<<<<<<<<<
@@ -8783,7 +8790,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1703
+  /* "mtrand.pyx":1703
  *         if np.any(np.less_equal(odfnum, 0.0)):
  *             raise ValueError("dfnum <= 0")
  *         if np.any(np.less_equal(odfden, 0.0)):             # <<<<<<<<<<<<<<
@@ -8827,7 +8834,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1704
+    /* "mtrand.pyx":1704
  *             raise ValueError("dfnum <= 0")
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -8849,7 +8856,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1705
+  /* "mtrand.pyx":1705
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")
  *         return cont2_array(self.internal_state, rk_f, size, odfnum, odfden)             # <<<<<<<<<<<<<<
@@ -8884,7 +8891,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1707
+/* "mtrand.pyx":1707
  *         return cont2_array(self.internal_state, rk_f, size, odfnum, odfden)
  * 
  *     def noncentral_f(self, dfnum, dfden, nonc, size=None):             # <<<<<<<<<<<<<<
@@ -8984,7 +8991,7 @@
   __pyx_v_odfden = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1774
+  /* "mtrand.pyx":1774
  *         cdef double fdfnum, fdfden, fnonc
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)             # <<<<<<<<<<<<<<
@@ -8993,7 +9000,7 @@
  */
   __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1775
+  /* "mtrand.pyx":1775
  * 
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)             # <<<<<<<<<<<<<<
@@ -9002,7 +9009,7 @@
  */
   __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1776
+  /* "mtrand.pyx":1776
  *         fdfnum = PyFloat_AsDouble(dfnum)
  *         fdfden = PyFloat_AsDouble(dfden)
  *         fnonc = PyFloat_AsDouble(nonc)             # <<<<<<<<<<<<<<
@@ -9011,7 +9018,7 @@
  */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1777
+  /* "mtrand.pyx":1777
  *         fdfden = PyFloat_AsDouble(dfden)
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9021,7 +9028,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1778
+    /* "mtrand.pyx":1778
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():
  *             if fdfnum <= 1:             # <<<<<<<<<<<<<<
@@ -9031,7 +9038,7 @@
     __pyx_t_1 = (__pyx_v_fdfnum <= 1);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1779
+      /* "mtrand.pyx":1779
  *         if not PyErr_Occurred():
  *             if fdfnum <= 1:
  *                 raise ValueError("dfnum <= 1")             # <<<<<<<<<<<<<<
@@ -9053,7 +9060,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1780
+    /* "mtrand.pyx":1780
  *             if fdfnum <= 1:
  *                 raise ValueError("dfnum <= 1")
  *             if fdfden <= 0:             # <<<<<<<<<<<<<<
@@ -9063,7 +9070,7 @@
     __pyx_t_1 = (__pyx_v_fdfden <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1781
+      /* "mtrand.pyx":1781
  *                 raise ValueError("dfnum <= 1")
  *             if fdfden <= 0:
  *                 raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -9085,7 +9092,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1782
+    /* "mtrand.pyx":1782
  *             if fdfden <= 0:
  *                 raise ValueError("dfden <= 0")
  *             if fnonc < 0:             # <<<<<<<<<<<<<<
@@ -9095,7 +9102,7 @@
     __pyx_t_1 = (__pyx_v_fnonc < 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1783
+      /* "mtrand.pyx":1783
  *                 raise ValueError("dfden <= 0")
  *             if fnonc < 0:
  *                 raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -9117,7 +9124,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1784
+    /* "mtrand.pyx":1784
  *             if fnonc < 0:
  *                 raise ValueError("nonc < 0")
  *             return cont3_array_sc(self.internal_state, rk_noncentral_f, size,             # <<<<<<<<<<<<<<
@@ -9126,7 +9133,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1785
+    /* "mtrand.pyx":1785
  *                 raise ValueError("nonc < 0")
  *             return cont3_array_sc(self.internal_state, rk_noncentral_f, size,
  *                                   fdfnum, fdfden, fnonc)             # <<<<<<<<<<<<<<
@@ -9142,7 +9149,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1787
+  /* "mtrand.pyx":1787
  *                                   fdfnum, fdfden, fnonc)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9151,7 +9158,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1789
+  /* "mtrand.pyx":1789
  *         PyErr_Clear()
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9165,7 +9172,7 @@
   __pyx_v_odfnum = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1790
+  /* "mtrand.pyx":1790
  * 
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9179,7 +9186,7 @@
   __pyx_v_odfden = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1791
+  /* "mtrand.pyx":1791
  *         odfnum = <ndarray>PyArray_FROM_OTF(dfnum, NPY_DOUBLE, NPY_ALIGNED)
  *         odfden = <ndarray>PyArray_FROM_OTF(dfden, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9193,7 +9200,7 @@
   __pyx_v_ononc = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1793
+  /* "mtrand.pyx":1793
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  * 
  *         if np.any(np.less_equal(odfnum, 1.0)):             # <<<<<<<<<<<<<<
@@ -9237,7 +9244,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1794
+    /* "mtrand.pyx":1794
  * 
  *         if np.any(np.less_equal(odfnum, 1.0)):
  *             raise ValueError("dfnum <= 1")             # <<<<<<<<<<<<<<
@@ -9259,7 +9266,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1795
+  /* "mtrand.pyx":1795
  *         if np.any(np.less_equal(odfnum, 1.0)):
  *             raise ValueError("dfnum <= 1")
  *         if np.any(np.less_equal(odfden, 0.0)):             # <<<<<<<<<<<<<<
@@ -9303,7 +9310,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1796
+    /* "mtrand.pyx":1796
  *             raise ValueError("dfnum <= 1")
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")             # <<<<<<<<<<<<<<
@@ -9325,7 +9332,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1797
+  /* "mtrand.pyx":1797
  *         if np.any(np.less_equal(odfden, 0.0)):
  *             raise ValueError("dfden <= 0")
  *         if np.any(np.less(ononc, 0.0)):             # <<<<<<<<<<<<<<
@@ -9369,7 +9376,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1798
+    /* "mtrand.pyx":1798
  *             raise ValueError("dfden <= 0")
  *         if np.any(np.less(ononc, 0.0)):
  *             raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -9391,7 +9398,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1799
+  /* "mtrand.pyx":1799
  *         if np.any(np.less(ononc, 0.0)):
  *             raise ValueError("nonc < 0")
  *         return cont3_array(self.internal_state, rk_noncentral_f, size, odfnum,             # <<<<<<<<<<<<<<
@@ -9400,7 +9407,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1800
+  /* "mtrand.pyx":1800
  *             raise ValueError("nonc < 0")
  *         return cont3_array(self.internal_state, rk_noncentral_f, size, odfnum,
  *             odfden, ononc)             # <<<<<<<<<<<<<<
@@ -9436,7 +9443,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1802
+/* "mtrand.pyx":1802
  *             odfden, ononc)
  * 
  *     def chisquare(self, df, size=None):             # <<<<<<<<<<<<<<
@@ -9506,7 +9513,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1869
+  /* "mtrand.pyx":1869
  *         cdef double fdf
  * 
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -9515,7 +9522,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1870
+  /* "mtrand.pyx":1870
  * 
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9525,7 +9532,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1871
+    /* "mtrand.pyx":1871
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():
  *             if fdf <= 0:             # <<<<<<<<<<<<<<
@@ -9535,7 +9542,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1872
+      /* "mtrand.pyx":1872
  *         if not PyErr_Occurred():
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9557,7 +9564,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1873
+    /* "mtrand.pyx":1873
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")
  *             return cont1_array_sc(self.internal_state, rk_chisquare, size, fdf)             # <<<<<<<<<<<<<<
@@ -9574,7 +9581,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1875
+  /* "mtrand.pyx":1875
  *             return cont1_array_sc(self.internal_state, rk_chisquare, size, fdf)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9583,7 +9590,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1877
+  /* "mtrand.pyx":1877
  *         PyErr_Clear()
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9597,7 +9604,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1878
+  /* "mtrand.pyx":1878
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -9641,7 +9648,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1879
+    /* "mtrand.pyx":1879
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9663,7 +9670,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1880
+  /* "mtrand.pyx":1880
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")
  *         return cont1_array(self.internal_state, rk_chisquare, size, odf)             # <<<<<<<<<<<<<<
@@ -9696,7 +9703,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1882
+/* "mtrand.pyx":1882
  *         return cont1_array(self.internal_state, rk_chisquare, size, odf)
  * 
  *     def noncentral_chisquare(self, df, nonc, size=None):             # <<<<<<<<<<<<<<
@@ -9782,7 +9789,7 @@
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_ononc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1953
+  /* "mtrand.pyx":1953
  *         cdef ndarray odf, ononc
  *         cdef double fdf, fnonc
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -9791,7 +9798,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1954
+  /* "mtrand.pyx":1954
  *         cdef double fdf, fnonc
  *         fdf = PyFloat_AsDouble(df)
  *         fnonc = PyFloat_AsDouble(nonc)             # <<<<<<<<<<<<<<
@@ -9800,7 +9807,7 @@
  */
   __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1955
+  /* "mtrand.pyx":1955
  *         fdf = PyFloat_AsDouble(df)
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -9810,7 +9817,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1956
+    /* "mtrand.pyx":1956
  *         fnonc = PyFloat_AsDouble(nonc)
  *         if not PyErr_Occurred():
  *             if fdf <= 1:             # <<<<<<<<<<<<<<
@@ -9820,7 +9827,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 1);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1957
+      /* "mtrand.pyx":1957
  *         if not PyErr_Occurred():
  *             if fdf <= 1:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -9842,7 +9849,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1958
+    /* "mtrand.pyx":1958
  *             if fdf <= 1:
  *                 raise ValueError("df <= 0")
  *             if fnonc <= 0:             # <<<<<<<<<<<<<<
@@ -9852,7 +9859,7 @@
     __pyx_t_1 = (__pyx_v_fnonc <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1959
+      /* "mtrand.pyx":1959
  *                 raise ValueError("df <= 0")
  *             if fnonc <= 0:
  *                 raise ValueError("nonc <= 0")             # <<<<<<<<<<<<<<
@@ -9874,7 +9881,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1960
+    /* "mtrand.pyx":1960
  *             if fnonc <= 0:
  *                 raise ValueError("nonc <= 0")
  *             return cont2_array_sc(self.internal_state, rk_noncentral_chisquare,             # <<<<<<<<<<<<<<
@@ -9883,7 +9890,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1961
+    /* "mtrand.pyx":1961
  *                 raise ValueError("nonc <= 0")
  *             return cont2_array_sc(self.internal_state, rk_noncentral_chisquare,
  *                                   size, fdf, fnonc)             # <<<<<<<<<<<<<<
@@ -9899,7 +9906,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1963
+  /* "mtrand.pyx":1963
  *                                   size, fdf, fnonc)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -9908,7 +9915,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1965
+  /* "mtrand.pyx":1965
  *         PyErr_Clear()
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9922,7 +9929,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1966
+  /* "mtrand.pyx":1966
  * 
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -9936,7 +9943,7 @@
   __pyx_v_ononc = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1967
+  /* "mtrand.pyx":1967
  *         odf = <ndarray>PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -9980,7 +9987,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1968
+    /* "mtrand.pyx":1968
  *         ononc = <ndarray>PyArray_FROM_OTF(nonc, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 1")             # <<<<<<<<<<<<<<
@@ -10002,7 +10009,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1969
+  /* "mtrand.pyx":1969
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 1")
  *         if np.any(np.less_equal(ononc, 0.0)):             # <<<<<<<<<<<<<<
@@ -10046,7 +10053,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1970
+    /* "mtrand.pyx":1970
  *             raise ValueError("df <= 1")
  *         if np.any(np.less_equal(ononc, 0.0)):
  *             raise ValueError("nonc < 0")             # <<<<<<<<<<<<<<
@@ -10068,7 +10075,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1971
+  /* "mtrand.pyx":1971
  *         if np.any(np.less_equal(ononc, 0.0)):
  *             raise ValueError("nonc < 0")
  *         return cont2_array(self.internal_state, rk_noncentral_chisquare, size,             # <<<<<<<<<<<<<<
@@ -10077,7 +10084,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1972
+  /* "mtrand.pyx":1972
  *             raise ValueError("nonc < 0")
  *         return cont2_array(self.internal_state, rk_noncentral_chisquare, size,
  *             odf, ononc)             # <<<<<<<<<<<<<<
@@ -10111,7 +10118,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1974
+/* "mtrand.pyx":1974
  *             odf, ononc)
  * 
  *     def standard_cauchy(self, size=None):             # <<<<<<<<<<<<<<
@@ -10163,7 +10170,7 @@
   return NULL;
   __pyx_L4_argument_unpacking_done:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2033
+  /* "mtrand.pyx":2033
  * 
  *         """
  *         return cont0_array(self.internal_state, rk_standard_cauchy, size)             # <<<<<<<<<<<<<<
@@ -10189,7 +10196,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2035
+/* "mtrand.pyx":2035
  *         return cont0_array(self.internal_state, rk_standard_cauchy, size)
  * 
  *     def standard_t(self, df, size=None):             # <<<<<<<<<<<<<<
@@ -10259,7 +10266,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_odf = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2123
+  /* "mtrand.pyx":2123
  *         cdef double fdf
  * 
  *         fdf = PyFloat_AsDouble(df)             # <<<<<<<<<<<<<<
@@ -10268,7 +10275,7 @@
  */
   __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2124
+  /* "mtrand.pyx":2124
  * 
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10278,7 +10285,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2125
+    /* "mtrand.pyx":2125
  *         fdf = PyFloat_AsDouble(df)
  *         if not PyErr_Occurred():
  *             if fdf <= 0:             # <<<<<<<<<<<<<<
@@ -10288,7 +10295,7 @@
     __pyx_t_1 = (__pyx_v_fdf <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2126
+      /* "mtrand.pyx":2126
  *         if not PyErr_Occurred():
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -10310,7 +10317,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2127
+    /* "mtrand.pyx":2127
  *             if fdf <= 0:
  *                 raise ValueError("df <= 0")
  *             return cont1_array_sc(self.internal_state, rk_standard_t, size, fdf)             # <<<<<<<<<<<<<<
@@ -10327,7 +10334,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2129
+  /* "mtrand.pyx":2129
  *             return cont1_array_sc(self.internal_state, rk_standard_t, size, fdf)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10336,7 +10343,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2131
+  /* "mtrand.pyx":2131
  *         PyErr_Clear()
  * 
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10350,7 +10357,7 @@
   __pyx_v_odf = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2132
+  /* "mtrand.pyx":2132
  * 
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):             # <<<<<<<<<<<<<<
@@ -10394,7 +10401,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2133
+    /* "mtrand.pyx":2133
  *         odf = <ndarray> PyArray_FROM_OTF(df, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")             # <<<<<<<<<<<<<<
@@ -10416,7 +10423,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2134
+  /* "mtrand.pyx":2134
  *         if np.any(np.less_equal(odf, 0.0)):
  *             raise ValueError("df <= 0")
  *         return cont1_array(self.internal_state, rk_standard_t, size, odf)             # <<<<<<<<<<<<<<
@@ -10449,7 +10456,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2136
+/* "mtrand.pyx":2136
  *         return cont1_array(self.internal_state, rk_standard_t, size, odf)
  * 
  *     def vonmises(self, mu, kappa, size=None):             # <<<<<<<<<<<<<<
@@ -10535,7 +10542,7 @@
   __pyx_v_omu = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_okappa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2216
+  /* "mtrand.pyx":2216
  *         cdef double fmu, fkappa
  * 
  *         fmu = PyFloat_AsDouble(mu)             # <<<<<<<<<<<<<<
@@ -10544,7 +10551,7 @@
  */
   __pyx_v_fmu = PyFloat_AsDouble(__pyx_v_mu);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2217
+  /* "mtrand.pyx":2217
  * 
  *         fmu = PyFloat_AsDouble(mu)
  *         fkappa = PyFloat_AsDouble(kappa)             # <<<<<<<<<<<<<<
@@ -10553,7 +10560,7 @@
  */
   __pyx_v_fkappa = PyFloat_AsDouble(__pyx_v_kappa);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2218
+  /* "mtrand.pyx":2218
  *         fmu = PyFloat_AsDouble(mu)
  *         fkappa = PyFloat_AsDouble(kappa)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10563,7 +10570,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2219
+    /* "mtrand.pyx":2219
  *         fkappa = PyFloat_AsDouble(kappa)
  *         if not PyErr_Occurred():
  *             if fkappa < 0:             # <<<<<<<<<<<<<<
@@ -10573,7 +10580,7 @@
     __pyx_t_1 = (__pyx_v_fkappa < 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2220
+      /* "mtrand.pyx":2220
  *         if not PyErr_Occurred():
  *             if fkappa < 0:
  *                 raise ValueError("kappa < 0")             # <<<<<<<<<<<<<<
@@ -10595,7 +10602,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2221
+    /* "mtrand.pyx":2221
  *             if fkappa < 0:
  *                 raise ValueError("kappa < 0")
  *             return cont2_array_sc(self.internal_state, rk_vonmises, size, fmu, fkappa)             # <<<<<<<<<<<<<<
@@ -10612,7 +10619,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2223
+  /* "mtrand.pyx":2223
  *             return cont2_array_sc(self.internal_state, rk_vonmises, size, fmu, fkappa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10621,7 +10628,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2225
+  /* "mtrand.pyx":2225
  *         PyErr_Clear()
  * 
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10635,7 +10642,7 @@
   __pyx_v_omu = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2226
+  /* "mtrand.pyx":2226
  * 
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10649,7 +10656,7 @@
   __pyx_v_okappa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2227
+  /* "mtrand.pyx":2227
  *         omu = <ndarray> PyArray_FROM_OTF(mu, NPY_DOUBLE, NPY_ALIGNED)
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(okappa, 0.0)):             # <<<<<<<<<<<<<<
@@ -10693,7 +10700,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2228
+    /* "mtrand.pyx":2228
  *         okappa = <ndarray> PyArray_FROM_OTF(kappa, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(okappa, 0.0)):
  *             raise ValueError("kappa < 0")             # <<<<<<<<<<<<<<
@@ -10715,7 +10722,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2229
+  /* "mtrand.pyx":2229
  *         if np.any(np.less(okappa, 0.0)):
  *             raise ValueError("kappa < 0")
  *         return cont2_array(self.internal_state, rk_vonmises, size, omu, okappa)             # <<<<<<<<<<<<<<
@@ -10750,7 +10757,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2231
+/* "mtrand.pyx":2231
  *         return cont2_array(self.internal_state, rk_vonmises, size, omu, okappa)
  * 
  *     def pareto(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -10820,7 +10827,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2307
+  /* "mtrand.pyx":2307
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -10829,7 +10836,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2308
+  /* "mtrand.pyx":2308
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -10839,7 +10846,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2309
+    /* "mtrand.pyx":2309
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -10849,7 +10856,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2310
+      /* "mtrand.pyx":2310
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -10871,7 +10878,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2311
+    /* "mtrand.pyx":2311
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_pareto, size, fa)             # <<<<<<<<<<<<<<
@@ -10888,7 +10895,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2313
+  /* "mtrand.pyx":2313
  *             return cont1_array_sc(self.internal_state, rk_pareto, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -10897,7 +10904,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2315
+  /* "mtrand.pyx":2315
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -10911,7 +10918,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2316
+  /* "mtrand.pyx":2316
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -10955,7 +10962,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2317
+    /* "mtrand.pyx":2317
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -10977,7 +10984,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2318
+  /* "mtrand.pyx":2318
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_pareto, size, oa)             # <<<<<<<<<<<<<<
@@ -11010,7 +11017,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2320
+/* "mtrand.pyx":2320
  *         return cont1_array(self.internal_state, rk_pareto, size, oa)
  * 
  *     def weibull(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -11080,7 +11087,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2407
+  /* "mtrand.pyx":2407
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -11089,7 +11096,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2408
+  /* "mtrand.pyx":2408
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11099,7 +11106,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2409
+    /* "mtrand.pyx":2409
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -11109,7 +11116,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2410
+      /* "mtrand.pyx":2410
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11131,7 +11138,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2411
+    /* "mtrand.pyx":2411
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_weibull, size, fa)             # <<<<<<<<<<<<<<
@@ -11148,7 +11155,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2413
+  /* "mtrand.pyx":2413
  *             return cont1_array_sc(self.internal_state, rk_weibull, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11157,7 +11164,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2415
+  /* "mtrand.pyx":2415
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11171,7 +11178,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2416
+  /* "mtrand.pyx":2416
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -11215,7 +11222,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2417
+    /* "mtrand.pyx":2417
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11237,7 +11244,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2418
+  /* "mtrand.pyx":2418
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_weibull, size, oa)             # <<<<<<<<<<<<<<
@@ -11270,7 +11277,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2420
+/* "mtrand.pyx":2420
  *         return cont1_array(self.internal_state, rk_weibull, size, oa)
  * 
  *     def power(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -11340,7 +11347,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2516
+  /* "mtrand.pyx":2516
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -11349,7 +11356,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2517
+  /* "mtrand.pyx":2517
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11359,7 +11366,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2518
+    /* "mtrand.pyx":2518
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 0:             # <<<<<<<<<<<<<<
@@ -11369,7 +11376,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2519
+      /* "mtrand.pyx":2519
  *         if not PyErr_Occurred():
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11391,7 +11398,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2520
+    /* "mtrand.pyx":2520
  *             if fa <= 0:
  *                 raise ValueError("a <= 0")
  *             return cont1_array_sc(self.internal_state, rk_power, size, fa)             # <<<<<<<<<<<<<<
@@ -11408,7 +11415,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2522
+  /* "mtrand.pyx":2522
  *             return cont1_array_sc(self.internal_state, rk_power, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11417,7 +11424,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2524
+  /* "mtrand.pyx":2524
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11431,7 +11438,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2525
+  /* "mtrand.pyx":2525
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):             # <<<<<<<<<<<<<<
@@ -11475,7 +11482,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2526
+    /* "mtrand.pyx":2526
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")             # <<<<<<<<<<<<<<
@@ -11497,7 +11504,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2527
+  /* "mtrand.pyx":2527
  *         if np.any(np.less_equal(oa, 0.0)):
  *             raise ValueError("a <= 0")
  *         return cont1_array(self.internal_state, rk_power, size, oa)             # <<<<<<<<<<<<<<
@@ -11530,7 +11537,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2529
+/* "mtrand.pyx":2529
  *         return cont1_array(self.internal_state, rk_power, size, oa)
  * 
  *     def laplace(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -11618,7 +11625,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2605
+  /* "mtrand.pyx":2605
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -11627,7 +11634,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2606
+  /* "mtrand.pyx":2606
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -11636,7 +11643,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2607
+  /* "mtrand.pyx":2607
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11646,7 +11653,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2608
+    /* "mtrand.pyx":2608
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -11656,7 +11663,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2609
+      /* "mtrand.pyx":2609
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11678,7 +11685,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2610
+    /* "mtrand.pyx":2610
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_laplace, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -11695,7 +11702,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2612
+  /* "mtrand.pyx":2612
  *             return cont2_array_sc(self.internal_state, rk_laplace, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -11704,7 +11711,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2613
+  /* "mtrand.pyx":2613
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11718,7 +11725,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2614
+  /* "mtrand.pyx":2614
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -11732,7 +11739,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2615
+  /* "mtrand.pyx":2615
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -11776,7 +11783,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2616
+    /* "mtrand.pyx":2616
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11798,7 +11805,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2617
+  /* "mtrand.pyx":2617
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -11833,7 +11840,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2619
+/* "mtrand.pyx":2619
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)
  * 
  *     def gumbel(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -11921,7 +11928,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2729
+  /* "mtrand.pyx":2729
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -11930,7 +11937,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2730
+  /* "mtrand.pyx":2730
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -11939,7 +11946,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2731
+  /* "mtrand.pyx":2731
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -11949,7 +11956,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2732
+    /* "mtrand.pyx":2732
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -11959,7 +11966,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2733
+      /* "mtrand.pyx":2733
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -11981,7 +11988,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2734
+    /* "mtrand.pyx":2734
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_gumbel, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -11998,7 +12005,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2736
+  /* "mtrand.pyx":2736
  *             return cont2_array_sc(self.internal_state, rk_gumbel, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12007,7 +12014,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2737
+  /* "mtrand.pyx":2737
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12021,7 +12028,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2738
+  /* "mtrand.pyx":2738
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12035,7 +12042,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2739
+  /* "mtrand.pyx":2739
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12079,7 +12086,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2740
+    /* "mtrand.pyx":2740
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12101,7 +12108,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2741
+  /* "mtrand.pyx":2741
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -12136,7 +12143,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2743
+/* "mtrand.pyx":2743
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)
  * 
  *     def logistic(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12224,7 +12231,7 @@
   __pyx_v_oloc = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2817
+  /* "mtrand.pyx":2817
  *         cdef double floc, fscale
  * 
  *         floc = PyFloat_AsDouble(loc)             # <<<<<<<<<<<<<<
@@ -12233,7 +12240,7 @@
  */
   __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2818
+  /* "mtrand.pyx":2818
  * 
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -12242,7 +12249,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2819
+  /* "mtrand.pyx":2819
  *         floc = PyFloat_AsDouble(loc)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12252,7 +12259,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2820
+    /* "mtrand.pyx":2820
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -12262,7 +12269,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2821
+      /* "mtrand.pyx":2821
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12284,7 +12291,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2822
+    /* "mtrand.pyx":2822
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_logistic, size, floc, fscale)             # <<<<<<<<<<<<<<
@@ -12301,7 +12308,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2824
+  /* "mtrand.pyx":2824
  *             return cont2_array_sc(self.internal_state, rk_logistic, size, floc, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12310,7 +12317,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2825
+  /* "mtrand.pyx":2825
  * 
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12324,7 +12331,7 @@
   __pyx_v_oloc = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2826
+  /* "mtrand.pyx":2826
  *         PyErr_Clear()
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12338,7 +12345,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2827
+  /* "mtrand.pyx":2827
  *         oloc = PyArray_FROM_OTF(loc, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12382,7 +12389,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2828
+    /* "mtrand.pyx":2828
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12404,7 +12411,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2829
+  /* "mtrand.pyx":2829
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0")
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)             # <<<<<<<<<<<<<<
@@ -12439,7 +12446,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2831
+/* "mtrand.pyx":2831
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)
  * 
  *     def lognormal(self, mean=0.0, sigma=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12527,7 +12534,7 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_osigma = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2946
+  /* "mtrand.pyx":2946
  *         cdef double fmean, fsigma
  * 
  *         fmean = PyFloat_AsDouble(mean)             # <<<<<<<<<<<<<<
@@ -12536,7 +12543,7 @@
  */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2947
+  /* "mtrand.pyx":2947
  * 
  *         fmean = PyFloat_AsDouble(mean)
  *         fsigma = PyFloat_AsDouble(sigma)             # <<<<<<<<<<<<<<
@@ -12545,7 +12552,7 @@
  */
   __pyx_v_fsigma = PyFloat_AsDouble(__pyx_v_sigma);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2949
+  /* "mtrand.pyx":2949
  *         fsigma = PyFloat_AsDouble(sigma)
  * 
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12555,7 +12562,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2950
+    /* "mtrand.pyx":2950
  * 
  *         if not PyErr_Occurred():
  *             if fsigma <= 0:             # <<<<<<<<<<<<<<
@@ -12565,7 +12572,7 @@
     __pyx_t_1 = (__pyx_v_fsigma <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2951
+      /* "mtrand.pyx":2951
  *         if not PyErr_Occurred():
  *             if fsigma <= 0:
  *                 raise ValueError("sigma <= 0")             # <<<<<<<<<<<<<<
@@ -12587,7 +12594,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2952
+    /* "mtrand.pyx":2952
  *             if fsigma <= 0:
  *                 raise ValueError("sigma <= 0")
  *             return cont2_array_sc(self.internal_state, rk_lognormal, size, fmean, fsigma)             # <<<<<<<<<<<<<<
@@ -12604,7 +12611,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2954
+  /* "mtrand.pyx":2954
  *             return cont2_array_sc(self.internal_state, rk_lognormal, size, fmean, fsigma)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12613,7 +12620,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2956
+  /* "mtrand.pyx":2956
  *         PyErr_Clear()
  * 
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12627,7 +12634,7 @@
   __pyx_v_omean = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2957
+  /* "mtrand.pyx":2957
  * 
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12641,7 +12648,7 @@
   __pyx_v_osigma = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2958
+  /* "mtrand.pyx":2958
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(osigma, 0.0)):             # <<<<<<<<<<<<<<
@@ -12685,7 +12692,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2959
+    /* "mtrand.pyx":2959
  *         osigma = PyArray_FROM_OTF(sigma, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(osigma, 0.0)):
  *             raise ValueError("sigma <= 0.0")             # <<<<<<<<<<<<<<
@@ -12707,7 +12714,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2960
+  /* "mtrand.pyx":2960
  *         if np.any(np.less_equal(osigma, 0.0)):
  *             raise ValueError("sigma <= 0.0")
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)             # <<<<<<<<<<<<<<
@@ -12742,7 +12749,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2962
+/* "mtrand.pyx":2962
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)
  * 
  *     def rayleigh(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -12815,7 +12822,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3020
+  /* "mtrand.pyx":3020
  *         cdef double fscale
  * 
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -12824,7 +12831,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3022
+  /* "mtrand.pyx":3022
  *         fscale = PyFloat_AsDouble(scale)
  * 
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -12834,7 +12841,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3023
+    /* "mtrand.pyx":3023
  * 
  *         if not PyErr_Occurred():
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -12844,7 +12851,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3024
+      /* "mtrand.pyx":3024
  *         if not PyErr_Occurred():
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -12866,7 +12873,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3025
+    /* "mtrand.pyx":3025
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont1_array_sc(self.internal_state, rk_rayleigh, size, fscale)             # <<<<<<<<<<<<<<
@@ -12883,7 +12890,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3027
+  /* "mtrand.pyx":3027
  *             return cont1_array_sc(self.internal_state, rk_rayleigh, size, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -12892,7 +12899,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3029
+  /* "mtrand.pyx":3029
  *         PyErr_Clear()
  * 
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -12906,7 +12913,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3030
+  /* "mtrand.pyx":3030
  * 
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):             # <<<<<<<<<<<<<<
@@ -12950,7 +12957,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3031
+    /* "mtrand.pyx":3031
  *         oscale = <ndarray>PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0.0")             # <<<<<<<<<<<<<<
@@ -12972,7 +12979,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3032
+  /* "mtrand.pyx":3032
  *         if np.any(np.less_equal(oscale, 0.0)):
  *             raise ValueError("scale <= 0.0")
  *         return cont1_array(self.internal_state, rk_rayleigh, size, oscale)             # <<<<<<<<<<<<<<
@@ -13005,7 +13012,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3034
+/* "mtrand.pyx":3034
  *         return cont1_array(self.internal_state, rk_rayleigh, size, oscale)
  * 
  *     def wald(self, mean, scale, size=None):             # <<<<<<<<<<<<<<
@@ -13091,7 +13098,7 @@
   __pyx_v_omean = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oscale = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3100
+  /* "mtrand.pyx":3100
  *         cdef double fmean, fscale
  * 
  *         fmean = PyFloat_AsDouble(mean)             # <<<<<<<<<<<<<<
@@ -13100,7 +13107,7 @@
  */
   __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3101
+  /* "mtrand.pyx":3101
  * 
  *         fmean = PyFloat_AsDouble(mean)
  *         fscale = PyFloat_AsDouble(scale)             # <<<<<<<<<<<<<<
@@ -13109,7 +13116,7 @@
  */
   __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3102
+  /* "mtrand.pyx":3102
  *         fmean = PyFloat_AsDouble(mean)
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -13119,7 +13126,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3103
+    /* "mtrand.pyx":3103
  *         fscale = PyFloat_AsDouble(scale)
  *         if not PyErr_Occurred():
  *             if fmean <= 0:             # <<<<<<<<<<<<<<
@@ -13129,7 +13136,7 @@
     __pyx_t_1 = (__pyx_v_fmean <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3104
+      /* "mtrand.pyx":3104
  *         if not PyErr_Occurred():
  *             if fmean <= 0:
  *                 raise ValueError("mean <= 0")             # <<<<<<<<<<<<<<
@@ -13151,7 +13158,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3105
+    /* "mtrand.pyx":3105
  *             if fmean <= 0:
  *                 raise ValueError("mean <= 0")
  *             if fscale <= 0:             # <<<<<<<<<<<<<<
@@ -13161,7 +13168,7 @@
     __pyx_t_1 = (__pyx_v_fscale <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3106
+      /* "mtrand.pyx":3106
  *                 raise ValueError("mean <= 0")
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")             # <<<<<<<<<<<<<<
@@ -13183,7 +13190,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3107
+    /* "mtrand.pyx":3107
  *             if fscale <= 0:
  *                 raise ValueError("scale <= 0")
  *             return cont2_array_sc(self.internal_state, rk_wald, size, fmean, fscale)             # <<<<<<<<<<<<<<
@@ -13200,7 +13207,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3109
+  /* "mtrand.pyx":3109
  *             return cont2_array_sc(self.internal_state, rk_wald, size, fmean, fscale)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -13209,7 +13216,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3110
+  /* "mtrand.pyx":3110
  * 
  *         PyErr_Clear()
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13223,7 +13230,7 @@
   __pyx_v_omean = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3111
+  /* "mtrand.pyx":3111
  *         PyErr_Clear()
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13237,7 +13244,7 @@
   __pyx_v_oscale = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3112
+  /* "mtrand.pyx":3112
  *         omean = PyArray_FROM_OTF(mean, NPY_DOUBLE, NPY_ALIGNED)
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(omean,0.0)):             # <<<<<<<<<<<<<<
@@ -13281,7 +13288,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3113
+    /* "mtrand.pyx":3113
  *         oscale = PyArray_FROM_OTF(scale, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(omean,0.0)):
  *             raise ValueError("mean <= 0.0")             # <<<<<<<<<<<<<<
@@ -13302,7 +13309,7 @@
     goto __pyx_L9;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3114
+  /* "mtrand.pyx":3114
  *         if np.any(np.less_equal(omean,0.0)):
  *             raise ValueError("mean <= 0.0")
  *         elif np.any(np.less_equal(oscale,0.0)):             # <<<<<<<<<<<<<<
@@ -13346,7 +13353,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3115
+    /* "mtrand.pyx":3115
  *             raise ValueError("mean <= 0.0")
  *         elif np.any(np.less_equal(oscale,0.0)):
  *             raise ValueError("scale <= 0.0")             # <<<<<<<<<<<<<<
@@ -13368,7 +13375,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3116
+  /* "mtrand.pyx":3116
  *         elif np.any(np.less_equal(oscale,0.0)):
  *             raise ValueError("scale <= 0.0")
  *         return cont2_array(self.internal_state, rk_wald, size, omean, oscale)             # <<<<<<<<<<<<<<
@@ -13403,7 +13410,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3120
+/* "mtrand.pyx":3120
  * 
  * 
  *     def triangular(self, left, mode, right, size=None):             # <<<<<<<<<<<<<<
@@ -13503,7 +13510,7 @@
   __pyx_v_omode = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_oright = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3180
+  /* "mtrand.pyx":3180
  *         cdef double fleft, fmode, fright
  * 
  *         fleft = PyFloat_AsDouble(left)             # <<<<<<<<<<<<<<
@@ -13512,7 +13519,7 @@
  */
   __pyx_v_fleft = PyFloat_AsDouble(__pyx_v_left);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3181
+  /* "mtrand.pyx":3181
  * 
  *         fleft = PyFloat_AsDouble(left)
  *         fright = PyFloat_AsDouble(right)             # <<<<<<<<<<<<<<
@@ -13521,7 +13528,7 @@
  */
   __pyx_v_fright = PyFloat_AsDouble(__pyx_v_right);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3182
+  /* "mtrand.pyx":3182
  *         fleft = PyFloat_AsDouble(left)
  *         fright = PyFloat_AsDouble(right)
  *         fmode = PyFloat_AsDouble(mode)             # <<<<<<<<<<<<<<
@@ -13530,7 +13537,7 @@
  */
   __pyx_v_fmode = PyFloat_AsDouble(__pyx_v_mode);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3183
+  /* "mtrand.pyx":3183
  *         fright = PyFloat_AsDouble(right)
  *         fmode = PyFloat_AsDouble(mode)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -13540,7 +13547,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3184
+    /* "mtrand.pyx":3184
  *         fmode = PyFloat_AsDouble(mode)
  *         if not PyErr_Occurred():
  *             if fleft > fmode:             # <<<<<<<<<<<<<<
@@ -13550,7 +13557,7 @@
     __pyx_t_1 = (__pyx_v_fleft > __pyx_v_fmode);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3185
+      /* "mtrand.pyx":3185
  *         if not PyErr_Occurred():
  *             if fleft > fmode:
  *                 raise ValueError("left > mode")             # <<<<<<<<<<<<<<
@@ -13572,7 +13579,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3186
+    /* "mtrand.pyx":3186
  *             if fleft > fmode:
  *                 raise ValueError("left > mode")
  *             if fmode > fright:             # <<<<<<<<<<<<<<
@@ -13582,7 +13589,7 @@
     __pyx_t_1 = (__pyx_v_fmode > __pyx_v_fright);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3187
+      /* "mtrand.pyx":3187
  *                 raise ValueError("left > mode")
  *             if fmode > fright:
  *                 raise ValueError("mode > right")             # <<<<<<<<<<<<<<
@@ -13604,7 +13611,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3188
+    /* "mtrand.pyx":3188
  *             if fmode > fright:
  *                 raise ValueError("mode > right")
  *             if fleft == fright:             # <<<<<<<<<<<<<<
@@ -13614,7 +13621,7 @@
     __pyx_t_1 = (__pyx_v_fleft == __pyx_v_fright);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3189
+      /* "mtrand.pyx":3189
  *                 raise ValueError("mode > right")
  *             if fleft == fright:
  *                 raise ValueError("left == right")             # <<<<<<<<<<<<<<
@@ -13636,7 +13643,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3190
+    /* "mtrand.pyx":3190
  *             if fleft == fright:
  *                 raise ValueError("left == right")
  *             return cont3_array_sc(self.internal_state, rk_triangular, size, fleft,             # <<<<<<<<<<<<<<
@@ -13645,7 +13652,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3191
+    /* "mtrand.pyx":3191
  *                 raise ValueError("left == right")
  *             return cont3_array_sc(self.internal_state, rk_triangular, size, fleft,
  *                                   fmode, fright)             # <<<<<<<<<<<<<<
@@ -13661,7 +13668,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3193
+  /* "mtrand.pyx":3193
  *                                   fmode, fright)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -13670,7 +13677,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3194
+  /* "mtrand.pyx":3194
  * 
  *         PyErr_Clear()
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13684,7 +13691,7 @@
   __pyx_v_oleft = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3195
+  /* "mtrand.pyx":3195
  *         PyErr_Clear()
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)
  *         omode = <ndarray>PyArray_FROM_OTF(mode, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13698,7 +13705,7 @@
   __pyx_v_omode = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3196
+  /* "mtrand.pyx":3196
  *         oleft = <ndarray>PyArray_FROM_OTF(left, NPY_DOUBLE, NPY_ALIGNED)
  *         omode = <ndarray>PyArray_FROM_OTF(mode, NPY_DOUBLE, NPY_ALIGNED)
  *         oright = <ndarray>PyArray_FROM_OTF(right, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -13712,7 +13719,7 @@
   __pyx_v_oright = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3198
+  /* "mtrand.pyx":3198
  *         oright = <ndarray>PyArray_FROM_OTF(right, NPY_DOUBLE, NPY_ALIGNED)
  * 
  *         if np.any(np.greater(oleft, omode)):             # <<<<<<<<<<<<<<
@@ -13754,7 +13761,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3199
+    /* "mtrand.pyx":3199
  * 
  *         if np.any(np.greater(oleft, omode)):
  *             raise ValueError("left > mode")             # <<<<<<<<<<<<<<
@@ -13776,7 +13783,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3200
+  /* "mtrand.pyx":3200
  *         if np.any(np.greater(oleft, omode)):
  *             raise ValueError("left > mode")
  *         if np.any(np.greater(omode, oright)):             # <<<<<<<<<<<<<<
@@ -13818,7 +13825,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3201
+    /* "mtrand.pyx":3201
  *             raise ValueError("left > mode")
  *         if np.any(np.greater(omode, oright)):
  *             raise ValueError("mode > right")             # <<<<<<<<<<<<<<
@@ -13840,7 +13847,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3202
+  /* "mtrand.pyx":3202
  *         if np.any(np.greater(omode, oright)):
  *             raise ValueError("mode > right")
  *         if np.any(np.equal(oleft, oright)):             # <<<<<<<<<<<<<<
@@ -13882,7 +13889,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3203
+    /* "mtrand.pyx":3203
  *             raise ValueError("mode > right")
  *         if np.any(np.equal(oleft, oright)):
  *             raise ValueError("left == right")             # <<<<<<<<<<<<<<
@@ -13904,7 +13911,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3204
+  /* "mtrand.pyx":3204
  *         if np.any(np.equal(oleft, oright)):
  *             raise ValueError("left == right")
  *         return cont3_array(self.internal_state, rk_triangular, size, oleft,             # <<<<<<<<<<<<<<
@@ -13913,7 +13920,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3205
+  /* "mtrand.pyx":3205
  *             raise ValueError("left == right")
  *         return cont3_array(self.internal_state, rk_triangular, size, oleft,
  *             omode, oright)             # <<<<<<<<<<<<<<
@@ -13949,7 +13956,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3208
+/* "mtrand.pyx":3208
  * 
  *     # Complicated, discrete distributions:
  *     def binomial(self, n, p, size=None):             # <<<<<<<<<<<<<<
@@ -14035,7 +14042,7 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3293
+  /* "mtrand.pyx":3293
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -14044,7 +14051,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3294
+  /* "mtrand.pyx":3294
  * 
  *         fp = PyFloat_AsDouble(p)
  *         ln = PyInt_AsLong(n)             # <<<<<<<<<<<<<<
@@ -14053,7 +14060,7 @@
  */
   __pyx_v_ln = PyInt_AsLong(__pyx_v_n);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3295
+  /* "mtrand.pyx":3295
  *         fp = PyFloat_AsDouble(p)
  *         ln = PyInt_AsLong(n)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -14063,7 +14070,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3296
+    /* "mtrand.pyx":3296
  *         ln = PyInt_AsLong(n)
  *         if not PyErr_Occurred():
  *             if ln <= 0:             # <<<<<<<<<<<<<<
@@ -14073,7 +14080,7 @@
     __pyx_t_1 = (__pyx_v_ln <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3297
+      /* "mtrand.pyx":3297
  *         if not PyErr_Occurred():
  *             if ln <= 0:
  *                 raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14095,7 +14102,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3298
+    /* "mtrand.pyx":3298
  *             if ln <= 0:
  *                 raise ValueError("n <= 0")
  *             if fp < 0:             # <<<<<<<<<<<<<<
@@ -14105,7 +14112,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3299
+      /* "mtrand.pyx":3299
  *                 raise ValueError("n <= 0")
  *             if fp < 0:
  *                 raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14126,7 +14133,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3300
+    /* "mtrand.pyx":3300
  *             if fp < 0:
  *                 raise ValueError("p < 0")
  *             elif fp > 1:             # <<<<<<<<<<<<<<
@@ -14136,7 +14143,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3301
+      /* "mtrand.pyx":3301
  *                 raise ValueError("p < 0")
  *             elif fp > 1:
  *                 raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14158,7 +14165,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3302
+    /* "mtrand.pyx":3302
  *             elif fp > 1:
  *                 raise ValueError("p > 1")
  *             return discnp_array_sc(self.internal_state, rk_binomial, size, ln, fp)             # <<<<<<<<<<<<<<
@@ -14175,7 +14182,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3304
+  /* "mtrand.pyx":3304
  *             return discnp_array_sc(self.internal_state, rk_binomial, size, ln, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -14184,7 +14191,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3306
+  /* "mtrand.pyx":3306
  *         PyErr_Clear()
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14198,7 +14205,7 @@
   __pyx_v_on = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3307
+  /* "mtrand.pyx":3307
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14212,7 +14219,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3308
+  /* "mtrand.pyx":3308
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_LONG, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):             # <<<<<<<<<<<<<<
@@ -14254,7 +14261,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3309
+    /* "mtrand.pyx":3309
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14276,7 +14283,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3310
+  /* "mtrand.pyx":3310
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):             # <<<<<<<<<<<<<<
@@ -14318,7 +14325,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3311
+    /* "mtrand.pyx":3311
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14340,7 +14347,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3312
+  /* "mtrand.pyx":3312
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):             # <<<<<<<<<<<<<<
@@ -14382,7 +14389,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3313
+    /* "mtrand.pyx":3313
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14404,7 +14411,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3314
+  /* "mtrand.pyx":3314
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")
  *         return discnp_array(self.internal_state, rk_binomial, size, on, op)             # <<<<<<<<<<<<<<
@@ -14439,7 +14446,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3316
+/* "mtrand.pyx":3316
  *         return discnp_array(self.internal_state, rk_binomial, size, on, op)
  * 
  *     def negative_binomial(self, n, p, size=None):             # <<<<<<<<<<<<<<
@@ -14525,7 +14532,7 @@
   __pyx_v_on = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3386
+  /* "mtrand.pyx":3386
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -14534,7 +14541,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3387
+  /* "mtrand.pyx":3387
  * 
  *         fp = PyFloat_AsDouble(p)
  *         fn = PyFloat_AsDouble(n)             # <<<<<<<<<<<<<<
@@ -14543,7 +14550,7 @@
  */
   __pyx_v_fn = PyFloat_AsDouble(__pyx_v_n);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3388
+  /* "mtrand.pyx":3388
  *         fp = PyFloat_AsDouble(p)
  *         fn = PyFloat_AsDouble(n)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -14553,7 +14560,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3389
+    /* "mtrand.pyx":3389
  *         fn = PyFloat_AsDouble(n)
  *         if not PyErr_Occurred():
  *             if fn <= 0:             # <<<<<<<<<<<<<<
@@ -14563,7 +14570,7 @@
     __pyx_t_1 = (__pyx_v_fn <= 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3390
+      /* "mtrand.pyx":3390
  *         if not PyErr_Occurred():
  *             if fn <= 0:
  *                 raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14585,7 +14592,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3391
+    /* "mtrand.pyx":3391
  *             if fn <= 0:
  *                 raise ValueError("n <= 0")
  *             if fp < 0:             # <<<<<<<<<<<<<<
@@ -14595,7 +14602,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3392
+      /* "mtrand.pyx":3392
  *                 raise ValueError("n <= 0")
  *             if fp < 0:
  *                 raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14616,7 +14623,7 @@
       goto __pyx_L8;
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3393
+    /* "mtrand.pyx":3393
  *             if fp < 0:
  *                 raise ValueError("p < 0")
  *             elif fp > 1:             # <<<<<<<<<<<<<<
@@ -14626,7 +14633,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3394
+      /* "mtrand.pyx":3394
  *                 raise ValueError("p < 0")
  *             elif fp > 1:
  *                 raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14648,7 +14655,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3395
+    /* "mtrand.pyx":3395
  *             elif fp > 1:
  *                 raise ValueError("p > 1")
  *             return discdd_array_sc(self.internal_state, rk_negative_binomial,             # <<<<<<<<<<<<<<
@@ -14657,7 +14664,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3396
+    /* "mtrand.pyx":3396
  *                 raise ValueError("p > 1")
  *             return discdd_array_sc(self.internal_state, rk_negative_binomial,
  *                                    size, fn, fp)             # <<<<<<<<<<<<<<
@@ -14673,7 +14680,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3398
+  /* "mtrand.pyx":3398
  *                                    size, fn, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -14682,7 +14689,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3400
+  /* "mtrand.pyx":3400
  *         PyErr_Clear()
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14696,7 +14703,7 @@
   __pyx_v_on = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3401
+  /* "mtrand.pyx":3401
  * 
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -14710,7 +14717,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3402
+  /* "mtrand.pyx":3402
  *         on = <ndarray>PyArray_FROM_OTF(n, NPY_DOUBLE, NPY_ALIGNED)
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):             # <<<<<<<<<<<<<<
@@ -14752,7 +14759,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3403
+    /* "mtrand.pyx":3403
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")             # <<<<<<<<<<<<<<
@@ -14774,7 +14781,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3404
+  /* "mtrand.pyx":3404
  *         if np.any(np.less_equal(n, 0)):
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):             # <<<<<<<<<<<<<<
@@ -14816,7 +14823,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3405
+    /* "mtrand.pyx":3405
  *             raise ValueError("n <= 0")
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")             # <<<<<<<<<<<<<<
@@ -14838,7 +14845,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3406
+  /* "mtrand.pyx":3406
  *         if np.any(np.less(p, 0)):
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):             # <<<<<<<<<<<<<<
@@ -14880,7 +14887,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3407
+    /* "mtrand.pyx":3407
  *             raise ValueError("p < 0")
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")             # <<<<<<<<<<<<<<
@@ -14902,7 +14909,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3408
+  /* "mtrand.pyx":3408
  *         if np.any(np.greater(p, 1)):
  *             raise ValueError("p > 1")
  *         return discdd_array(self.internal_state, rk_negative_binomial, size,             # <<<<<<<<<<<<<<
@@ -14911,7 +14918,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3409
+  /* "mtrand.pyx":3409
  *             raise ValueError("p > 1")
  *         return discdd_array(self.internal_state, rk_negative_binomial, size,
  *                             on, op)             # <<<<<<<<<<<<<<
@@ -14945,7 +14952,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3411
+/* "mtrand.pyx":3411
  *                             on, op)
  * 
  *     def poisson(self, lam=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -15018,7 +15025,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_olam = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3461
+  /* "mtrand.pyx":3461
  *         cdef ndarray olam
  *         cdef double flam
  *         flam = PyFloat_AsDouble(lam)             # <<<<<<<<<<<<<<
@@ -15027,7 +15034,7 @@
  */
   __pyx_v_flam = PyFloat_AsDouble(__pyx_v_lam);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3462
+  /* "mtrand.pyx":3462
  *         cdef double flam
  *         flam = PyFloat_AsDouble(lam)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15037,7 +15044,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3463
+    /* "mtrand.pyx":3463
  *         flam = PyFloat_AsDouble(lam)
  *         if not PyErr_Occurred():
  *             if lam < 0:             # <<<<<<<<<<<<<<
@@ -15050,7 +15057,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3464
+      /* "mtrand.pyx":3464
  *         if not PyErr_Occurred():
  *             if lam < 0:
  *                 raise ValueError("lam < 0")             # <<<<<<<<<<<<<<
@@ -15072,7 +15079,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3465
+    /* "mtrand.pyx":3465
  *             if lam < 0:
  *                 raise ValueError("lam < 0")
  *             return discd_array_sc(self.internal_state, rk_poisson, size, flam)             # <<<<<<<<<<<<<<
@@ -15089,7 +15096,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3467
+  /* "mtrand.pyx":3467
  *             return discd_array_sc(self.internal_state, rk_poisson, size, flam)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15098,7 +15105,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3469
+  /* "mtrand.pyx":3469
  *         PyErr_Clear()
  * 
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15112,7 +15119,7 @@
   __pyx_v_olam = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3470
+  /* "mtrand.pyx":3470
  * 
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(olam, 0)):             # <<<<<<<<<<<<<<
@@ -15154,7 +15161,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3471
+    /* "mtrand.pyx":3471
  *         olam = <ndarray>PyArray_FROM_OTF(lam, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(olam, 0)):
  *             raise ValueError("lam < 0")             # <<<<<<<<<<<<<<
@@ -15176,7 +15183,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3472
+  /* "mtrand.pyx":3472
  *         if np.any(np.less(olam, 0)):
  *             raise ValueError("lam < 0")
  *         return discd_array(self.internal_state, rk_poisson, size, olam)             # <<<<<<<<<<<<<<
@@ -15209,7 +15216,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3474
+/* "mtrand.pyx":3474
  *         return discd_array(self.internal_state, rk_poisson, size, olam)
  * 
  *     def zipf(self, a, size=None):             # <<<<<<<<<<<<<<
@@ -15279,7 +15286,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_oa = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3553
+  /* "mtrand.pyx":3553
  *         cdef double fa
  * 
  *         fa = PyFloat_AsDouble(a)             # <<<<<<<<<<<<<<
@@ -15288,7 +15295,7 @@
  */
   __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3554
+  /* "mtrand.pyx":3554
  * 
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15298,7 +15305,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3555
+    /* "mtrand.pyx":3555
  *         fa = PyFloat_AsDouble(a)
  *         if not PyErr_Occurred():
  *             if fa <= 1.0:             # <<<<<<<<<<<<<<
@@ -15308,7 +15315,7 @@
     __pyx_t_1 = (__pyx_v_fa <= 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3556
+      /* "mtrand.pyx":3556
  *         if not PyErr_Occurred():
  *             if fa <= 1.0:
  *                 raise ValueError("a <= 1.0")             # <<<<<<<<<<<<<<
@@ -15330,7 +15337,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3557
+    /* "mtrand.pyx":3557
  *             if fa <= 1.0:
  *                 raise ValueError("a <= 1.0")
  *             return discd_array_sc(self.internal_state, rk_zipf, size, fa)             # <<<<<<<<<<<<<<
@@ -15347,7 +15354,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3559
+  /* "mtrand.pyx":3559
  *             return discd_array_sc(self.internal_state, rk_zipf, size, fa)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15356,7 +15363,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3561
+  /* "mtrand.pyx":3561
  *         PyErr_Clear()
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15370,7 +15377,7 @@
   __pyx_v_oa = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3562
+  /* "mtrand.pyx":3562
  * 
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 1.0)):             # <<<<<<<<<<<<<<
@@ -15414,7 +15421,7 @@
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3563
+    /* "mtrand.pyx":3563
  *         oa = <ndarray>PyArray_FROM_OTF(a, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(oa, 1.0)):
  *             raise ValueError("a <= 1.0")             # <<<<<<<<<<<<<<
@@ -15436,7 +15443,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3564
+  /* "mtrand.pyx":3564
  *         if np.any(np.less_equal(oa, 1.0)):
  *             raise ValueError("a <= 1.0")
  *         return discd_array(self.internal_state, rk_zipf, size, oa)             # <<<<<<<<<<<<<<
@@ -15469,7 +15476,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3566
+/* "mtrand.pyx":3566
  *         return discd_array(self.internal_state, rk_zipf, size, oa)
  * 
  *     def geometric(self, p, size=None):             # <<<<<<<<<<<<<<
@@ -15539,7 +15546,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3614
+  /* "mtrand.pyx":3614
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -15548,7 +15555,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3615
+  /* "mtrand.pyx":3615
  * 
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15558,7 +15565,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3616
+    /* "mtrand.pyx":3616
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():
  *             if fp < 0.0:             # <<<<<<<<<<<<<<
@@ -15568,7 +15575,7 @@
     __pyx_t_1 = (__pyx_v_fp < 0.0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3617
+      /* "mtrand.pyx":3617
  *         if not PyErr_Occurred():
  *             if fp < 0.0:
  *                 raise ValueError("p < 0.0")             # <<<<<<<<<<<<<<
@@ -15590,7 +15597,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3618
+    /* "mtrand.pyx":3618
  *             if fp < 0.0:
  *                 raise ValueError("p < 0.0")
  *             if fp > 1.0:             # <<<<<<<<<<<<<<
@@ -15600,7 +15607,7 @@
     __pyx_t_1 = (__pyx_v_fp > 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3619
+      /* "mtrand.pyx":3619
  *                 raise ValueError("p < 0.0")
  *             if fp > 1.0:
  *                 raise ValueError("p > 1.0")             # <<<<<<<<<<<<<<
@@ -15622,7 +15629,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3620
+    /* "mtrand.pyx":3620
  *             if fp > 1.0:
  *                 raise ValueError("p > 1.0")
  *             return discd_array_sc(self.internal_state, rk_geometric, size, fp)             # <<<<<<<<<<<<<<
@@ -15639,7 +15646,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3622
+  /* "mtrand.pyx":3622
  *             return discd_array_sc(self.internal_state, rk_geometric, size, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -15648,7 +15655,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3625
+  /* "mtrand.pyx":3625
  * 
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -15662,7 +15669,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3626
+  /* "mtrand.pyx":3626
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(op, 0.0)):             # <<<<<<<<<<<<<<
@@ -15706,7 +15713,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3627
+    /* "mtrand.pyx":3627
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less(op, 0.0)):
  *             raise ValueError("p < 0.0")             # <<<<<<<<<<<<<<
@@ -15728,7 +15735,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3628
+  /* "mtrand.pyx":3628
  *         if np.any(np.less(op, 0.0)):
  *             raise ValueError("p < 0.0")
  *         if np.any(np.greater(op, 1.0)):             # <<<<<<<<<<<<<<
@@ -15772,7 +15779,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3629
+    /* "mtrand.pyx":3629
  *             raise ValueError("p < 0.0")
  *         if np.any(np.greater(op, 1.0)):
  *             raise ValueError("p > 1.0")             # <<<<<<<<<<<<<<
@@ -15794,7 +15801,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3630
+  /* "mtrand.pyx":3630
  *         if np.any(np.greater(op, 1.0)):
  *             raise ValueError("p > 1.0")
  *         return discd_array(self.internal_state, rk_geometric, size, op)             # <<<<<<<<<<<<<<
@@ -15827,7 +15834,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3632
+/* "mtrand.pyx":3632
  *         return discd_array(self.internal_state, rk_geometric, size, op)
  * 
  *     def hypergeometric(self, ngood, nbad, nsample, size=None):             # <<<<<<<<<<<<<<
@@ -15928,7 +15935,7 @@
   __pyx_v_onbad = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_onsample = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3719
+  /* "mtrand.pyx":3719
  *         cdef long lngood, lnbad, lnsample
  * 
  *         lngood = PyInt_AsLong(ngood)             # <<<<<<<<<<<<<<
@@ -15937,7 +15944,7 @@
  */
   __pyx_v_lngood = PyInt_AsLong(__pyx_v_ngood);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3720
+  /* "mtrand.pyx":3720
  * 
  *         lngood = PyInt_AsLong(ngood)
  *         lnbad = PyInt_AsLong(nbad)             # <<<<<<<<<<<<<<
@@ -15946,7 +15953,7 @@
  */
   __pyx_v_lnbad = PyInt_AsLong(__pyx_v_nbad);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3721
+  /* "mtrand.pyx":3721
  *         lngood = PyInt_AsLong(ngood)
  *         lnbad = PyInt_AsLong(nbad)
  *         lnsample = PyInt_AsLong(nsample)             # <<<<<<<<<<<<<<
@@ -15955,7 +15962,7 @@
  */
   __pyx_v_lnsample = PyInt_AsLong(__pyx_v_nsample);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3722
+  /* "mtrand.pyx":3722
  *         lnbad = PyInt_AsLong(nbad)
  *         lnsample = PyInt_AsLong(nsample)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -15965,7 +15972,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3723
+    /* "mtrand.pyx":3723
  *         lnsample = PyInt_AsLong(nsample)
  *         if not PyErr_Occurred():
  *             if ngood < 1:             # <<<<<<<<<<<<<<
@@ -15978,7 +15985,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3724
+      /* "mtrand.pyx":3724
  *         if not PyErr_Occurred():
  *             if ngood < 1:
  *                 raise ValueError("ngood < 1")             # <<<<<<<<<<<<<<
@@ -16000,7 +16007,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3725
+    /* "mtrand.pyx":3725
  *             if ngood < 1:
  *                 raise ValueError("ngood < 1")
  *             if nbad < 1:             # <<<<<<<<<<<<<<
@@ -16013,7 +16020,7 @@
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3726
+      /* "mtrand.pyx":3726
  *                 raise ValueError("ngood < 1")
  *             if nbad < 1:
  *                 raise ValueError("nbad < 1")             # <<<<<<<<<<<<<<
@@ -16035,7 +16042,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3727
+    /* "mtrand.pyx":3727
  *             if nbad < 1:
  *                 raise ValueError("nbad < 1")
  *             if nsample < 1:             # <<<<<<<<<<<<<<
@@ -16048,7 +16055,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3728
+      /* "mtrand.pyx":3728
  *                 raise ValueError("nbad < 1")
  *             if nsample < 1:
  *                 raise ValueError("nsample < 1")             # <<<<<<<<<<<<<<
@@ -16070,7 +16077,7 @@
     }
     __pyx_L9:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3729
+    /* "mtrand.pyx":3729
  *             if nsample < 1:
  *                 raise ValueError("nsample < 1")
  *             if ngood + nbad < nsample:             # <<<<<<<<<<<<<<
@@ -16086,7 +16093,7 @@
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3730
+      /* "mtrand.pyx":3730
  *                 raise ValueError("nsample < 1")
  *             if ngood + nbad < nsample:
  *                 raise ValueError("ngood + nbad < nsample")             # <<<<<<<<<<<<<<
@@ -16108,7 +16115,7 @@
     }
     __pyx_L10:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3731
+    /* "mtrand.pyx":3731
  *             if ngood + nbad < nsample:
  *                 raise ValueError("ngood + nbad < nsample")
  *             return discnmN_array_sc(self.internal_state, rk_hypergeometric, size,             # <<<<<<<<<<<<<<
@@ -16117,7 +16124,7 @@
  */
     __Pyx_XDECREF(__pyx_r);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3732
+    /* "mtrand.pyx":3732
  *                 raise ValueError("ngood + nbad < nsample")
  *             return discnmN_array_sc(self.internal_state, rk_hypergeometric, size,
  *                                     lngood, lnbad, lnsample)             # <<<<<<<<<<<<<<
@@ -16133,7 +16140,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3735
+  /* "mtrand.pyx":3735
  * 
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -16142,7 +16149,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3737
+  /* "mtrand.pyx":3737
  *         PyErr_Clear()
  * 
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16156,7 +16163,7 @@
   __pyx_v_ongood = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3738
+  /* "mtrand.pyx":3738
  * 
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16170,7 +16177,7 @@
   __pyx_v_onbad = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3739
+  /* "mtrand.pyx":3739
  *         ongood = <ndarray>PyArray_FROM_OTF(ngood, NPY_LONG, NPY_ALIGNED)
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16184,7 +16191,7 @@
   __pyx_v_onsample = ((PyArrayObject *)__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3740
+  /* "mtrand.pyx":3740
  *         onbad = <ndarray>PyArray_FROM_OTF(nbad, NPY_LONG, NPY_ALIGNED)
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)
  *         if np.any(np.less(ongood, 1)):             # <<<<<<<<<<<<<<
@@ -16226,7 +16233,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3741
+    /* "mtrand.pyx":3741
  *         onsample = <ndarray>PyArray_FROM_OTF(nsample, NPY_LONG, NPY_ALIGNED)
  *         if np.any(np.less(ongood, 1)):
  *             raise ValueError("ngood < 1")             # <<<<<<<<<<<<<<
@@ -16248,7 +16255,7 @@
   }
   __pyx_L11:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3742
+  /* "mtrand.pyx":3742
  *         if np.any(np.less(ongood, 1)):
  *             raise ValueError("ngood < 1")
  *         if np.any(np.less(onbad, 1)):             # <<<<<<<<<<<<<<
@@ -16290,7 +16297,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3743
+    /* "mtrand.pyx":3743
  *             raise ValueError("ngood < 1")
  *         if np.any(np.less(onbad, 1)):
  *             raise ValueError("nbad < 1")             # <<<<<<<<<<<<<<
@@ -16312,7 +16319,7 @@
   }
   __pyx_L12:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3744
+  /* "mtrand.pyx":3744
  *         if np.any(np.less(onbad, 1)):
  *             raise ValueError("nbad < 1")
  *         if np.any(np.less(onsample, 1)):             # <<<<<<<<<<<<<<
@@ -16354,7 +16361,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3745
+    /* "mtrand.pyx":3745
  *             raise ValueError("nbad < 1")
  *         if np.any(np.less(onsample, 1)):
  *             raise ValueError("nsample < 1")             # <<<<<<<<<<<<<<
@@ -16376,7 +16383,7 @@
   }
   __pyx_L13:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3746
+  /* "mtrand.pyx":3746
  *         if np.any(np.less(onsample, 1)):
  *             raise ValueError("nsample < 1")
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):             # <<<<<<<<<<<<<<
@@ -16435,7 +16442,7 @@
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3747
+    /* "mtrand.pyx":3747
  *             raise ValueError("nsample < 1")
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):
  *             raise ValueError("ngood + nbad < nsample")             # <<<<<<<<<<<<<<
@@ -16457,7 +16464,7 @@
   }
   __pyx_L14:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3748
+  /* "mtrand.pyx":3748
  *         if np.any(np.less(np.add(ongood, onbad),onsample)):
  *             raise ValueError("ngood + nbad < nsample")
  *         return discnmN_array(self.internal_state, rk_hypergeometric, size,             # <<<<<<<<<<<<<<
@@ -16466,7 +16473,7 @@
  */
   __Pyx_XDECREF(__pyx_r);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3749
+  /* "mtrand.pyx":3749
  *             raise ValueError("ngood + nbad < nsample")
  *         return discnmN_array(self.internal_state, rk_hypergeometric, size,
  *             ongood, onbad, onsample)             # <<<<<<<<<<<<<<
@@ -16503,7 +16510,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3751
+/* "mtrand.pyx":3751
  *             ongood, onbad, onsample)
  * 
  *     def logseries(self, p, size=None):             # <<<<<<<<<<<<<<
@@ -16573,7 +16580,7 @@
   __Pyx_INCREF(__pyx_v_size);
   __pyx_v_op = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3828
+  /* "mtrand.pyx":3828
  *         cdef double fp
  * 
  *         fp = PyFloat_AsDouble(p)             # <<<<<<<<<<<<<<
@@ -16582,7 +16589,7 @@
  */
   __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3829
+  /* "mtrand.pyx":3829
  * 
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():             # <<<<<<<<<<<<<<
@@ -16592,7 +16599,7 @@
   __pyx_t_1 = (!PyErr_Occurred());
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3830
+    /* "mtrand.pyx":3830
  *         fp = PyFloat_AsDouble(p)
  *         if not PyErr_Occurred():
  *             if fp <= 0.0:             # <<<<<<<<<<<<<<
@@ -16602,7 +16609,7 @@
     __pyx_t_1 = (__pyx_v_fp <= 0.0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3831
+      /* "mtrand.pyx":3831
  *         if not PyErr_Occurred():
  *             if fp <= 0.0:
  *                 raise ValueError("p <= 0.0")             # <<<<<<<<<<<<<<
@@ -16624,7 +16631,7 @@
     }
     __pyx_L7:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3832
+    /* "mtrand.pyx":3832
  *             if fp <= 0.0:
  *                 raise ValueError("p <= 0.0")
  *             if fp >= 1.0:             # <<<<<<<<<<<<<<
@@ -16634,7 +16641,7 @@
     __pyx_t_1 = (__pyx_v_fp >= 1.0);
     if (__pyx_t_1) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3833
+      /* "mtrand.pyx":3833
  *                 raise ValueError("p <= 0.0")
  *             if fp >= 1.0:
  *                 raise ValueError("p >= 1.0")             # <<<<<<<<<<<<<<
@@ -16656,7 +16663,7 @@
     }
     __pyx_L8:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3834
+    /* "mtrand.pyx":3834
  *             if fp >= 1.0:
  *                 raise ValueError("p >= 1.0")
  *             return discd_array_sc(self.internal_state, rk_logseries, size, fp)             # <<<<<<<<<<<<<<
@@ -16673,7 +16680,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3836
+  /* "mtrand.pyx":3836
  *             return discd_array_sc(self.internal_state, rk_logseries, size, fp)
  * 
  *         PyErr_Clear()             # <<<<<<<<<<<<<<
@@ -16682,7 +16689,7 @@
  */
   PyErr_Clear();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3838
+  /* "mtrand.pyx":3838
  *         PyErr_Clear()
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)             # <<<<<<<<<<<<<<
@@ -16696,7 +16703,7 @@
   __pyx_v_op = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3839
+  /* "mtrand.pyx":3839
  * 
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(op, 0.0)):             # <<<<<<<<<<<<<<
@@ -16740,7 +16747,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3840
+    /* "mtrand.pyx":3840
  *         op = <ndarray>PyArray_FROM_OTF(p, NPY_DOUBLE, NPY_ALIGNED)
  *         if np.any(np.less_equal(op, 0.0)):
  *             raise ValueError("p <= 0.0")             # <<<<<<<<<<<<<<
@@ -16762,7 +16769,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3841
+  /* "mtrand.pyx":3841
  *         if np.any(np.less_equal(op, 0.0)):
  *             raise ValueError("p <= 0.0")
  *         if np.any(np.greater_equal(op, 1.0)):             # <<<<<<<<<<<<<<
@@ -16806,7 +16813,7 @@
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   if (__pyx_t_1) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3842
+    /* "mtrand.pyx":3842
  *             raise ValueError("p <= 0.0")
  *         if np.any(np.greater_equal(op, 1.0)):
  *             raise ValueError("p >= 1.0")             # <<<<<<<<<<<<<<
@@ -16828,7 +16835,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3843
+  /* "mtrand.pyx":3843
  *         if np.any(np.greater_equal(op, 1.0)):
  *             raise ValueError("p >= 1.0")
  *         return discd_array(self.internal_state, rk_logseries, size, op)             # <<<<<<<<<<<<<<
@@ -16861,7 +16868,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3846
+/* "mtrand.pyx":3846
  * 
  *     # Multivariate distributions:
  *     def multivariate_normal(self, mean, cov, size=None):             # <<<<<<<<<<<<<<
@@ -16959,7 +16966,7 @@
   __pyx_v_s = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_v = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3939
+  /* "mtrand.pyx":3939
  *         """
  *         # Check preconditions on arguments
  *         mean = np.array(mean)             # <<<<<<<<<<<<<<
@@ -16984,7 +16991,7 @@
   __pyx_v_mean = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3940
+  /* "mtrand.pyx":3940
  *         # Check preconditions on arguments
  *         mean = np.array(mean)
  *         cov = np.array(cov)             # <<<<<<<<<<<<<<
@@ -17009,7 +17016,7 @@
   __pyx_v_cov = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3941
+  /* "mtrand.pyx":3941
  *         mean = np.array(mean)
  *         cov = np.array(cov)
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -17019,7 +17026,7 @@
   __pyx_t_4 = (__pyx_v_size == Py_None);
   if (__pyx_t_4) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3942
+    /* "mtrand.pyx":3942
  *         cov = np.array(cov)
  *         if size is None:
  *             shape = []             # <<<<<<<<<<<<<<
@@ -17035,7 +17042,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3944
+    /* "mtrand.pyx":3944
  *             shape = []
  *         else:
  *             shape = size             # <<<<<<<<<<<<<<
@@ -17048,7 +17055,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3945
+  /* "mtrand.pyx":3945
  *         else:
  *             shape = size
  *         if len(mean.shape) != 1:             # <<<<<<<<<<<<<<
@@ -17062,7 +17069,7 @@
   __pyx_t_4 = (__pyx_t_5 != 1);
   if (__pyx_t_4) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3946
+    /* "mtrand.pyx":3946
  *             shape = size
  *         if len(mean.shape) != 1:
  *                raise ValueError("mean must be 1 dimensional")             # <<<<<<<<<<<<<<
@@ -17084,7 +17091,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3947
+  /* "mtrand.pyx":3947
  *         if len(mean.shape) != 1:
  *                raise ValueError("mean must be 1 dimensional")
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):             # <<<<<<<<<<<<<<
@@ -17119,7 +17126,7 @@
   }
   if (__pyx_t_7) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3948
+    /* "mtrand.pyx":3948
  *                raise ValueError("mean must be 1 dimensional")
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):
  *                raise ValueError("cov must be 2 dimensional and square")             # <<<<<<<<<<<<<<
@@ -17141,7 +17148,7 @@
   }
   __pyx_L8:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3949
+  /* "mtrand.pyx":3949
  *         if (len(cov.shape) != 2) or (cov.shape[0] != cov.shape[1]):
  *                raise ValueError("cov must be 2 dimensional and square")
  *         if mean.shape[0] != cov.shape[0]:             # <<<<<<<<<<<<<<
@@ -17166,7 +17173,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_7) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3950
+    /* "mtrand.pyx":3950
  *                raise ValueError("cov must be 2 dimensional and square")
  *         if mean.shape[0] != cov.shape[0]:
  *                raise ValueError("mean and cov must have same length")             # <<<<<<<<<<<<<<
@@ -17188,7 +17195,7 @@
   }
   __pyx_L9:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3952
+  /* "mtrand.pyx":3952
  *                raise ValueError("mean and cov must have same length")
  *         # Compute shape of output
  *         if isinstance(shape, int):             # <<<<<<<<<<<<<<
@@ -17198,7 +17205,7 @@
   __pyx_t_7 = PyObject_TypeCheck(__pyx_v_shape, ((PyTypeObject *)((PyObject*)&PyInt_Type))); 
   if (__pyx_t_7) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3953
+    /* "mtrand.pyx":3953
  *         # Compute shape of output
  *         if isinstance(shape, int):
  *             shape = [shape]             # <<<<<<<<<<<<<<
@@ -17217,7 +17224,7 @@
   }
   __pyx_L10:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3954
+  /* "mtrand.pyx":3954
  *         if isinstance(shape, int):
  *             shape = [shape]
  *         final_shape = list(shape[:])             # <<<<<<<<<<<<<<
@@ -17238,7 +17245,7 @@
   __pyx_v_final_shape = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3955
+  /* "mtrand.pyx":3955
  *             shape = [shape]
  *         final_shape = list(shape[:])
  *         final_shape.append(mean.shape[0])             # <<<<<<<<<<<<<<
@@ -17255,7 +17262,7 @@
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3959
+  /* "mtrand.pyx":3959
  *         # numbers. The matrix has rows with the same length as mean and as
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))             # <<<<<<<<<<<<<<
@@ -17294,7 +17301,7 @@
   __pyx_v_x = __pyx_t_8;
   __pyx_t_8 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3960
+  /* "mtrand.pyx":3960
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),             # <<<<<<<<<<<<<<
@@ -17322,7 +17329,7 @@
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3961
+  /* "mtrand.pyx":3961
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),
  *                    mean.shape[0])             # <<<<<<<<<<<<<<
@@ -17343,7 +17350,7 @@
   __pyx_t_3 = 0;
   __pyx_t_8 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3960
+  /* "mtrand.pyx":3960
  *         # many rows are necessary to form a matrix of shape final_shape.
  *         x = self.standard_normal(np.multiply.reduce(final_shape))
  *         x.shape = (np.multiply.reduce(final_shape[0:len(final_shape)-1]),             # <<<<<<<<<<<<<<
@@ -17353,7 +17360,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_s__shape, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3960; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3969
+  /* "mtrand.pyx":3969
  *         # decomposition of cov is such an A.
  * 
  *         from numpy.dual import svd             # <<<<<<<<<<<<<<
@@ -17376,7 +17383,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3971
+  /* "mtrand.pyx":3971
  *         from numpy.dual import svd
  *         # XXX: we really should be doing this by Cholesky decomposition
  *         (u,s,v) = svd(cov)             # <<<<<<<<<<<<<<
@@ -17429,7 +17436,7 @@
     __pyx_t_1 = 0;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3972
+  /* "mtrand.pyx":3972
  *         # XXX: we really should be doing this by Cholesky decomposition
  *         (u,s,v) = svd(cov)
  *         x = np.dot(x*np.sqrt(s),v)             # <<<<<<<<<<<<<<
@@ -17474,7 +17481,7 @@
   __pyx_v_x = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3975
+  /* "mtrand.pyx":3975
  *         # The rows of x now have the correct covariance but mean 0. Add
  *         # mean to each row. Then each row will have mean mean.
  *         np.add(mean,x,x)             # <<<<<<<<<<<<<<
@@ -17503,7 +17510,7 @@
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3976
+  /* "mtrand.pyx":3976
  *         # mean to each row. Then each row will have mean mean.
  *         np.add(mean,x,x)
  *         x.shape = tuple(final_shape)             # <<<<<<<<<<<<<<
@@ -17521,7 +17528,7 @@
   if (PyObject_SetAttr(__pyx_v_x, __pyx_n_s__shape, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3976; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3977
+  /* "mtrand.pyx":3977
  *         np.add(mean,x,x)
  *         x.shape = tuple(final_shape)
  *         return x             # <<<<<<<<<<<<<<
@@ -17560,7 +17567,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3979
+/* "mtrand.pyx":3979
  *         return x
  * 
  *     def multinomial(self, long n, object pvals, size=None):             # <<<<<<<<<<<<<<
@@ -17656,7 +17663,7 @@
   __pyx_v_shape = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_multin = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4038
+  /* "mtrand.pyx":4038
  *         cdef double Sum
  * 
  *         d = len(pvals)             # <<<<<<<<<<<<<<
@@ -17666,7 +17673,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_pvals); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4038; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_d = __pyx_t_1;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4039
+  /* "mtrand.pyx":4039
  * 
  *         d = len(pvals)
  *         parr = <ndarray>PyArray_ContiguousFromObject(pvals, NPY_DOUBLE, 1, 1)             # <<<<<<<<<<<<<<
@@ -17680,7 +17687,7 @@
   arrayObject_parr = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4040
+  /* "mtrand.pyx":4040
  *         d = len(pvals)
  *         parr = <ndarray>PyArray_ContiguousFromObject(pvals, NPY_DOUBLE, 1, 1)
  *         pix = <double*>parr.data             # <<<<<<<<<<<<<<
@@ -17689,7 +17696,7 @@
  */
   __pyx_v_pix = ((double *)arrayObject_parr->data);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4042
+  /* "mtrand.pyx":4042
  *         pix = <double*>parr.data
  * 
  *         if kahan_sum(pix, d-1) > (1.0 + 1e-12):             # <<<<<<<<<<<<<<
@@ -17699,7 +17706,7 @@
   __pyx_t_3 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix, (__pyx_v_d - 1)) > (1.0 + 9.9999999999999998e-13));
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4043
+    /* "mtrand.pyx":4043
  * 
  *         if kahan_sum(pix, d-1) > (1.0 + 1e-12):
  *             raise ValueError("sum(pvals[:-1]) > 1.0")             # <<<<<<<<<<<<<<
@@ -17721,7 +17728,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4045
+  /* "mtrand.pyx":4045
  *             raise ValueError("sum(pvals[:-1]) > 1.0")
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -17731,7 +17738,7 @@
   __pyx_t_3 = (__pyx_v_size == Py_None);
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4046
+    /* "mtrand.pyx":4046
  * 
  *         if size is None:
  *             shape = (d,)             # <<<<<<<<<<<<<<
@@ -17751,20 +17758,17 @@
     goto __pyx_L7;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4047
+  /* "mtrand.pyx":4047
  *         if size is None:
  *             shape = (d,)
  *         elif type(size) is int:             # <<<<<<<<<<<<<<
  *             shape = (size, d)
  *         else:
  */
-  __pyx_t_2 = ((PyObject *)__Pyx_Type(__pyx_v_size)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4047; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
-  __pyx_t_3 = (__pyx_t_2 == ((PyObject*)&PyInt_Type));
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_3 = (((PyObject *)Py_TYPE(__pyx_v_size)) == ((PyObject *)((PyObject*)&PyInt_Type)));
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4048
+    /* "mtrand.pyx":4048
  *             shape = (d,)
  *         elif type(size) is int:
  *             shape = (size, d)             # <<<<<<<<<<<<<<
@@ -17788,7 +17792,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4050
+    /* "mtrand.pyx":4050
  *             shape = (size, d)
  *         else:
  *             shape = size + (d,)             # <<<<<<<<<<<<<<
@@ -17811,7 +17815,7 @@
   }
   __pyx_L7:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4052
+  /* "mtrand.pyx":4052
  *             shape = size + (d,)
  * 
  *         multin = np.zeros(shape, int)             # <<<<<<<<<<<<<<
@@ -17839,7 +17843,7 @@
   __pyx_v_multin = __pyx_t_5;
   __pyx_t_5 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4053
+  /* "mtrand.pyx":4053
  * 
  *         multin = np.zeros(shape, int)
  *         mnarr = <ndarray>multin             # <<<<<<<<<<<<<<
@@ -17850,7 +17854,7 @@
   __Pyx_DECREF(((PyObject *)arrayObject_mnarr));
   arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4054
+  /* "mtrand.pyx":4054
  *         multin = np.zeros(shape, int)
  *         mnarr = <ndarray>multin
  *         mnix = <long*>mnarr.data             # <<<<<<<<<<<<<<
@@ -17859,7 +17863,7 @@
  */
   __pyx_v_mnix = ((long *)arrayObject_mnarr->data);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4055
+  /* "mtrand.pyx":4055
  *         mnarr = <ndarray>multin
  *         mnix = <long*>mnarr.data
  *         i = 0             # <<<<<<<<<<<<<<
@@ -17868,7 +17872,7 @@
  */
   __pyx_v_i = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4056
+  /* "mtrand.pyx":4056
  *         mnix = <long*>mnarr.data
  *         i = 0
  *         while i < PyArray_SIZE(mnarr):             # <<<<<<<<<<<<<<
@@ -17879,7 +17883,7 @@
     __pyx_t_3 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr));
     if (!__pyx_t_3) break;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4057
+    /* "mtrand.pyx":4057
  *         i = 0
  *         while i < PyArray_SIZE(mnarr):
  *             Sum = 1.0             # <<<<<<<<<<<<<<
@@ -17888,7 +17892,7 @@
  */
     __pyx_v_Sum = 1.0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4058
+    /* "mtrand.pyx":4058
  *         while i < PyArray_SIZE(mnarr):
  *             Sum = 1.0
  *             dn = n             # <<<<<<<<<<<<<<
@@ -17897,7 +17901,7 @@
  */
     __pyx_v_dn = __pyx_v_n;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4059
+    /* "mtrand.pyx":4059
  *             Sum = 1.0
  *             dn = n
  *             for j from 0 <= j < d-1:             # <<<<<<<<<<<<<<
@@ -17907,7 +17911,7 @@
     __pyx_t_6 = (__pyx_v_d - 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4060
+      /* "mtrand.pyx":4060
  *             dn = n
  *             for j from 0 <= j < d-1:
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)             # <<<<<<<<<<<<<<
@@ -17921,7 +17925,7 @@
       }
       (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state, __pyx_v_dn, (__pyx_t_7 / __pyx_v_Sum));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4061
+      /* "mtrand.pyx":4061
  *             for j from 0 <= j < d-1:
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)
  *                 dn = dn - mnix[i+j]             # <<<<<<<<<<<<<<
@@ -17930,7 +17934,7 @@
  */
       __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4062
+      /* "mtrand.pyx":4062
  *                 mnix[i+j] = rk_binomial(self.internal_state, dn, pix[j]/Sum)
  *                 dn = dn - mnix[i+j]
  *                 if dn <= 0:             # <<<<<<<<<<<<<<
@@ -17940,7 +17944,7 @@
       __pyx_t_3 = (__pyx_v_dn <= 0);
       if (__pyx_t_3) {
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4063
+        /* "mtrand.pyx":4063
  *                 dn = dn - mnix[i+j]
  *                 if dn <= 0:
  *                     break             # <<<<<<<<<<<<<<
@@ -17952,7 +17956,7 @@
       }
       __pyx_L12:;
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4064
+      /* "mtrand.pyx":4064
  *                 if dn <= 0:
  *                     break
  *                 Sum = Sum - pix[j]             # <<<<<<<<<<<<<<
@@ -17963,7 +17967,7 @@
     }
     __pyx_L11_break:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4065
+    /* "mtrand.pyx":4065
  *                     break
  *                 Sum = Sum - pix[j]
  *             if dn > 0:             # <<<<<<<<<<<<<<
@@ -17973,7 +17977,7 @@
     __pyx_t_3 = (__pyx_v_dn > 0);
     if (__pyx_t_3) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4066
+      /* "mtrand.pyx":4066
  *                 Sum = Sum - pix[j]
  *             if dn > 0:
  *                 mnix[i+d-1] = dn             # <<<<<<<<<<<<<<
@@ -17985,7 +17989,7 @@
     }
     __pyx_L13:;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4068
+    /* "mtrand.pyx":4068
  *                 mnix[i+d-1] = dn
  * 
  *             i = i + d             # <<<<<<<<<<<<<<
@@ -17995,7 +17999,7 @@
     __pyx_v_i = (__pyx_v_i + __pyx_v_d);
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4070
+  /* "mtrand.pyx":4070
  *             i = i + d
  * 
  *         return multin             # <<<<<<<<<<<<<<
@@ -18028,7 +18032,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4072
+/* "mtrand.pyx":4072
  *         return multin
  * 
  *     def dirichlet(self, object alpha, size=None):             # <<<<<<<<<<<<<<
@@ -18112,7 +18116,7 @@
   __pyx_v_shape = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_diric = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4136
+  /* "mtrand.pyx":4136
  *         cdef double     acc, invacc
  * 
  *         k           = len(alpha)             # <<<<<<<<<<<<<<
@@ -18122,7 +18126,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_alpha); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4136; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_k = __pyx_t_1;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4137
+  /* "mtrand.pyx":4137
  * 
  *         k           = len(alpha)
  *         alpha_arr   = <ndarray>PyArray_ContiguousFromObject(alpha, NPY_DOUBLE, 1, 1)             # <<<<<<<<<<<<<<
@@ -18136,7 +18140,7 @@
   __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4138
+  /* "mtrand.pyx":4138
  *         k           = len(alpha)
  *         alpha_arr   = <ndarray>PyArray_ContiguousFromObject(alpha, NPY_DOUBLE, 1, 1)
  *         alpha_data  = <double*>alpha_arr.data             # <<<<<<<<<<<<<<
@@ -18145,7 +18149,7 @@
  */
   __pyx_v_alpha_data = ((double *)__pyx_v_alpha_arr->data);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4140
+  /* "mtrand.pyx":4140
  *         alpha_data  = <double*>alpha_arr.data
  * 
  *         if size is None:             # <<<<<<<<<<<<<<
@@ -18155,7 +18159,7 @@
   __pyx_t_3 = (__pyx_v_size == Py_None);
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4141
+    /* "mtrand.pyx":4141
  * 
  *         if size is None:
  *             shape = (k,)             # <<<<<<<<<<<<<<
@@ -18175,20 +18179,17 @@
     goto __pyx_L6;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4142
+  /* "mtrand.pyx":4142
  *         if size is None:
  *             shape = (k,)
  *         elif type(size) is int:             # <<<<<<<<<<<<<<
  *             shape = (size, k)
  *         else:
  */
-  __pyx_t_4 = ((PyObject *)__Pyx_Type(__pyx_v_size)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_4));
-  __pyx_t_3 = (__pyx_t_4 == ((PyObject*)&PyInt_Type));
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+  __pyx_t_3 = (((PyObject *)Py_TYPE(__pyx_v_size)) == ((PyObject *)((PyObject*)&PyInt_Type)));
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4143
+    /* "mtrand.pyx":4143
  *             shape = (k,)
  *         elif type(size) is int:
  *             shape = (size, k)             # <<<<<<<<<<<<<<
@@ -18212,7 +18213,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4145
+    /* "mtrand.pyx":4145
  *             shape = (size, k)
  *         else:
  *             shape = size + (k,)             # <<<<<<<<<<<<<<
@@ -18235,7 +18236,7 @@
   }
   __pyx_L6:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4147
+  /* "mtrand.pyx":4147
  *             shape = size + (k,)
  * 
  *         diric   = np.zeros(shape, np.float64)             # <<<<<<<<<<<<<<
@@ -18268,7 +18269,7 @@
   __pyx_v_diric = __pyx_t_5;
   __pyx_t_5 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4148
+  /* "mtrand.pyx":4148
  * 
  *         diric   = np.zeros(shape, np.float64)
  *         val_arr = <ndarray>diric             # <<<<<<<<<<<<<<
@@ -18279,7 +18280,7 @@
   __Pyx_DECREF(((PyObject *)__pyx_v_val_arr));
   __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4149
+  /* "mtrand.pyx":4149
  *         diric   = np.zeros(shape, np.float64)
  *         val_arr = <ndarray>diric
  *         val_data= <double*>val_arr.data             # <<<<<<<<<<<<<<
@@ -18288,7 +18289,7 @@
  */
   __pyx_v_val_data = ((double *)__pyx_v_val_arr->data);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4151
+  /* "mtrand.pyx":4151
  *         val_data= <double*>val_arr.data
  * 
  *         i = 0             # <<<<<<<<<<<<<<
@@ -18297,7 +18298,7 @@
  */
   __pyx_v_i = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4152
+  /* "mtrand.pyx":4152
  * 
  *         i = 0
  *         totsize = PyArray_SIZE(val_arr)             # <<<<<<<<<<<<<<
@@ -18306,7 +18307,7 @@
  */
   __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4153
+  /* "mtrand.pyx":4153
  *         i = 0
  *         totsize = PyArray_SIZE(val_arr)
  *         while i < totsize:             # <<<<<<<<<<<<<<
@@ -18317,7 +18318,7 @@
     __pyx_t_3 = (__pyx_v_i < __pyx_v_totsize);
     if (!__pyx_t_3) break;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4154
+    /* "mtrand.pyx":4154
  *         totsize = PyArray_SIZE(val_arr)
  *         while i < totsize:
  *             acc = 0.0             # <<<<<<<<<<<<<<
@@ -18326,7 +18327,7 @@
  */
     __pyx_v_acc = 0.0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4155
+    /* "mtrand.pyx":4155
  *         while i < totsize:
  *             acc = 0.0
  *             for j from 0 <= j < k:             # <<<<<<<<<<<<<<
@@ -18336,7 +18337,7 @@
     __pyx_t_6 = __pyx_v_k;
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4156
+      /* "mtrand.pyx":4156
  *             acc = 0.0
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])             # <<<<<<<<<<<<<<
@@ -18345,7 +18346,7 @@
  */
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = rk_standard_gamma(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state, (__pyx_v_alpha_data[__pyx_v_j]));
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4157
+      /* "mtrand.pyx":4157
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])
  *                 acc             = acc + val_data[i+j]             # <<<<<<<<<<<<<<
@@ -18355,7 +18356,7 @@
       __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]));
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4158
+    /* "mtrand.pyx":4158
  *                 val_data[i+j]   = rk_standard_gamma(self.internal_state, alpha_data[j])
  *                 acc             = acc + val_data[i+j]
  *             invacc  = 1/acc             # <<<<<<<<<<<<<<
@@ -18368,7 +18369,7 @@
     }
     __pyx_v_invacc = (1 / __pyx_v_acc);
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4159
+    /* "mtrand.pyx":4159
  *                 acc             = acc + val_data[i+j]
  *             invacc  = 1/acc
  *             for j from 0 <= j < k:             # <<<<<<<<<<<<<<
@@ -18378,7 +18379,7 @@
     __pyx_t_6 = __pyx_v_k;
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_6; __pyx_v_j++) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4160
+      /* "mtrand.pyx":4160
  *             invacc  = 1/acc
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = val_data[i+j] * invacc             # <<<<<<<<<<<<<<
@@ -18388,7 +18389,7 @@
       (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc);
     }
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4161
+    /* "mtrand.pyx":4161
  *             for j from 0 <= j < k:
  *                 val_data[i+j]   = val_data[i+j] * invacc
  *             i = i + k             # <<<<<<<<<<<<<<
@@ -18398,7 +18399,7 @@
     __pyx_v_i = (__pyx_v_i + __pyx_v_k);
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4163
+  /* "mtrand.pyx":4163
  *             i = i + k
  * 
  *         return diric             # <<<<<<<<<<<<<<
@@ -18431,7 +18432,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4166
+/* "mtrand.pyx":4166
  * 
  *     # Shuffling and permutations:
  *     def shuffle(self, object x):             # <<<<<<<<<<<<<<
@@ -18456,7 +18457,7 @@
   __Pyx_INCREF((PyObject *)__pyx_v_self);
   __Pyx_INCREF(__pyx_v_x);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4176
+  /* "mtrand.pyx":4176
  *         cdef int copy
  * 
  *         i = len(x) - 1             # <<<<<<<<<<<<<<
@@ -18466,7 +18467,7 @@
   __pyx_t_1 = PyObject_Length(__pyx_v_x); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_i = (__pyx_t_1 - 1);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4177
+  /* "mtrand.pyx":4177
  * 
  *         i = len(x) - 1
  *         try:             # <<<<<<<<<<<<<<
@@ -18481,7 +18482,7 @@
     __Pyx_XGOTREF(__pyx_save_exc_tb);
     /*try:*/ {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4178
+      /* "mtrand.pyx":4178
  *         i = len(x) - 1
  *         try:
  *             j = len(x[0])             # <<<<<<<<<<<<<<
@@ -18501,7 +18502,7 @@
     __pyx_L5_error:;
     __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4179
+    /* "mtrand.pyx":4179
  *         try:
  *             j = len(x[0])
  *         except:             # <<<<<<<<<<<<<<
@@ -18515,7 +18516,7 @@
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_GOTREF(__pyx_t_4);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4180
+      /* "mtrand.pyx":4180
  *             j = len(x[0])
  *         except:
  *             j = 0             # <<<<<<<<<<<<<<
@@ -18542,7 +18543,7 @@
     __pyx_L12_try_end:;
   }
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4182
+  /* "mtrand.pyx":4182
  *             j = 0
  * 
  *         if (j == 0):             # <<<<<<<<<<<<<<
@@ -18552,7 +18553,7 @@
   __pyx_t_5 = (__pyx_v_j == 0);
   if (__pyx_t_5) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4184
+    /* "mtrand.pyx":4184
  *         if (j == 0):
  *             # adaptation of random.shuffle()
  *             while i > 0:             # <<<<<<<<<<<<<<
@@ -18563,7 +18564,7 @@
       __pyx_t_5 = (__pyx_v_i > 0);
       if (!__pyx_t_5) break;
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4185
+      /* "mtrand.pyx":4185
  *             # adaptation of random.shuffle()
  *             while i > 0:
  *                 j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18572,7 +18573,7 @@
  */
       __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4186
+      /* "mtrand.pyx":4186
  *             while i > 0:
  *                 j = rk_interval(i, self.internal_state)
  *                 x[i], x[j] = x[j], x[i]             # <<<<<<<<<<<<<<
@@ -18588,7 +18589,7 @@
       if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_3, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4186; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4187
+      /* "mtrand.pyx":4187
  *                 j = rk_interval(i, self.internal_state)
  *                 x[i], x[j] = x[j], x[i]
  *                 i = i - 1             # <<<<<<<<<<<<<<
@@ -18601,7 +18602,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4190
+    /* "mtrand.pyx":4190
  *         else:
  *             # make copies
  *             copy = hasattr(x[0], 'copy')             # <<<<<<<<<<<<<<
@@ -18614,7 +18615,7 @@
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_copy = __pyx_t_5;
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4191
+    /* "mtrand.pyx":4191
  *             # make copies
  *             copy = hasattr(x[0], 'copy')
  *             if copy:             # <<<<<<<<<<<<<<
@@ -18624,7 +18625,7 @@
     __pyx_t_6 = __pyx_v_copy;
     if (__pyx_t_6) {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4192
+      /* "mtrand.pyx":4192
  *             copy = hasattr(x[0], 'copy')
  *             if copy:
  *                 while(i > 0):             # <<<<<<<<<<<<<<
@@ -18635,7 +18636,7 @@
         __pyx_t_5 = (__pyx_v_i > 0);
         if (!__pyx_t_5) break;
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4193
+        /* "mtrand.pyx":4193
  *             if copy:
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18644,7 +18645,7 @@
  */
         __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4194
+        /* "mtrand.pyx":4194
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j].copy(), x[i].copy()             # <<<<<<<<<<<<<<
@@ -18672,7 +18673,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_4, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4195
+        /* "mtrand.pyx":4195
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j].copy(), x[i].copy()
  *                     i = i - 1             # <<<<<<<<<<<<<<
@@ -18685,7 +18686,7 @@
     }
     /*else*/ {
 
-      /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4197
+      /* "mtrand.pyx":4197
  *                     i = i - 1
  *             else:
  *                 while(i > 0):             # <<<<<<<<<<<<<<
@@ -18696,7 +18697,7 @@
         __pyx_t_5 = (__pyx_v_i > 0);
         if (!__pyx_t_5) break;
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4198
+        /* "mtrand.pyx":4198
  *             else:
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)             # <<<<<<<<<<<<<<
@@ -18705,7 +18706,7 @@
  */
         __pyx_v_j = rk_interval(__pyx_v_i, ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state);
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4199
+        /* "mtrand.pyx":4199
  *                 while(i > 0):
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j][:], x[i][:]             # <<<<<<<<<<<<<<
@@ -18727,7 +18728,7 @@
         if (__Pyx_SetItemInt(__pyx_v_x, __pyx_v_j, __pyx_t_2, sizeof(long), PyInt_FromLong) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-        /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4200
+        /* "mtrand.pyx":4200
  *                     j = rk_interval(i, self.internal_state)
  *                     x[i], x[j] = x[j][:], x[i][:]
  *                     i = i - 1             # <<<<<<<<<<<<<<
@@ -18757,7 +18758,7 @@
   return __pyx_r;
 }
 
-/* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4202
+/* "mtrand.pyx":4202
  *                     i = i - 1
  * 
  *     def permutation(self, object x):             # <<<<<<<<<<<<<<
@@ -18779,10 +18780,10 @@
   __Pyx_INCREF(__pyx_v_x);
   __pyx_v_arr = Py_None; __Pyx_INCREF(Py_None);
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4229
+  /* "mtrand.pyx":4229
  * 
  *         """
- *         if isinstance(x, (int, np.integer)):             # <<<<<<<<<<<<<<
+ *         if isinstance(x, (int, long, np.integer)):             # <<<<<<<<<<<<<<
  *             arr = np.arange(x)
  *         else:
  */
@@ -18791,21 +18792,24 @@
   __pyx_t_2 = PyObject_GetAttr(__pyx_t_1, __pyx_n_s__integer); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyTuple_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(((PyObject *)((PyObject*)&PyInt_Type)));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)((PyObject*)&PyInt_Type)));
   __Pyx_GIVEREF(((PyObject *)((PyObject*)&PyInt_Type)));
-  PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_2);
+  __Pyx_INCREF(((PyObject *)((PyObject*)&PyLong_Type)));
+  PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)((PyObject*)&PyLong_Type)));
+  __Pyx_GIVEREF(((PyObject *)((PyObject*)&PyLong_Type)));
+  PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
   __pyx_t_3 = PyObject_IsInstance(__pyx_v_x, __pyx_t_1); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_3) {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4230
+    /* "mtrand.pyx":4230
  *         """
- *         if isinstance(x, (int, np.integer)):
+ *         if isinstance(x, (int, long, np.integer)):
  *             arr = np.arange(x)             # <<<<<<<<<<<<<<
  *         else:
  *             arr = np.array(x)
@@ -18831,7 +18835,7 @@
   }
   /*else*/ {
 
-    /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4232
+    /* "mtrand.pyx":4232
  *             arr = np.arange(x)
  *         else:
  *             arr = np.array(x)             # <<<<<<<<<<<<<<
@@ -18858,7 +18862,7 @@
   }
   __pyx_L5:;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4233
+  /* "mtrand.pyx":4233
  *         else:
  *             arr = np.array(x)
  *         self.shuffle(arr)             # <<<<<<<<<<<<<<
@@ -18878,7 +18882,7 @@
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4234
+  /* "mtrand.pyx":4234
  *             arr = np.array(x)
  *         self.shuffle(arr)
  *         return arr             # <<<<<<<<<<<<<<
@@ -19437,10 +19441,10 @@
   /*--- Global init code ---*/
   /*--- Function export code ---*/
   /*--- Type init code ---*/
-  __pyx_ptype_6mtrand_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (unlikely(!__pyx_ptype_6mtrand_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject)); if (unlikely(!__pyx_ptype_6mtrand_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_6mtrand_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject)); if (unlikely(!__pyx_ptype_6mtrand_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr), 0); if (unlikely(!__pyx_ptype_6mtrand_dtype)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject), 0); if (unlikely(!__pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject), 0); if (unlikely(!__pyx_ptype_6mtrand_flatiter)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_6mtrand_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject), 0); if (unlikely(!__pyx_ptype_6mtrand_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (PyType_Ready(&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 522; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState;
@@ -19448,7 +19452,7 @@
   /*--- Function import code ---*/
   /*--- Execution code ---*/
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":124
+  /* "mtrand.pyx":124
  * 
  * # Initialize numpy
  * import_array()             # <<<<<<<<<<<<<<
@@ -19457,7 +19461,7 @@
  */
   import_array();
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":126
+  /* "mtrand.pyx":126
  * import_array()
  * 
  * import numpy as np             # <<<<<<<<<<<<<<
@@ -19469,7 +19473,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__np, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":893
+  /* "mtrand.pyx":893
  *         return bytestring
  * 
  *     def uniform(self, low=0.0, high=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19487,7 +19491,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1190
+  /* "mtrand.pyx":1190
  *         return cont0_array(self.internal_state, rk_gauss, size)
  * 
  *     def normal(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19505,7 +19509,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1349
+  /* "mtrand.pyx":1349
  *         return cont2_array(self.internal_state, rk_beta, size, oa, ob)
  * 
  *     def exponential(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19518,7 +19522,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1513
+  /* "mtrand.pyx":1513
  *         return cont1_array(self.internal_state, rk_standard_gamma, size, oshape)
  * 
  *     def gamma(self, shape, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19531,7 +19535,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2529
+  /* "mtrand.pyx":2529
  *         return cont1_array(self.internal_state, rk_power, size, oa)
  * 
  *     def laplace(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19549,7 +19553,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2619
+  /* "mtrand.pyx":2619
  *         return cont2_array(self.internal_state, rk_laplace, size, oloc, oscale)
  * 
  *     def gumbel(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19567,7 +19571,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2743
+  /* "mtrand.pyx":2743
  *         return cont2_array(self.internal_state, rk_gumbel, size, oloc, oscale)
  * 
  *     def logistic(self, loc=0.0, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19585,7 +19589,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2831
+  /* "mtrand.pyx":2831
  *         return cont2_array(self.internal_state, rk_logistic, size, oloc, oscale)
  * 
  *     def lognormal(self, mean=0.0, sigma=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19603,7 +19607,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":2962
+  /* "mtrand.pyx":2962
  *         return cont2_array(self.internal_state, rk_lognormal, size, omean, osigma)
  * 
  *     def rayleigh(self, scale=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19616,7 +19620,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":3411
+  /* "mtrand.pyx":3411
  *                             on, op)
  * 
  *     def poisson(self, lam=1.0, size=None):             # <<<<<<<<<<<<<<
@@ -19629,7 +19633,7 @@
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4236
+  /* "mtrand.pyx":4236
  *         return arr
  * 
  * _rand = RandomState()             # <<<<<<<<<<<<<<
@@ -19641,7 +19645,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s___rand, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4236; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4237
+  /* "mtrand.pyx":4237
  * 
  * _rand = RandomState()
  * seed = _rand.seed             # <<<<<<<<<<<<<<
@@ -19656,7 +19660,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__seed, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4238
+  /* "mtrand.pyx":4238
  * _rand = RandomState()
  * seed = _rand.seed
  * get_state = _rand.get_state             # <<<<<<<<<<<<<<
@@ -19671,7 +19675,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__get_state, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4239
+  /* "mtrand.pyx":4239
  * seed = _rand.seed
  * get_state = _rand.get_state
  * set_state = _rand.set_state             # <<<<<<<<<<<<<<
@@ -19686,7 +19690,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__set_state, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4240
+  /* "mtrand.pyx":4240
  * get_state = _rand.get_state
  * set_state = _rand.set_state
  * random_sample = _rand.random_sample             # <<<<<<<<<<<<<<
@@ -19701,7 +19705,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__random_sample, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4241
+  /* "mtrand.pyx":4241
  * set_state = _rand.set_state
  * random_sample = _rand.random_sample
  * randint = _rand.randint             # <<<<<<<<<<<<<<
@@ -19716,7 +19720,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__randint, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4242
+  /* "mtrand.pyx":4242
  * random_sample = _rand.random_sample
  * randint = _rand.randint
  * bytes = _rand.bytes             # <<<<<<<<<<<<<<
@@ -19731,7 +19735,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__bytes, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4243
+  /* "mtrand.pyx":4243
  * randint = _rand.randint
  * bytes = _rand.bytes
  * uniform = _rand.uniform             # <<<<<<<<<<<<<<
@@ -19746,7 +19750,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__uniform, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4243; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4244
+  /* "mtrand.pyx":4244
  * bytes = _rand.bytes
  * uniform = _rand.uniform
  * rand = _rand.rand             # <<<<<<<<<<<<<<
@@ -19761,7 +19765,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__rand, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4245
+  /* "mtrand.pyx":4245
  * uniform = _rand.uniform
  * rand = _rand.rand
  * randn = _rand.randn             # <<<<<<<<<<<<<<
@@ -19776,7 +19780,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__randn, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4246
+  /* "mtrand.pyx":4246
  * rand = _rand.rand
  * randn = _rand.randn
  * random_integers = _rand.random_integers             # <<<<<<<<<<<<<<
@@ -19791,7 +19795,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__random_integers, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4247
+  /* "mtrand.pyx":4247
  * randn = _rand.randn
  * random_integers = _rand.random_integers
  * standard_normal = _rand.standard_normal             # <<<<<<<<<<<<<<
@@ -19806,7 +19810,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_normal, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4247; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4248
+  /* "mtrand.pyx":4248
  * random_integers = _rand.random_integers
  * standard_normal = _rand.standard_normal
  * normal = _rand.normal             # <<<<<<<<<<<<<<
@@ -19821,7 +19825,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__normal, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4249
+  /* "mtrand.pyx":4249
  * standard_normal = _rand.standard_normal
  * normal = _rand.normal
  * beta = _rand.beta             # <<<<<<<<<<<<<<
@@ -19836,7 +19840,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__beta, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4250
+  /* "mtrand.pyx":4250
  * normal = _rand.normal
  * beta = _rand.beta
  * exponential = _rand.exponential             # <<<<<<<<<<<<<<
@@ -19851,7 +19855,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__exponential, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4250; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4251
+  /* "mtrand.pyx":4251
  * beta = _rand.beta
  * exponential = _rand.exponential
  * standard_exponential = _rand.standard_exponential             # <<<<<<<<<<<<<<
@@ -19866,7 +19870,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s_59, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4251; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4252
+  /* "mtrand.pyx":4252
  * exponential = _rand.exponential
  * standard_exponential = _rand.standard_exponential
  * standard_gamma = _rand.standard_gamma             # <<<<<<<<<<<<<<
@@ -19881,7 +19885,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_gamma, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4253
+  /* "mtrand.pyx":4253
  * standard_exponential = _rand.standard_exponential
  * standard_gamma = _rand.standard_gamma
  * gamma = _rand.gamma             # <<<<<<<<<<<<<<
@@ -19896,7 +19900,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__gamma, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4254
+  /* "mtrand.pyx":4254
  * standard_gamma = _rand.standard_gamma
  * gamma = _rand.gamma
  * f = _rand.f             # <<<<<<<<<<<<<<
@@ -19911,7 +19915,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__f, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4255
+  /* "mtrand.pyx":4255
  * gamma = _rand.gamma
  * f = _rand.f
  * noncentral_f = _rand.noncentral_f             # <<<<<<<<<<<<<<
@@ -19926,7 +19930,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__noncentral_f, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4256
+  /* "mtrand.pyx":4256
  * f = _rand.f
  * noncentral_f = _rand.noncentral_f
  * chisquare = _rand.chisquare             # <<<<<<<<<<<<<<
@@ -19941,7 +19945,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__chisquare, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4257
+  /* "mtrand.pyx":4257
  * noncentral_f = _rand.noncentral_f
  * chisquare = _rand.chisquare
  * noncentral_chisquare = _rand.noncentral_chisquare             # <<<<<<<<<<<<<<
@@ -19956,7 +19960,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s_60, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4258
+  /* "mtrand.pyx":4258
  * chisquare = _rand.chisquare
  * noncentral_chisquare = _rand.noncentral_chisquare
  * standard_cauchy = _rand.standard_cauchy             # <<<<<<<<<<<<<<
@@ -19971,7 +19975,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_cauchy, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4258; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4259
+  /* "mtrand.pyx":4259
  * noncentral_chisquare = _rand.noncentral_chisquare
  * standard_cauchy = _rand.standard_cauchy
  * standard_t = _rand.standard_t             # <<<<<<<<<<<<<<
@@ -19986,7 +19990,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__standard_t, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4259; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4260
+  /* "mtrand.pyx":4260
  * standard_cauchy = _rand.standard_cauchy
  * standard_t = _rand.standard_t
  * vonmises = _rand.vonmises             # <<<<<<<<<<<<<<
@@ -20001,7 +20005,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__vonmises, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4261
+  /* "mtrand.pyx":4261
  * standard_t = _rand.standard_t
  * vonmises = _rand.vonmises
  * pareto = _rand.pareto             # <<<<<<<<<<<<<<
@@ -20016,7 +20020,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__pareto, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4262
+  /* "mtrand.pyx":4262
  * vonmises = _rand.vonmises
  * pareto = _rand.pareto
  * weibull = _rand.weibull             # <<<<<<<<<<<<<<
@@ -20031,7 +20035,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__weibull, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4263
+  /* "mtrand.pyx":4263
  * pareto = _rand.pareto
  * weibull = _rand.weibull
  * power = _rand.power             # <<<<<<<<<<<<<<
@@ -20046,7 +20050,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__power, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4264
+  /* "mtrand.pyx":4264
  * weibull = _rand.weibull
  * power = _rand.power
  * laplace = _rand.laplace             # <<<<<<<<<<<<<<
@@ -20061,7 +20065,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__laplace, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4264; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4265
+  /* "mtrand.pyx":4265
  * power = _rand.power
  * laplace = _rand.laplace
  * gumbel = _rand.gumbel             # <<<<<<<<<<<<<<
@@ -20076,7 +20080,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__gumbel, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4266
+  /* "mtrand.pyx":4266
  * laplace = _rand.laplace
  * gumbel = _rand.gumbel
  * logistic = _rand.logistic             # <<<<<<<<<<<<<<
@@ -20091,7 +20095,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__logistic, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4267
+  /* "mtrand.pyx":4267
  * gumbel = _rand.gumbel
  * logistic = _rand.logistic
  * lognormal = _rand.lognormal             # <<<<<<<<<<<<<<
@@ -20106,7 +20110,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__lognormal, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4267; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4268
+  /* "mtrand.pyx":4268
  * logistic = _rand.logistic
  * lognormal = _rand.lognormal
  * rayleigh = _rand.rayleigh             # <<<<<<<<<<<<<<
@@ -20121,7 +20125,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__rayleigh, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4268; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4269
+  /* "mtrand.pyx":4269
  * lognormal = _rand.lognormal
  * rayleigh = _rand.rayleigh
  * wald = _rand.wald             # <<<<<<<<<<<<<<
@@ -20136,7 +20140,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__wald, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4270
+  /* "mtrand.pyx":4270
  * rayleigh = _rand.rayleigh
  * wald = _rand.wald
  * triangular = _rand.triangular             # <<<<<<<<<<<<<<
@@ -20151,7 +20155,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__triangular, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4272
+  /* "mtrand.pyx":4272
  * triangular = _rand.triangular
  * 
  * binomial = _rand.binomial             # <<<<<<<<<<<<<<
@@ -20166,7 +20170,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__binomial, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4273
+  /* "mtrand.pyx":4273
  * 
  * binomial = _rand.binomial
  * negative_binomial = _rand.negative_binomial             # <<<<<<<<<<<<<<
@@ -20181,7 +20185,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__negative_binomial, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4274
+  /* "mtrand.pyx":4274
  * binomial = _rand.binomial
  * negative_binomial = _rand.negative_binomial
  * poisson = _rand.poisson             # <<<<<<<<<<<<<<
@@ -20196,7 +20200,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__poisson, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4275
+  /* "mtrand.pyx":4275
  * negative_binomial = _rand.negative_binomial
  * poisson = _rand.poisson
  * zipf = _rand.zipf             # <<<<<<<<<<<<<<
@@ -20211,7 +20215,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__zipf, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4275; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4276
+  /* "mtrand.pyx":4276
  * poisson = _rand.poisson
  * zipf = _rand.zipf
  * geometric = _rand.geometric             # <<<<<<<<<<<<<<
@@ -20226,7 +20230,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__geometric, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4276; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4277
+  /* "mtrand.pyx":4277
  * zipf = _rand.zipf
  * geometric = _rand.geometric
  * hypergeometric = _rand.hypergeometric             # <<<<<<<<<<<<<<
@@ -20241,7 +20245,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__hypergeometric, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4277; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4278
+  /* "mtrand.pyx":4278
  * geometric = _rand.geometric
  * hypergeometric = _rand.hypergeometric
  * logseries = _rand.logseries             # <<<<<<<<<<<<<<
@@ -20256,7 +20260,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__logseries, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4280
+  /* "mtrand.pyx":4280
  * logseries = _rand.logseries
  * 
  * multivariate_normal = _rand.multivariate_normal             # <<<<<<<<<<<<<<
@@ -20271,7 +20275,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__multivariate_normal, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4281
+  /* "mtrand.pyx":4281
  * 
  * multivariate_normal = _rand.multivariate_normal
  * multinomial = _rand.multinomial             # <<<<<<<<<<<<<<
@@ -20286,7 +20290,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__multinomial, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4282
+  /* "mtrand.pyx":4282
  * multivariate_normal = _rand.multivariate_normal
  * multinomial = _rand.multinomial
  * dirichlet = _rand.dirichlet             # <<<<<<<<<<<<<<
@@ -20301,7 +20305,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__dirichlet, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4284
+  /* "mtrand.pyx":4284
  * dirichlet = _rand.dirichlet
  * 
  * shuffle = _rand.shuffle             # <<<<<<<<<<<<<<
@@ -20315,7 +20319,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__shuffle, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":4285
+  /* "mtrand.pyx":4285
  * 
  * shuffle = _rand.shuffle
  * permutation = _rand.permutation             # <<<<<<<<<<<<<<
@@ -20328,7 +20332,7 @@
   if (PyObject_SetAttr(__pyx_m, __pyx_n_s__permutation, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 4285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/charris/Workspace/numpy.git/numpy/random/mtrand/mtrand.pyx":1
+  /* "mtrand.pyx":1
  * # mtrand.pyx -- A Pyrex wrapper of Jean-Sebastien Roy's RandomKit             # <<<<<<<<<<<<<<
  * #
  * # Copyright 2005 Robert Kern (robert.kern at gmail.com)
@@ -20961,7 +20965,7 @@
 }
 
 
-static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
+static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
     PyErr_Format(PyExc_ValueError,
         #if PY_VERSION_HEX < 0x02050000
                  "need more than %d value%s to unpack", (int)index,
@@ -20971,7 +20975,7 @@
                  (index == 1) ? "" : "s");
 }
 
-static INLINE void __Pyx_RaiseTooManyValuesError(void) {
+static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(void) {
     PyErr_SetString(PyExc_ValueError, "too many values to unpack");
 }
 
@@ -21044,7 +21048,7 @@
 }
 
 
-static INLINE int __Pyx_CheckKeywordStrings(
+static CYTHON_INLINE int __Pyx_CheckKeywordStrings(
     PyObject *kwdict,
     const char* function_name,
     int kw_allowed)
@@ -21078,7 +21082,7 @@
     return 0;
 }
 
-static INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
+static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
     if (unlikely(!type)) {
         PyErr_Format(PyExc_SystemError, "Missing type object");
         return 0;
@@ -21091,7 +21095,7 @@
 }
 
 
-static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->exc_type;
     *value = tstate->exc_value;
@@ -21156,7 +21160,7 @@
     return result;
 }
 
-static INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
     PyObject *tmp_type, *tmp_value, *tmp_tb;
     PyThreadState *tstate = PyThreadState_GET();
 
@@ -21171,7 +21175,7 @@
     Py_XDECREF(tmp_tb);
 }
 
-static INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
     PyThreadState *tstate = PyThreadState_GET();
     *type = tstate->curexc_type;
     *value = tstate->curexc_value;
@@ -21293,7 +21297,7 @@
 }
 #endif
 
-static INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
+static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
     const unsigned char neg_one = (unsigned char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned char) < sizeof(long)) {
@@ -21312,7 +21316,7 @@
     return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
+static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
     const unsigned short neg_one = (unsigned short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned short) < sizeof(long)) {
@@ -21331,7 +21335,7 @@
     return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
+static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
     const unsigned int neg_one = (unsigned int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(unsigned int) < sizeof(long)) {
@@ -21350,7 +21354,7 @@
     return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
 }
 
-static INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
+static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
     const char neg_one = (char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(char) < sizeof(long)) {
@@ -21369,7 +21373,7 @@
     return (char)__Pyx_PyInt_AsLong(x);
 }
 
-static INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
+static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
     const short neg_one = (short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(short) < sizeof(long)) {
@@ -21388,7 +21392,7 @@
     return (short)__Pyx_PyInt_AsLong(x);
 }
 
-static INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
+static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
     const int neg_one = (int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(int) < sizeof(long)) {
@@ -21407,7 +21411,7 @@
     return (int)__Pyx_PyInt_AsLong(x);
 }
 
-static INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
+static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
     const signed char neg_one = (signed char)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed char) < sizeof(long)) {
@@ -21426,7 +21430,7 @@
     return (signed char)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
+static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
     const signed short neg_one = (signed short)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed short) < sizeof(long)) {
@@ -21445,7 +21449,7 @@
     return (signed short)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
+static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
     const signed int neg_one = (signed int)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
     if (sizeof(signed int) < sizeof(long)) {
@@ -21464,7 +21468,7 @@
     return (signed int)__Pyx_PyInt_AsSignedLong(x);
 }
 
-static INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
+static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
     const unsigned long neg_one = (unsigned long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21499,7 +21503,7 @@
     }
 }
 
-static INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
+static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
     const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21534,7 +21538,7 @@
     }
 }
 
-static INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
+static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
     const long neg_one = (long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21569,7 +21573,7 @@
     }
 }
 
-static INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
+static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
     const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21604,7 +21608,7 @@
     }
 }
 
-static INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
+static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
     const signed long neg_one = (signed long)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21639,7 +21643,7 @@
     }
 }
 
-static INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
+static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
     const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_VERSION_HEX < 0x03000000
@@ -21677,11 +21681,12 @@
 #ifndef __PYX_HAVE_RT_ImportType
 #define __PYX_HAVE_RT_ImportType
 static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class_name,
-    long size)
+    long size, int strict)
 {
     PyObject *py_module = 0;
     PyObject *result = 0;
     PyObject *py_name = 0;
+    char warning[200];
 
     py_module = __Pyx_ImportModule(module_name);
     if (!py_module)
@@ -21706,9 +21711,15 @@
             module_name, class_name);
         goto bad;
     }
-    if (((PyTypeObject *)result)->tp_basicsize != size) {
+    if (!strict && ((PyTypeObject *)result)->tp_basicsize > size) {
+        PyOS_snprintf(warning, sizeof(warning), 
+            "%s.%s size changed, may indicate binary incompatibility",
+            module_name, class_name);
+        PyErr_WarnEx(NULL, warning, 0);
+    }
+    else if (((PyTypeObject *)result)->tp_basicsize != size) {
         PyErr_Format(PyExc_ValueError, 
-            "%s.%s does not appear to be the correct type object",
+            "%s.%s has the wrong size, try recompiling",
             module_name, class_name);
         goto bad;
     }
@@ -21844,13 +21855,13 @@
 
 /* Type Conversion Functions */
 
-static INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
+static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject* x) {
    if (x == Py_True) return 1;
    else if ((x == Py_False) | (x == Py_None)) return 0;
    else return PyObject_IsTrue(x);
 }
 
-static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
+static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
   PyNumberMethods *m;
   const char *name = NULL;
   PyObject *res = NULL;
@@ -21896,7 +21907,7 @@
   return res;
 }
 
-static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
+static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
   Py_ssize_t ival;
   PyObject* x = PyNumber_Index(b);
   if (!x) return -1;
@@ -21905,7 +21916,7 @@
   return ival;
 }
 
-static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
+static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
 #if PY_VERSION_HEX < 0x02050000
    if (ival <= LONG_MAX)
        return PyInt_FromLong((long)ival);
@@ -21919,7 +21930,7 @@
 #endif
 }
 
-static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
+static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
    unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
    if (unlikely(val == (unsigned PY_LONG_LONG)-1 && PyErr_Occurred())) {
        return (size_t)-1;




More information about the Numpy-svn mailing list