diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 19:00:27 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-01-04 19:00:27 +0000 |
| commit | e706c7d92c4ee41e8e995fb3838bd0931b57efb5 (patch) | |
| tree | 015a057d49422774e49ed211a37c14105d03a713 | |
| parent | c14d4fe25cb5cd482369734dd487ac8f376851c9 (diff) | |
| download | python-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.gz python-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.tar.bz2 python-numpy-e706c7d92c4ee41e8e995fb3838bd0931b57efb5.zip | |
Changed all references to scipy to numpy
130 files changed, 1009 insertions, 1009 deletions
diff --git a/COMPATIBILITY b/COMPATIBILITY index efafa49aa..b9cc937d2 100644 --- a/COMPATIBILITY +++ b/COMPATIBILITY @@ -31,7 +31,7 @@ using PyMemData_FREE(ptr) or PyMemData_XFREE(ptr); a->descr->zero --> PyArray_Zero(a) a->descr->one --> PyArray_One(a) -Numeric/arrayobject.h --> scipy/arrayobject.h +Numeric/arrayobject.h --> numpy/arrayobject.h # These will actually work and are defines for PyArray_BYTE, diff --git a/README.txt b/README.txt index 91b39404d..2702300cd 100644 --- a/README.txt +++ b/README.txt @@ -10,5 +10,5 @@ If fast BLAS and LAPACK cannot be found, then a slower default version is used. The current version is always available from a Subversion repostiory: -http://svn.scipy.org/svn/scipy_core/trunk +http://svn.numpy.org/svn/numpy_core/trunk diff --git a/THANKS.txt b/THANKS.txt index 0577d90ba..83e744b85 100644 --- a/THANKS.txt +++ b/THANKS.txt @@ -10,7 +10,7 @@ Eric Jones for weave and other sundry subroutines Fernando Perez for code snippets, ideas, bufixes, and testing. John Hunter for code snippets (from matplotlib) Chris Hanley for help with records.py, testing, and bug fixes. -Travis Vaught and Joe Cooper for administration of scipy.org web site and SVN +Travis Vaught and Joe Cooper for administration of numpy.org web site and SVN Eric Firing for bugfixes. Arnd Baecker for 64-bit testing David Cooke for many code improvements including the auto-generated C-API diff --git a/benchmarks/sorting.py b/benchmarks/sorting.py index c7869616f..e822d5547 100644 --- a/benchmarks/sorting.py +++ b/benchmarks/sorting.py @@ -2,7 +2,7 @@ import timeit N = 10000 t1 = timeit.Timer('a=array(None,shape=%d);a.sort()'%N,'from numarray import array') -t2 = timeit.Timer('a=empty(shape=%d);a.sort()'%N,'from scipy import empty') +t2 = timeit.Timer('a=empty(shape=%d);a.sort()'%N,'from numpy import empty') t3 = timeit.Timer('a=empty(shape=%d);sort(a)'%N,'from Numeric import empty,sort') print "1-D length = ", N @@ -12,7 +12,7 @@ print "Numeric: ", t3.repeat(3,100) N1,N2 = 100,100 t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort()'%(N1,N2),'from numarray import array') -t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort()'%(N1,N2),'from scipy import empty') +t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort()'%(N1,N2),'from numpy import empty') t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a)'%(N1,N2),'from Numeric import empty,sort') print "2-D shape = (%d,%d), last-axis" % (N1,N2) @@ -22,7 +22,7 @@ print "Numeric: ", t3.repeat(3,100) N1,N2 = 100,100 t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort(0)'%(N1,N2),'from numarray import array') -t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort(0)'%(N1,N2),'from scipy import empty') +t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort(0)'%(N1,N2),'from numpy import empty') t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a,0)'%(N1,N2),'from Numeric import empty,sort') print "2-D shape = (%d,%d), first-axis" % (N1,N2) diff --git a/numpy/__init__.py b/numpy/__init__.py index 2fced64fc..c678218b0 100644 --- a/numpy/__init__.py +++ b/numpy/__init__.py @@ -135,33 +135,33 @@ class PackageLoader: return package_names def __call__(self,*packages, **options): - """Load one or more packages into scipy's top-level namespace. + """Load one or more packages into numpy's top-level namespace. Usage: - This function is intended to shorten the need to import many of scipy's + This function is intended to shorten the need to import many of numpy's submodules constantly with statements such as - import scipy.linalg, scipy.fft, scipy.etc... + import numpy.linalg, numpy.fft, numpy.etc... Instead, you can say: - import scipy - scipy.pkgload('linalg','fft',...) + import numpy + numpy.pkgload('linalg','fft',...) or - scipy.pkgload() + numpy.pkgload() to load all of them in one call. - If a name which doesn't exist in scipy's namespace is + If a name which doesn't exist in numpy's namespace is given, an exception [[WHAT? ImportError, probably?]] is raised. [NotImplemented] Inputs: - - the names (one or more strings) of all the scipy modules one wishes to + - the names (one or more strings) of all the numpy modules one wishes to load into the top-level namespace. Optional keyword inputs: @@ -170,7 +170,7 @@ class PackageLoader: - force - when True, force reloading loaded packages [default: False]. - postpone - when True, don't load packages [default: False] - If no input arguments are given, then all of scipy's subpackages are + If no input arguments are given, then all of numpy's subpackages are imported. @@ -297,7 +297,7 @@ except ImportError: pkgload = PackageLoader() if show_core_config is None: - print >> sys.stderr, 'Running from scipy core source directory.' + print >> sys.stderr, 'Running from numpy core source directory.' else: from core_version import version as __core_version__ @@ -305,10 +305,10 @@ else: verbose=SCIPY_IMPORT_VERBOSE) - test = ScipyTest('scipy').test + test = ScipyTest('numpy').test __all__.append('test') -__scipy_doc__ = """ +__numpy_doc__ = """ SciPy: A scientific computing package for Python ================================================ @@ -318,18 +318,18 @@ Available subpackages """ if NO_SCIPY_IMPORT is not None: - print >> sys.stderr, 'Skip importing scipy packages (NO_SCIPY_IMPORT=%s)' % (NO_SCIPY_IMPORT) - show_scipy_config = None + print >> sys.stderr, 'Skip importing numpy packages (NO_SCIPY_IMPORT=%s)' % (NO_SCIPY_IMPORT) + show_numpy_config = None elif show_core_config is None: - show_scipy_config = None + show_numpy_config = None else: try: - from __scipy_config__ import show as show_scipy_config + from __numpy_config__ import show as show_numpy_config except ImportError: - show_scipy_config = None + show_numpy_config = None -if show_scipy_config is not None: - from scipy_version import scipy_version as __scipy_version__ - __doc__ += __scipy_doc__ +if show_numpy_config is not None: + from numpy_version import numpy_version as __numpy_version__ + __doc__ += __numpy_doc__ pkgload(verbose=SCIPY_IMPORT_VERBOSE,postpone=True) diff --git a/numpy/_import_tools.py b/numpy/_import_tools.py index 77cd87f79..f2feab88a 100644 --- a/numpy/_import_tools.py +++ b/numpy/_import_tools.py @@ -6,7 +6,7 @@ from glob import glob class PackageImport: """ Import packages from the current directory that implement - info.py. See scipy/doc/DISTUTILS.txt for more info. + info.py. See numpy/doc/DISTUTILS.txt for more info. """ imported_packages = [] diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py index 0c0c158df..18256f03e 100644 --- a/numpy/core/__init__.py +++ b/numpy/core/__init__.py @@ -1,6 +1,6 @@ from info import __doc__ -from scipy.core_version import version as __version__ +from numpy.core_version import version as __version__ import multiarray import umath @@ -33,5 +33,5 @@ from utils import * __all__ = filter(lambda s:not s.startswith('_'),dir()) -from scipy.testing import ScipyTest +from numpy.testing import ScipyTest test = ScipyTest().test diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py index 6a5e4b23b..76784473e 100644 --- a/numpy/core/arrayprint.py +++ b/numpy/core/arrayprint.py @@ -10,7 +10,7 @@ __all__ = ["set_summary", "summary_off", "set_precision", "set_line_width", # last revision: 1996-3-13 # modified by Jim Hugunin 1997-3-3 for repr's and str's (and other details) # and by Perry Greenfield 2000-4-1 for numarray -# and by Travis Oliphant 2005-8-22 for scipy.base +# and by Travis Oliphant 2005-8-22 for numpy.base import sys import numeric as _gen diff --git a/numpy/core/blasdot/_dotblas.c b/numpy/core/blasdot/_dotblas.c index 648ea397f..51d9fa1a2 100644 --- a/numpy/core/blasdot/_dotblas.c +++ b/numpy/core/blasdot/_dotblas.c @@ -1,8 +1,8 @@ static char module_doc[] = -"This module provides a BLAS optimized\nmatrix multiply, inner product and dot for scipy arrays"; +"This module provides a BLAS optimized\nmatrix multiply, inner product and dot for numpy arrays"; #include "Python.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #ifndef CBLAS_HEADER #define CBLAS_HEADER "cblas.h" #endif @@ -128,7 +128,7 @@ dotblas_restoredot(PyObject *dummy, PyObject *args) } -static char doc_matrixproduct[] = "matrixproduct(a,b)\nReturns the dot product of a and b for arrays of floating point types.\nLike the generic scipy equivalent the product sum is over\nthe last dimension of a and the second-to-last dimension of b.\nNB: The first argument is not conjugated."; +static char doc_matrixproduct[] = "matrixproduct(a,b)\nReturns the dot product of a and b for arrays of floating point types.\nLike the generic numpy equivalent the product sum is over\nthe last dimension of a and the second-to-last dimension of b.\nNB: The first argument is not conjugated."; static PyObject * dotblas_matrixproduct(PyObject *dummy, PyObject *args) diff --git a/numpy/core/code_generators/array_api_order.txt b/numpy/core/code_generators/array_api_order.txt index 154373592..74ab84f6a 100644 --- a/numpy/core/code_generators/array_api_order.txt +++ b/numpy/core/code_generators/array_api_order.txt @@ -1,4 +1,4 @@ -# The functions in the scipy_core C API +# The functions in the numpy_core C API # They are defined here so that the order is set. PyArray_SetNumericOps PyArray_GetNumericOps diff --git a/numpy/core/code_generators/generate_array_api.py b/numpy/core/code_generators/generate_array_api.py index e4ec8b2e1..6d2bce00d 100644 --- a/numpy/core/code_generators/generate_array_api.py +++ b/numpy/core/code_generators/generate_array_api.py @@ -51,7 +51,7 @@ static void **PyArray_API=NULL; static int import_array(void) { - PyObject *numpy = PyImport_ImportModule("scipy.base.multiarray"); + PyObject *numpy = PyImport_ImportModule("numpy.base.multiarray"); PyObject *c_api = NULL; if (numpy == NULL) return -1; c_api = PyObject_GetAttrString(numpy, "_ARRAY_API"); diff --git a/numpy/core/code_generators/generate_ufunc_api.py b/numpy/core/code_generators/generate_ufunc_api.py index 59c808e36..6c9307058 100644 --- a/numpy/core/code_generators/generate_ufunc_api.py +++ b/numpy/core/code_generators/generate_ufunc_api.py @@ -31,7 +31,7 @@ static void **PyUFunc_API=NULL; static int import_ufunc(void) { - PyObject *numpy = PyImport_ImportModule("scipy.base.umath"); + PyObject *numpy = PyImport_ImportModule("numpy.base.umath"); PyObject *c_api = NULL; if (numpy == NULL) return -1; diff --git a/numpy/core/ma.py b/numpy/core/ma.py index 245351349..439c311ab 100644 --- a/numpy/core/ma.py +++ b/numpy/core/ma.py @@ -1,10 +1,10 @@ """MA: a facility for dealing with missing observations -MA is generally used as a scipy.array look-alike. +MA is generally used as a numpy.array look-alike. by Paul F. Dubois. Copyright 1999, 2000, 2001 Regents of the University of California. Released for unlimited redistribution. -Adapted for scipy_core 2005 by Travis Oliphant and +Adapted for numpy_core 2005 by Travis Oliphant and (mainly) Paul Dubois. """ import string, types, sys @@ -2015,7 +2015,7 @@ def argsort (x, axis = -1, fill_value=None): """Treating masked values as if they have the value fill_value, return sort indices for sorting along given axis. if fill_value is None, use get_fill_value(x) - Returns a scipy array. + Returns a numpy array. """ d = filled(x, fill_value) return oldnumeric.argsort(d, axis) @@ -2024,7 +2024,7 @@ def argmin (x, axis = -1, fill_value=None): """Treating masked values as if they have the value fill_value, return indices for minimum values along given axis. if fill_value is None, use get_fill_value(x). - Returns a scipy array if x has more than one dimension. + Returns a numpy array if x has more than one dimension. Otherwise, returns a scalar index. """ d = filled(x, fill_value) @@ -2034,7 +2034,7 @@ def argmax (x, axis = -1, fill_value=None): """Treating masked values as if they have the value fill_value, return sort indices for maximum along given axis. if fill_value is None, use -get_fill_value(x) if it exists. - Returns a scipy array if x has more than one dimension. + Returns a numpy array if x has more than one dimension. Otherwise, returns a scalar index. """ if fill_value is None: diff --git a/numpy/core/matrix.py b/numpy/core/matrix.py index 1c7ca7cca..0b064ddd7 100644 --- a/numpy/core/matrix.py +++ b/numpy/core/matrix.py @@ -200,7 +200,7 @@ class matrix(N.ndarray): return self.transpose() def getI(self): - from scipy.corelinalg import inv + from numpy.corelinalg import inv return matrix(inv(self)) A = property(getA, None, doc="base array") diff --git a/numpy/core/src/_sortmodule.c.src b/numpy/core/src/_sortmodule.c.src index 47c7520c1..8f40e47ee 100644 --- a/numpy/core/src/_sortmodule.c.src +++ b/numpy/core/src/_sortmodule.c.src @@ -24,7 +24,7 @@ #include "Python.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #define PYA_QS_STACK 100 #define SMALL_QUICKSORT 15 diff --git a/numpy/core/src/arraymethods.c b/numpy/core/src/arraymethods.c index 2b7a53042..2e5ea4ee4 100644 --- a/numpy/core/src/arraymethods.c +++ b/numpy/core/src/arraymethods.c @@ -864,7 +864,7 @@ array_reduce(PyArrayObject *self, PyObject *args) ret = PyTuple_New(3); if (ret == NULL) return NULL; - mod = PyImport_ImportModule("scipy.base._internal"); + mod = PyImport_ImportModule("numpy.base._internal"); if (mod == NULL) {Py_DECREF(ret); return NULL;} obj = PyObject_GetAttrString(mod, "_reconstruct"); Py_DECREF(mod); diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 72db76373..1d9e15976 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -3922,7 +3922,7 @@ array_ndim_get(PyArrayObject *self) static PyObject * array_flags_get(PyArrayObject *self) { - return PyObject_CallMethod(_scipy_internal, "flagsobj", "Oii", + return PyObject_CallMethod(_numpy_internal, "flagsobj", "Oii", self, self->flags, 0); } @@ -4648,9 +4648,9 @@ static char Arraytype__doc__[] = "A array object represents a multidimensional, homogeneous array\n" " of fixed-size items. An associated data-type-descriptor object\n" " details the data-type in an array (including byteorder and any\n" - " fields). An array can be constructed using the scipy.array\n" + " fields). An array can be constructed using the numpy.array\n" " command. Arrays are sequence, mapping and numeric objects.\n" - " More information is available in the scipy module and by looking\n" + " More information is available in the numpy module and by looking\n" " at the methods and attributes of an array.\n\n" " ndarray.__new__(subtype, shape=, dtype=int_, buffer=None, \n" " offset=0, strides=None, fortran=False)\n\n" @@ -4660,14 +4660,14 @@ static char Arraytype__doc__[] = " 2) If buffer is an object exporting the buffer interface, then\n" " all keywords are interpreted.\n" " The dtype parameter can be any object that can be interpreted \n" - " as a scipy.dtypedescr object.\n\n" + " as a numpy.dtypedescr object.\n\n" " No __init__ method is needed because the array is fully \n" " initialized after the __new__ method."; static PyTypeObject PyBigArray_Type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "scipy.bigndarray", /*tp_name*/ + "numpy.bigndarray", /*tp_name*/ sizeof(PyArrayObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ /* methods */ @@ -4733,7 +4733,7 @@ static PyTypeObject PyBigArray_Type = { static PyTypeObject PyArray_Type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ - "scipy.ndarray", /*tp_name*/ + "numpy.ndarray", /*tp_name*/ sizeof(PyArrayObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ }; @@ -6192,7 +6192,7 @@ PyArray_CanCastTo(PyArray_Descr *from, PyArray_Descr *to) /*********************** Element-wise Array Iterator ***********************/ -/* Aided by Peter J. Verveer's nd_image package and scipy's arraymap ****/ +/* Aided by Peter J. Verveer's nd_image package and numpy's arraymap ****/ /* and Python's array iterator ***/ @@ -6841,7 +6841,7 @@ static PyMemberDef iter_members[] = { static PyTypeObject PyArrayIter_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "scipy.flatiter", /* tp_name */ + "numpy.flatiter", /* tp_name */ sizeof(PyArrayIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -7543,7 +7543,7 @@ arraymapiter_dealloc(PyArrayMapIterObject *mit) static PyTypeObject PyArrayMapIter_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "scipy.mapiter", /* tp_name */ + "numpy.mapiter", /* tp_name */ sizeof(PyArrayIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -7821,7 +7821,7 @@ static PyMethodDef arraymultiter_methods[] = { static PyTypeObject PyArrayMultiIter_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "scipy.broadcast", /* tp_name */ + "numpy.broadcast", /* tp_name */ sizeof(PyArrayMultiIterObject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ @@ -7996,7 +7996,7 @@ arraydescr_protocol_descr_get(PyArray_Descr *self) return res; } - return PyObject_CallMethod(_scipy_internal, "_array_descr", + return PyObject_CallMethod(_numpy_internal, "_array_descr", "O", self); } @@ -8134,7 +8134,7 @@ arraydescr_reduce(PyArray_Descr *self, PyObject *args) ret = PyTuple_New(3); if (ret == NULL) return NULL; - mod = PyImport_ImportModule("scipy.base.multiarray"); + mod = PyImport_ImportModule("numpy.base.multiarray"); if (mod == NULL) {Py_DECREF(ret); return NULL;} obj = PyObject_GetAttrString(mod, "dtypedescr"); Py_DECREF(mod); @@ -8424,7 +8424,7 @@ arraydescr_compare(PyArray_Descr *self, PyObject *other) static PyTypeObject PyArrayDescr_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "scipy.dtypedescr", /* tp_name */ + "numpy.dtypedescr", /* tp_name */ sizeof(PyArray_Descr), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index 2cce9ad03..6c993b069 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -5,7 +5,7 @@ Original file Copyright (c) 1995, 1996, 1997 Jim Hugunin, hugunin@mit.edu - Modified for scipy_core in 2005 + Modified for numpy_core in 2005 Travis E. Oliphant Assistant Professor at @@ -22,12 +22,12 @@ */ #define _MULTIARRAYMODULE -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #define PyAO PyArrayObject static PyObject *typeDict=NULL; /* Must be explicitly loaded */ -static PyObject *_scipy_internal=NULL; /* A Python module for callbacks */ +static PyObject *_numpy_internal=NULL; /* A Python module for callbacks */ static PyArray_Descr * @@ -3544,7 +3544,7 @@ _convert_from_commastring(PyObject *obj, int align) PyArray_Descr *res; if (!PyString_Check(obj)) return NULL; - listobj = PyObject_CallMethod(_scipy_internal, "_commastring", + listobj = PyObject_CallMethod(_numpy_internal, "_commastring", "O", obj); if (!listobj) return NULL; res = _convert_from_list(listobj, align, 0); @@ -3593,7 +3593,7 @@ then it will be checked for conformity and used directly. static PyArray_Descr * _use_fields_dict(PyObject *obj, int align) { - return (PyArray_Descr *)PyObject_CallMethod(_scipy_internal, + return (PyArray_Descr *)PyObject_CallMethod(_numpy_internal, "_usefields", "Oi", obj, align); } @@ -3734,7 +3734,7 @@ PyArray_DescrConverter2(PyObject *obj, PyArray_Descr **at) quite a flexible concept. This is the central code that converts Python objects to - Type-descriptor objects that are used throughout scipy. + Type-descriptor objects that are used throughout numpy. */ /* new reference in *at */ @@ -5492,9 +5492,9 @@ DL_EXPORT(void) initmultiarray(void) { if (set_typeinfo(d) != 0) goto err; - _scipy_internal = \ - PyImport_ImportModule("scipy.base._internal"); - if (_scipy_internal != NULL) return; + _numpy_internal = \ + PyImport_ImportModule("numpy.base._internal"); + if (_numpy_internal != NULL) return; err: /* Check for errors */ diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index dc2c3c198..ec210d42e 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -4,8 +4,8 @@ NOT FINISHED */ -#include "scipy/arrayobject.h" -#include "scipy/ufuncobject.h" +#include "numpy/arrayobject.h" +#include "numpy/ufuncobject.h" /**begin repeat diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 629adbcf0..972b2424f 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -641,14 +641,14 @@ gentype_flags_get(PyObject *self) { static int flags=CONTIGUOUS | OWNDATA | FORTRAN | ALIGNED; - return PyObject_CallMethod(_scipy_internal, "flagsobj", "Oii", + return PyObject_CallMethod(_numpy_internal, "flagsobj", "Oii", self, flags, 1); } static PyObject * voidtype_flags_get(PyVoidScalarObject *self) { - return PyObject_CallMethod(_scipy_internal, "flagsobj", "Oii", + return PyObject_CallMethod(_numpy_internal, "flagsobj", "Oii", self, self->flags, 1); } @@ -1194,7 +1194,7 @@ gentype_reduce(PyObject *self, PyObject *args) if (PyObject_AsReadBuffer(self, (const void **)&buffer, &buflen)<0) { Py_DECREF(ret); return NULL; } - mod = PyImport_ImportModule("scipy.base.multiarray"); + mod = PyImport_ImportModule("numpy.base.multiarray"); if (mod == NULL) return NULL; obj = PyObject_GetAttrString(mod, "scalar"); Py_DECREF(mod); diff --git a/numpy/core/src/ufuncobject.c b/numpy/core/src/ufuncobject.c index 47aad4828..1b5a5f31f 100644 --- a/numpy/core/src/ufuncobject.c +++ b/numpy/core/src/ufuncobject.c @@ -3119,7 +3119,7 @@ static char Ufunctype__doc__[] = static PyTypeObject PyUFunc_Type = { PyObject_HEAD_INIT(0) 0, /*ob_size*/ - "scipy.ufunc", /*tp_name*/ + "numpy.ufunc", /*tp_name*/ sizeof(PyUFuncObject), /*tp_basicsize*/ 0, /*tp_itemsize*/ /* methods */ diff --git a/numpy/core/src/umathmodule.c.src b/numpy/core/src/umathmodule.c.src index 5096f3361..dd140354b 100644 --- a/numpy/core/src/umathmodule.c.src +++ b/numpy/core/src/umathmodule.c.src @@ -1,9 +1,9 @@ /* -*- c -*- */ #include "Python.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #define _UMATHMODULE -#include "scipy/ufuncobject.h" +#include "numpy/ufuncobject.h" #include "abstract.h" #include <math.h> diff --git a/numpy/core/tests/test_ma.py b/numpy/core/tests/test_ma.py index 884a4a277..5a6c95533 100644 --- a/numpy/core/tests/test_ma.py +++ b/numpy/core/tests/test_ma.py @@ -1,7 +1,7 @@ -import scipy +import numpy import types, time -from scipy.base.ma import * -from scipy.testing import ScipyTestCase, ScipyTest +from numpy.base.ma import * +from numpy.testing import ScipyTestCase, ScipyTest def eq(v,w): result = allclose(v,w) if not result: @@ -17,16 +17,16 @@ class test_ma(ScipyTestCase): self.setUp() def setUp (self): - x=scipy.array([1.,1.,1.,-2., pi/2.0, 4., 5., -10., 10., 1., 2., 3.]) - y=scipy.array([5.,0.,3., 2., -1., -4., 0., -10., 10., 1., 0., 3.]) + x=numpy.array([1.,1.,1.,-2., pi/2.0, 4., 5., -10., 10., 1., 2., 3.]) + y=numpy.array([5.,0.,3., 2., -1., -4., 0., -10., 10., 1., 0., 3.]) a10 = 10. m1 = [1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0] m2 = [0, 0, 1, 0, 0, 1, 1, 0, 0, 0 ,0, 1] xm = array(x, mask=m1) ym = array(y, mask=m2) - z = scipy.array([-.5, 0., .5, .8]) + z = numpy.array([-.5, 0., .5, .8]) zm = array(z, mask=[0,1,0,0]) - xf = scipy.where(m1, 1.e+20, x) + xf = numpy.where(m1, 1.e+20, x) s = x.shape xm.set_fill_value(1.e+20) self.d = (x, y, a10, m1, m2, xm, ym, z, zm, xf, s) @@ -97,41 +97,41 @@ class test_ma(ScipyTestCase): self.failUnless(eq(x**2, xm**2)) self.failUnless(eq(abs(x)**2.5, abs(xm) **2.5)) self.failUnless(eq(x**y, xm**ym)) - self.failUnless(eq(scipy.add(x,y), add(xm, ym))) - self.failUnless(eq(scipy.subtract(x,y), subtract(xm, ym))) - self.failUnless(eq(scipy.multiply(x,y), multiply(xm, ym))) - self.failUnless(eq(scipy.divide(x,y), divide(xm, ym))) + self.failUnless(eq(numpy.add(x,y), add(xm, ym))) + self.failUnless(eq(numpy.subtract(x,y), subtract(xm, ym))) + self.failUnless(eq(numpy.multiply(x,y), multiply(xm, ym))) + self.failUnless(eq(numpy.divide(x,y), divide(xm, ym))) def check_testUfuncs1 (self): "Test various functions such as sin, cos." (x, y, a10, m1, m2, xm, ym, z, zm, xf, s) = self.d - self.failUnless (eq(scipy.cos(x), cos(xm))) - self.failUnless (eq(scipy.cosh(x), cosh(xm))) - self.failUnless (eq(scipy.sin(x), sin(xm))) - self.failUnless (eq(scipy.sinh(x), sinh(xm))) - self.failUnless (eq(scipy.tan(x), tan(xm))) - self.failUnless (eq(scipy.tanh(x), tanh(xm))) - self.failUnless (eq(scipy.sqrt(abs(x)), sqrt(xm))) - self.failUnless (eq(scipy.log(abs(x)), log(xm))) - self.failUnless (eq(scipy.log10(abs(x)), log10(xm))) - self.failUnless (eq(scipy.exp(x), exp(xm))) - self.failUnless (eq(scipy.arcsin(z), arcsin(zm))) - self.failUnless (eq(scipy.arccos(z), arccos(zm))) - self.failUnless (eq(scipy.arctan(z), arctan(zm))) - self.failUnless (eq(scipy.arctan2(x, y), arctan2(xm, ym))) - self.failUnless (eq(scipy.absolute(x), absolute(xm))) - self.failUnless (eq(scipy.equal(x,y), equal(xm, ym))) - self.failUnless (eq(scipy.not_equal(x,y), not_equal(xm, ym))) - self.failUnless (eq(scipy.less(x,y), less(xm, ym))) - self.failUnless (eq(scipy.greater(x,y), greater(xm, ym))) - self.failUnless (eq(scipy.less_equal(x,y), less_equal(xm, ym))) - self.failUnless (eq(scipy.greater_equal(x,y), greater_equal(xm, ym))) - self.failUnless (eq(scipy.conjugate(x), conjugate(xm))) - self.failUnless (eq(scipy.concatenate((x,y)), concatenate((xm,ym)))) - self.failUnless (eq(scipy.concatenate((x,y)), concatenate((x,y)))) - self.failUnless (eq(scipy.concatenate((x,y)), concatenate((xm,y)))) - self.failUnless (eq(scipy.concatenate((x,y,x)), concatenate((x,ym,x)))) + self.failUnless (eq(numpy.cos(x), cos(xm))) + self.failUnless (eq(numpy.cosh(x), cosh(xm))) + self.failUnless (eq(numpy.sin(x), sin(xm))) + self.failUnless (eq(numpy.sinh(x), sinh(xm))) + self.failUnless (eq(numpy.tan(x), tan(xm))) + self.failUnless (eq(numpy.tanh(x), tanh(xm))) + self.failUnless (eq(numpy.sqrt(abs(x)), sqrt(xm))) + self.failUnless (eq(numpy.log(abs(x)), log(xm))) + self.failUnless (eq(numpy.log10(abs(x)), log10(xm))) + self.failUnless (eq(numpy.exp(x), exp(xm))) + self.failUnless (eq(numpy.arcsin(z), arcsin(zm))) + self.failUnless (eq(numpy.arccos(z), arccos(zm))) + self.failUnless (eq(numpy.arctan(z), arctan(zm))) + self.failUnless (eq(numpy.arctan2(x, y), arctan2(xm, ym))) + self.failUnless (eq(numpy.absolute(x), absolute(xm))) + self.failUnless (eq(numpy.equal(x,y), equal(xm, ym))) + self.failUnless (eq(numpy.not_equal(x,y), not_equal(xm, ym))) + self.failUnless (eq(numpy.less(x,y), less(xm, ym))) + self.failUnless (eq(numpy.greater(x,y), greater(xm, ym))) + self.failUnless (eq(numpy.less_equal(x,y), less_equal(xm, ym))) + self.failUnless (eq(numpy.greater_equal(x,y), greater_equal(xm, ym))) + self.failUnless (eq(numpy.conjugate(x), conjugate(xm))) + self.failUnless (eq(numpy.concatenate((x,y)), concatenate((xm,ym)))) + self.failUnless (eq(numpy.concatenate((x,y)), concatenate((x,y)))) + self.failUnless (eq(numpy.concatenate((x,y)), concatenate((xm,y)))) + self.failUnless (eq(numpy.concatenate((x,y,x)), concatenate((x,ym,x)))) def check_xtestCount (self): "Test count" @@ -150,7 +150,7 @@ class test_ma(ScipyTestCase): def check_testMinMax (self): "Test minimum and maximum." (x, y, a10, m1, m2, xm, ym, z, zm, xf, s) = self.d - xr = scipy.ravel(x) #max doesn't work if shaped + xr = numpy.ravel(x) #max doesn't work if shaped xmr = ravel(xm) self.failUnless (eq(max(xr), maximum(xmr))) #true because of careful selection of data self.failUnless (eq(min(xr), minimum(xmr))) #true because of careful selection of data @@ -158,32 +158,32 @@ class test_ma(ScipyTestCase): def check_testAddSumProd (self): "Test add, sum, product." (x, y, a10, m1, m2, xm, ym, z, zm, xf, s) = self.d - self.failUnless (eq(scipy.add.reduce(x), add.reduce(x))) - self.failUnless (eq(scipy.add.accumulate(x), add.accumulate(x))) + self.failUnless (eq(numpy.add.reduce(x), add.reduce(x))) + self.failUnless (eq(numpy.add.accumulate(x), add.accumulate(x))) self.failUnless (eq(4, sum(array(4)))) self.failUnless (eq(4, sum(array(4), axis=0))) - self.failUnless (eq(scipy.sum(x), sum(x))) - self.failUnless (eq(scipy.sum(filled(xm,0)), sum(xm))) - self.failUnless (eq(scipy.sum(x,0), sum(x,0))) - self.failUnless (eq(scipy.product(x), product(x))) - self.failUnless (eq(scipy.product(x,0), product(x,0))) - self.failUnless (eq(scipy.product(filled(xm,1)), product(xm))) + self.failUnless (eq(numpy.sum(x), sum(x))) + self.failUnless (eq(numpy.sum(filled(xm,0)), sum(xm))) + self.failUnless (eq(numpy.sum(x,0), sum(x,0))) + self.failUnless (eq(numpy.product(x), product(x))) + self.failUnless (eq(numpy.product(x,0), product(x,0))) + self.failUnless (eq(numpy.product(filled(xm,1)), product(xm))) if len(s) > 1: - self.failUnless (eq(scipy.concatenate((x,y),1), concatenate((xm,ym),1))) - self.failUnless (eq(scipy.add.reduce(x,1), add.reduce(x,1))) - self.failUnless (eq(scipy.sum(x,1), sum(x,1))) - self.failUnless (eq(scipy.product(x,1), product(x,1))) + self.failUnless (eq(numpy.concatenate((x,y),1), concatenate((xm,ym),1))) + self.failUnless (eq(numpy.add.reduce(x,1), add.reduce(x,1))) + self.failUnless (eq(numpy.sum(x,1), sum(x,1))) + self.failUnless (eq(numpy.product(x,1), product(x,1))) def check_testCI(self): "Test of conversions and indexing" - x1 = scipy.array([1,2,4,3]) + x1 = numpy.array([1,2,4,3]) x2 = array(x1, mask = [1,0,0,0]) x3 = array(x1, mask = [0,1,0,1]) x4 = array(x1) # test conversion to strings junk, garbage = str(x2), repr(x2) - assert eq(scipy.sort(x1),sort(x2, fill_value=0)) + assert eq(numpy.sort(x1),sort(x2, fill_value=0)) # tests of indexing assert type(x2[1]) is type(x1[1]) assert x1[1] == x2[1] @@ -210,13 +210,13 @@ class test_ma(ScipyTestCase): x4[:] = masked_array([1,2,3,4],[0,1,1,0]) assert allequal(getmask(x4), array([0,1,1,0])) assert allequal(x4, array([1,2,3,4])) - x1 = scipy.arange(5)*1.0 + x1 = numpy.arange(5)*1.0 x2 = masked_values(x1, 3.0) assert eq(x1,x2) assert allequal(array([0,0,0,1,0],MaskType), x2.mask) assert eq(3.0, x2.fill_value()) x1 = array([1,'hello',2,3],object) - x2 = scipy.array([1,'hello',2,3],object) + x2 = numpy.array([1,'hello',2,3],object) s1 = x1[1].item() s2 = x2[1].item() self.assertEqual(type(s2), str) @@ -233,7 +233,7 @@ class test_ma(ScipyTestCase): m3 = make_mask(m, copy=1) self.failUnless(m is not m3) - x1 = scipy.arange(5) + x1 = numpy.arange(5) y1 = array(x1, mask=m) self.failUnless( y1.raw_data() is not x1) self.failUnless( allequal(x1,y1.raw_data())) @@ -299,7 +299,7 @@ class test_ma(ScipyTestCase): def check_testMaPut(self): (x, y, a10, m1, m2, xm, ym, z, zm, xf, s) = self.d m = [1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1] - i = scipy.nonzero(m) + i = numpy.nonzero(m) putmask(xm, m, z) assert take(xm, i) == z put(ym, i, zm) @@ -411,15 +411,15 @@ class test_ma(ScipyTestCase): def check_testTakeTransposeInnerOuter(self): "Test of take, transpose, inner, outer products" x = arange(24) - y = scipy.arange(24) + y = numpy.arange(24) x[5:6] = masked x=x.reshape(2,3,4) y=y.reshape(2,3,4) - assert eq(scipy.transpose(y,(2,0,1)), transpose(x,(2,0,1))) - assert eq(scipy.take(y, (2,0,1), 1), take(x, (2,0,1), 1)) - assert eq(scipy.innerproduct(filled(x,0),filled(y,0)), + assert eq(numpy.transpose(y,(2,0,1)), transpose(x,(2,0,1))) + assert eq(numpy.take(y, (2,0,1), 1), take(x, (2,0,1), 1)) + assert eq(numpy.innerproduct(filled(x,0),filled(y,0)), innerproduct(x, y)) - assert eq(scipy.outerproduct(filled(x,0),filled(y,0)), + assert eq(numpy.outerproduct(filled(x,0),filled(y,0)), outerproduct(x, y)) y = array(['abc', 1, 'def', 2, 3], object) y[2] = masked @@ -530,8 +530,8 @@ class test_ma(ScipyTestCase): self.failUnless(allclose(average(x), 2.5)) self.failUnless(allclose(average(x, weights=w1), 2.5)) y=array([arange(6), 2.0*arange(6)]) - self.failUnless(allclose(average(y, None), scipy.add.reduce(scipy.arange(6))*3./12.)) - self.failUnless(allclose(average(y, axis=0), scipy.arange(6) * 3./2.)) + self.failUnless(allclose(average(y, None), numpy.add.reduce(numpy.arange(6))*3./12.)) + self.failUnless(allclose(average(y, axis=0), numpy.arange(6) * 3./2.)) self.failUnless(allclose(average(y, axis=1), [average(x), average(x) * 2.0])) self.failUnless(allclose(average(y, None, weights=w2), 20./6.)) self.failUnless(allclose(average(y, axis=0, weights=w2), [0.,1.,2.,3.,4.,10.])) @@ -591,13 +591,13 @@ def timingTest(): print f.test_name print """\ n = %7d -scipy time (ms) %6.1f +numpy time (ms) %6.1f MA maskless ratio %6.1f MA masked ratio %6.1f """ % (n, t*1000.0, t1/t, t2/t) def testta(n, f): - x=scipy.arange(n) + 1.0 + x=numpy.arange(n) + 1.0 tn0 = time.time() z = f(x) return time.time() - tn0 @@ -633,5 +633,5 @@ def testinplace(x): testinplace.test_name = 'Inplace operations' if __name__ == "__main__": - ScipyTest('scipy.base.ma').run() + ScipyTest('numpy.base.ma').run() #timingTest() diff --git a/numpy/core/tests/test_matrix.py b/numpy/core/tests/test_matrix.py index 59b0a131e..4deb9aa5e 100644 --- a/numpy/core/tests/test_matrix.py +++ b/numpy/core/tests/test_matrix.py @@ -1,8 +1,8 @@ -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base) -from scipy.base import * +import numpy.base;reload(numpy.base) +from numpy.base import * restore_path() class test_ctor(ScipyTestCase): @@ -26,7 +26,7 @@ class test_ctor(ScipyTestCase): class test_properties(ScipyTestCase): def test_basic(self): - import scipy.corelinalg as linalg + import numpy.corelinalg as linalg A = array([[1., 2.], [3., 4.]]) @@ -94,7 +94,7 @@ class test_autocasting(ScipyTestCase): class test_algebra(ScipyTestCase): def test_basic(self): - import scipy.corelinalg as linalg + import numpy.corelinalg as linalg A = array([[1., 2.], [3., 4.]]) diff --git a/numpy/core/tests/test_records.py b/numpy/core/tests/test_records.py index 8135a55a8..cfdb2e9e3 100644 --- a/numpy/core/tests/test_records.py +++ b/numpy/core/tests/test_records.py @@ -1,10 +1,10 @@ -from scipy.testing import * +from numpy.testing import * set_package_path() import os as _os -import scipy.base;reload(scipy.base) -from scipy.base import * -from scipy.base import records as rec +import numpy.base;reload(numpy.base) +from numpy.base import * +from numpy.base import records as rec restore_path() class test_fromrecords(ScipyTestCase): diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py index 9cd99f7e1..6b4aa3221 100644 --- a/numpy/core/tests/test_umath.py +++ b/numpy/core/tests/test_umath.py @@ -1,7 +1,7 @@ -from scipy.testing import * +from numpy.testing import * set_package_path() -from scipy.base.umath import minimum, maximum +from numpy.base.umath import minimum, maximum restore_path() diff --git a/numpy/core_version.py b/numpy/core_version.py index bb9fdfaa4..1a9c06b52 100644 --- a/numpy/core_version.py +++ b/numpy/core_version.py @@ -5,7 +5,7 @@ svn_version_file = os.path.join(os.path.dirname(__file__), 'base','__svn_version__.py') if os.path.isfile(svn_version_file): import imp - svn = imp.load_module('scipy.base.__svn_version__', + svn = imp.load_module('numpy.base.__svn_version__', open(svn_version_file), svn_version_file, ('.py','U',1)) diff --git a/numpy/dft/__init__.py b/numpy/dft/__init__.py index 0a72b86bd..b5fde1d36 100644 --- a/numpy/dft/__init__.py +++ b/numpy/dft/__init__.py @@ -4,19 +4,19 @@ from info import __doc__ from fftpack import * from helper import * -# re-define duplicated functions if full scipy installed. +# re-define duplicated functions if full numpy installed. try: - import scipy.fftpack + import numpy.fftpack except ImportError: pass else: - fft = scipy.fftpack.fft - ifft = scipy.fftpack.ifft - fftn = scipy.fftpack.fftn - ifftn = scipy.fftpack.ifftn - fft2 = scipy.fftpack.fft2 - ifft2 = scipy.fftpack.ifft2 + fft = numpy.fftpack.fft + ifft = numpy.fftpack.ifft + fftn = numpy.fftpack.fftn + ifftn = numpy.fftpack.ifftn + fft2 = numpy.fftpack.fft2 + ifft2 = numpy.fftpack.ifft2 -from scipy.testing import ScipyTest +from numpy.testing import ScipyTest test = ScipyTest().test diff --git a/numpy/dft/fftpack.py b/numpy/dft/fftpack.py index d95c87667..fdaf65bce 100644 --- a/numpy/dft/fftpack.py +++ b/numpy/dft/fftpack.py @@ -26,7 +26,7 @@ __all__ = ['fft','inverse_fft', 'ifft', 'real_fft', 'refft', 'inverse_real_fft', 'inverse_fft2d', 'real_fftnd', 'real_fft2d', 'inverse_real_fftnd', 'inverse_real_fft2d',] -from scipy.base import * +from numpy.base import * import fftpack_lite as fftpack from helper import * diff --git a/numpy/dft/fftpack_litemodule.c b/numpy/dft/fftpack_litemodule.c index 692da5e52..4a509d26b 100644 --- a/numpy/dft/fftpack_litemodule.c +++ b/numpy/dft/fftpack_litemodule.c @@ -1,6 +1,6 @@ #include "fftpack.h" #include "Python.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" static PyObject *ErrorObject; diff --git a/numpy/dft/helper.py b/numpy/dft/helper.py index 36a9c3dec..d5ed9940b 100644 --- a/numpy/dft/helper.py +++ b/numpy/dft/helper.py @@ -5,7 +5,7 @@ Discrete Fourier Transforms - helper.py __all__ = ['fftshift','ifftshift','fftfreq'] -from scipy.base import asarray, concatenate, arange, take, \ +from numpy.base import asarray, concatenate, arange, take, \ array, integer import types diff --git a/numpy/dft/tests/test_helper.py b/numpy/dft/tests/test_helper.py index f962096f6..e8dd36165 100644 --- a/numpy/dft/tests/test_helper.py +++ b/numpy/dft/tests/test_helper.py @@ -4,12 +4,12 @@ """ import sys -from scipy.testing import * +from numpy.testing import * set_package_path() -from scipy.corefft import fftshift,ifftshift,fftfreq +from numpy.corefft import fftshift,ifftshift,fftfreq del sys.path[0] -from scipy import pi +from numpy import pi def random(size): return rand(*size) diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py index 08cd57559..11657f981 100644 --- a/numpy/distutils/__init__.py +++ b/numpy/distutils/__init__.py @@ -12,5 +12,5 @@ except ImportError: _INSTALLED = False if _INSTALLED: - from scipy.testing import ScipyTest + from numpy.testing import ScipyTest test = ScipyTest().test diff --git a/numpy/distutils/ccompiler.py b/numpy/distutils/ccompiler.py index 2e06e6993..0a4e206fd 100644 --- a/numpy/distutils/ccompiler.py +++ b/numpy/distutils/ccompiler.py @@ -249,7 +249,7 @@ def new_compiler (plat=None, verbose=0, dry_run=0, force=0): - # Try first C compilers from scipy.distutils. + # Try first C compilers from numpy.distutils. if plat is None: plat = os.name try: @@ -261,11 +261,11 @@ def new_compiler (plat=None, if compiler is not None: msg = msg + " with '%s' compiler" % compiler raise DistutilsPlatformError, msg - module_name = "scipy.distutils." + module_name + module_name = "numpy.distutils." + module_name try: __import__ (module_name) except ImportError, msg: - print msg,'in scipy.distutils, trying from distutils..' + print msg,'in numpy.distutils, trying from distutils..' module_name = module_name[6:] try: __import__(module_name) diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 7f7c54d8d..3d278249e 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -10,9 +10,9 @@ from types import * from distutils.command.build_clib import build_clib as old_build_clib from distutils.command.build_clib import show_compilers -from scipy.distutils import log +from numpy.distutils import log from distutils.dep_util import newer_group -from scipy.distutils.misc_util import filter_sources, has_f_sources,\ +from numpy.distutils.misc_util import filter_sources, has_f_sources,\ has_cxx_sources, all_strings, get_lib_source_files class build_clib(old_build_clib): @@ -71,7 +71,7 @@ class build_clib(old_build_clib): self.compiler.show_customization() if self.have_f_sources(): - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler self.fcompiler = new_fcompiler(compiler=self.fcompiler, verbose=self.verbose, dry_run=self.dry_run, diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 7a2318b70..a7703ea7c 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -10,10 +10,10 @@ from types import * from distutils.dep_util import newer_group, newer from distutils.command.build_ext import build_ext as old_build_ext -from scipy.distutils import log -from scipy.distutils.misc_util import filter_sources, has_f_sources, \ +from numpy.distutils import log +from numpy.distutils.misc_util import filter_sources, has_f_sources, \ has_cxx_sources, get_ext_source_files, all_strings, \ - get_scipy_include_dirs + get_numpy_include_dirs from distutils.errors import DistutilsFileError class build_ext (old_build_ext): @@ -90,7 +90,7 @@ class build_ext (old_build_ext): # Initialize Fortran/C++ compilers if needed. if need_f_compiler: - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler self.fcompiler = new_fcompiler(compiler=self.fcompiler, verbose=self.verbose, dry_run=self.dry_run, @@ -173,7 +173,7 @@ class build_ext (old_build_ext): kws = {'depends':ext.depends} output_dir = self.build_temp - include_dirs = ext.include_dirs + get_scipy_include_dirs() + include_dirs = ext.include_dirs + get_numpy_include_dirs() c_objects = [] if c_sources: diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index a2dabfa6a..9a8a6bfa8 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -2,7 +2,7 @@ """ from distutils.command.build_scripts import build_scripts as old_build_scripts -from scipy.distutils import log +from numpy.distutils import log class build_scripts(old_build_scripts): @@ -40,5 +40,5 @@ class build_scripts(old_build_scripts): return old_build_scripts.run(self) def get_source_files(self): - from scipy.distutils.misc_util import get_script_files + from numpy.distutils.misc_util import get_script_files return get_script_files(self.scripts) diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index 65b46d173..84cf88b96 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -10,13 +10,13 @@ from distutils.command import build_ext, build_py from distutils.util import convert_path from distutils.dep_util import newer_group, newer -from scipy.distutils import log -from scipy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\ +from numpy.distutils import log +from numpy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\ appendpath -from scipy.distutils.from_template import process_file as process_f_file -from scipy.distutils.conv_template import process_file as process_c_file -from scipy.distutils.extension import Extension -from scipy.distutils.system_info import get_info, dict_append +from numpy.distutils.from_template import process_file as process_f_file +from numpy.distutils.conv_template import process_file as process_c_file +from numpy.distutils.extension import Extension +from numpy.distutils.system_info import get_info, dict_append class build_src(build_ext.build_ext): @@ -334,7 +334,7 @@ class build_src(build_ext.build_ext): if (self.force or newer_group(depends, target_file,'newer')) \ and not skip_f2py: log.info("f2py: %s" % (source)) - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e f2py2e.run_main(f2py_options + ['--build-dir',target_dir,source]) else: log.debug(" skipping '%s' f2py interface (up-to-date)" % (source)) @@ -349,7 +349,7 @@ class build_src(build_ext.build_ext): depends = f_sources + extension.depends if (self.force or newer_group(depends, target_file, 'newer')) \ and not skip_f2py: - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e log.info("f2py:> %s" % (target_file)) self.mkpath(target_dir) f2py2e.run_main(f2py_options + ['--lower', @@ -371,7 +371,7 @@ class build_src(build_ext.build_ext): extension.include_dirs.append(self.build_src) if not skip_f2py: - import scipy.f2py as f2py2e + import numpy.f2py as f2py2e d = os.path.dirname(f2py2e.__file__) source_c = os.path.join(d,'src','fortranobject.c') source_h = os.path.join(d,'src','fortranobject.h') diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index aff79067e..fed3a97e5 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -28,7 +28,7 @@ class config(old_config): def _check_compiler (self): old_config._check_compiler(self) - from scipy.distutils.fcompiler import FCompiler, new_fcompiler + from numpy.distutils.fcompiler import FCompiler, new_fcompiler if not isinstance(self.fcompiler, FCompiler): self.fcompiler = new_fcompiler(compiler=self.fcompiler, dry_run=self.dry_run, force=1) diff --git a/numpy/distutils/command/config_compiler.py b/numpy/distutils/command/config_compiler.py index 0db601fc6..c6073e77b 100644 --- a/numpy/distutils/command/config_compiler.py +++ b/numpy/distutils/command/config_compiler.py @@ -44,7 +44,7 @@ class config_fc(Command): def finalize_options(self): if self.help_fcompiler: - from scipy.distutils.fcompiler import show_fcompilers + from numpy.distutils.fcompiler import show_fcompilers show_fcompilers(self.distribution) sys.exit() return diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py index 043f024f5..6512d5103 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -13,8 +13,8 @@ class install_headers (old_install_headers): for header in headers: if isinstance(header,tuple): # Kind of a hack, but I don't know where else to change this... - if header[0] == 'scipy.base': - header = ('scipy', header[1]) + if header[0] == 'numpy.base': + header = ('numpy', header[1]) if os.path.splitext(header[1])[1] == '.inc': continue d = os.path.join(*([prefix]+header[0].split('.'))) diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index 289bd0357..a02bdbe45 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,7 +1,7 @@ from distutils.command.sdist import * from distutils.command.sdist import sdist as old_sdist -from scipy.distutils.misc_util import get_data_files +from numpy.distutils.misc_util import get_data_files class sdist(old_sdist): diff --git a/numpy/distutils/core.py b/numpy/distutils/core.py index 842a94756..724e1517f 100644 --- a/numpy/distutils/core.py +++ b/numpy/distutils/core.py @@ -10,23 +10,23 @@ except ImportError: from distutils.core import setup as old_setup have_setuptools = 0 -from scipy.distutils.extension import Extension -from scipy.distutils.command import config -from scipy.distutils.command import build -from scipy.distutils.command import build_py -from scipy.distutils.command import config_compiler -from scipy.distutils.command import build_ext -from scipy.distutils.command import build_clib -from scipy.distutils.command import build_src -from scipy.distutils.command import build_scripts -from scipy.distutils.command import sdist -from scipy.distutils.command import install_data -from scipy.distutils.command import install_headers -from scipy.distutils.command import install -from scipy.distutils.command import bdist_rpm -from scipy.distutils.misc_util import get_data_files +from numpy.distutils.extension import Extension +from numpy.distutils.command import config +from numpy.distutils.command import build +from numpy.distutils.command import build_py +from numpy.distutils.command import config_compiler +from numpy.distutils.command import build_ext +from numpy.distutils.command import build_clib +from numpy.distutils.command import build_src +from numpy.distutils.command import build_scripts +from numpy.distutils.command import sdist +from numpy.distutils.command import install_data +from numpy.distutils.command import install_headers +from numpy.distutils.command import install +from numpy.distutils.command import bdist_rpm +from numpy.distutils.misc_util import get_data_files -scipy_cmdclass = {'build': build.build, +numpy_cmdclass = {'build': build.build, 'build_src': build_src.build_src, 'build_scripts': build_scripts.build_scripts, 'config_fc': config_compiler.config_fc, @@ -42,14 +42,14 @@ scipy_cmdclass = {'build': build.build, } if have_setuptools: from setuptools.command import bdist_egg, develop, easy_install, egg_info - scipy_cmdclass['bdist_egg'] = bdist_egg.bdist_egg - scipy_cmdclass['develop'] = develop.develop - scipy_cmdclass['easy_install'] = easy_install.easy_install - scipy_cmdclass['egg_info'] = egg_info.egg_info + numpy_cmdclass['bdist_egg'] = bdist_egg.bdist_egg + numpy_cmdclass['develop'] = develop.develop + numpy_cmdclass['easy_install'] = easy_install.easy_install + numpy_cmdclass['egg_info'] = egg_info.egg_info def setup(**attr): - cmdclass = scipy_cmdclass.copy() + cmdclass = numpy_cmdclass.copy() new_attr = attr.copy() if new_attr.has_key('cmdclass'): diff --git a/numpy/distutils/extension.py b/numpy/distutils/extension.py index a1cab52f4..2db62969e 100644 --- a/numpy/distutils/extension.py +++ b/numpy/distutils/extension.py @@ -53,7 +53,7 @@ class Extension(old_Extension): self.depends = depends or [] self.language = language - # scipy_distutils features + # numpy_distutils features self.f2py_options = f2py_options or [] self.module_dirs = module_dirs or [] diff --git a/numpy/distutils/fcompiler/__init__.py b/numpy/distutils/fcompiler/__init__.py index f7cbc3bad..c13884aa6 100644 --- a/numpy/distutils/fcompiler/__init__.py +++ b/numpy/distutils/fcompiler/__init__.py @@ -1,7 +1,7 @@ -"""scipy.distutils.fcompiler +"""numpy.distutils.fcompiler Contains FCompiler, an abstract base class that defines the interface -for the scipy.distutils Fortran compiler abstraction model. +for the numpy.distutils Fortran compiler abstraction model. """ __all__ = ['FCompiler','new_fcompiler','show_fcompilers', @@ -17,9 +17,9 @@ from distutils.errors import DistutilsModuleError,DistutilsArgError,\ DistutilsExecError,CompileError,LinkError,DistutilsPlatformError from distutils.util import split_quoted -from scipy.distutils.ccompiler import CCompiler, gen_lib_options -from scipy.distutils import log -from scipy.distutils.command.config_compiler import config_fc +from numpy.distutils.ccompiler import CCompiler, gen_lib_options +from numpy.distutils import log +from numpy.distutils.command.config_compiler import config_fc from distutils.spawn import _nt_quote_args class FCompiler(CCompiler): @@ -636,7 +636,7 @@ def new_fcompiler(plat=None, raise DistutilsPlatformError, msg try: - module_name = 'scipy.distutils.fcompiler.'+module_name + module_name = 'numpy.distutils.fcompiler.'+module_name __import__ (module_name) module = sys.modules[module_name] klass = vars(module)[class_name] diff --git a/numpy/distutils/fcompiler/absoft.py b/numpy/distutils/fcompiler/absoft.py index 51c3548db..31ae2c772 100644 --- a/numpy/distutils/fcompiler/absoft.py +++ b/numpy/distutils/fcompiler/absoft.py @@ -9,9 +9,9 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler, dummy_fortran_file -from scipy.distutils.misc_util import cyg2win32 +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file +from numpy.distutils.misc_util import cyg2win32 class AbsoftFCompiler(FCompiler): @@ -131,7 +131,7 @@ class AbsoftFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='absoft') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/compaq.py b/numpy/distutils/fcompiler/compaq.py index 7abb23ae2..36382050a 100644 --- a/numpy/distutils/fcompiler/compaq.py +++ b/numpy/distutils/fcompiler/compaq.py @@ -4,8 +4,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class CompaqFCompiler(FCompiler): diff --git a/numpy/distutils/fcompiler/g95.py b/numpy/distutils/fcompiler/g95.py index a3bf374a8..247d3f94b 100644 --- a/numpy/distutils/fcompiler/g95.py +++ b/numpy/distutils/fcompiler/g95.py @@ -3,8 +3,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class G95FCompiler(FCompiler): @@ -34,7 +34,7 @@ class G95FCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler #compiler = new_fcompiler(compiler='g95') compiler = G95FCompiler() compiler.customize() diff --git a/numpy/distutils/fcompiler/gnu.py b/numpy/distutils/fcompiler/gnu.py index b0072571f..94c5e768d 100644 --- a/numpy/distutils/fcompiler/gnu.py +++ b/numpy/distutils/fcompiler/gnu.py @@ -4,9 +4,9 @@ import os import sys import warnings -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler -from scipy.distutils.exec_command import exec_command, find_executable +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler +from numpy.distutils.exec_command import exec_command, find_executable class GnuFCompiler(FCompiler): @@ -237,7 +237,7 @@ class Gnu95FCompiler(GnuFCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler #compiler = new_fcompiler(compiler='gnu') compiler = GnuFCompiler() compiler.customize() diff --git a/numpy/distutils/fcompiler/hpux.py b/numpy/distutils/fcompiler/hpux.py index 95f326cea..8cab2c611 100644 --- a/numpy/distutils/fcompiler/hpux.py +++ b/numpy/distutils/fcompiler/hpux.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class HPUXFCompiler(FCompiler): @@ -35,7 +35,7 @@ class HPUXFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(10) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='hpux') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/ibm.py b/numpy/distutils/fcompiler/ibm.py index 5fc59d1e6..0468af4cb 100644 --- a/numpy/distutils/fcompiler/ibm.py +++ b/numpy/distutils/fcompiler/ibm.py @@ -2,7 +2,7 @@ import os import re import sys -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler from distutils import log class IbmFCompiler(FCompiler): @@ -74,7 +74,7 @@ class IbmFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='ibm') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/intel.py b/numpy/distutils/fcompiler/intel.py index 0e7375943..74bbaf52a 100644 --- a/numpy/distutils/fcompiler/intel.py +++ b/numpy/distutils/fcompiler/intel.py @@ -3,9 +3,9 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler, dummy_fortran_file -from scipy.distutils.exec_command import find_executable +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler, dummy_fortran_file +from numpy.distutils.exec_command import find_executable class IntelFCompiler(FCompiler): @@ -168,7 +168,7 @@ class IntelItaniumVisualFCompiler(IntelVisualFCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='intel') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/lahey.py b/numpy/distutils/fcompiler/lahey.py index 9b88cc264..eaa577b62 100644 --- a/numpy/distutils/fcompiler/lahey.py +++ b/numpy/distutils/fcompiler/lahey.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class LaheyFCompiler(FCompiler): @@ -40,7 +40,7 @@ class LaheyFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='lahey') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/mips.py b/numpy/distutils/fcompiler/mips.py index 547e91423..915cbead9 100644 --- a/numpy/distutils/fcompiler/mips.py +++ b/numpy/distutils/fcompiler/mips.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class MipsFCompiler(FCompiler): @@ -50,7 +50,7 @@ class MipsFCompiler(FCompiler): return r if __name__ == '__main__': - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='mips') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/nag.py b/numpy/distutils/fcompiler/nag.py index e17d972c4..c0b3b17e9 100644 --- a/numpy/distutils/fcompiler/nag.py +++ b/numpy/distutils/fcompiler/nag.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class NAGFCompiler(FCompiler): @@ -33,7 +33,7 @@ class NAGFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='nag') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/none.py b/numpy/distutils/fcompiler/none.py index 984ea7dda..c38b9f1ac 100644 --- a/numpy/distutils/fcompiler/none.py +++ b/numpy/distutils/fcompiler/none.py @@ -1,5 +1,5 @@ -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.fcompiler import FCompiler class NoneFCompiler(FCompiler): @@ -18,7 +18,7 @@ class NoneFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = NoneFCompiler() compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/pg.py b/numpy/distutils/fcompiler/pg.py index bfdf9752c..94aefa244 100644 --- a/numpy/distutils/fcompiler/pg.py +++ b/numpy/distutils/fcompiler/pg.py @@ -4,8 +4,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class PGroupFCompiler(FCompiler): @@ -36,7 +36,7 @@ class PGroupFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='pg') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/sun.py b/numpy/distutils/fcompiler/sun.py index 0c0599a06..7bfd805ad 100644 --- a/numpy/distutils/fcompiler/sun.py +++ b/numpy/distutils/fcompiler/sun.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler import FCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler import FCompiler class SunFCompiler(FCompiler): @@ -41,7 +41,7 @@ class SunFCompiler(FCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='sun') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/fcompiler/vast.py b/numpy/distutils/fcompiler/vast.py index 1c6b40032..d2977b7e0 100644 --- a/numpy/distutils/fcompiler/vast.py +++ b/numpy/distutils/fcompiler/vast.py @@ -1,8 +1,8 @@ import os import sys -from scipy.distutils.cpuinfo import cpu -from scipy.distutils.fcompiler.gnu import GnuFCompiler +from numpy.distutils.cpuinfo import cpu +from numpy.distutils.fcompiler.gnu import GnuFCompiler class VastFCompiler(GnuFCompiler): @@ -44,7 +44,7 @@ class VastFCompiler(GnuFCompiler): if __name__ == '__main__': from distutils import log log.set_verbosity(2) - from scipy.distutils.fcompiler import new_fcompiler + from numpy.distutils.fcompiler import new_fcompiler compiler = new_fcompiler(compiler='vast') compiler.customize() print compiler.get_version() diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 87b7f564b..f7908bbe9 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -1,7 +1,7 @@ import os from distutils.unixccompiler import UnixCCompiler -from scipy.distutils.exec_command import find_executable +from numpy.distutils.exec_command import find_executable class IntelCCompiler(UnixCCompiler): diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index fe7b4bd98..d725872f0 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -13,17 +13,17 @@ import sys import log # Overwrite certain distutils.ccompiler functions: -import scipy.distutils.ccompiler +import numpy.distutils.ccompiler # NT stuff # 1. Make sure libpython<version>.a exists for gcc. If not, build it. # 2. Force windows to use gcc (we're struggling with MSVC and g77 support) -# --> this is done in scipy/distutils/ccompiler.py +# --> this is done in numpy/distutils/ccompiler.py # 3. Force windows to use g77 import distutils.cygwinccompiler from distutils.version import StrictVersion -from scipy.distutils.ccompiler import gen_preprocess_options, gen_lib_options +from numpy.distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.errors import DistutilsExecError, CompileError, UnknownFileError from distutils.unixccompiler import UnixCCompiler @@ -197,7 +197,7 @@ def build_import_library(): return log.info('Building import library: "%s"' % (out_file)) - from scipy.distutils import lib2def + from numpy.distutils import lib2def def_name = "python%d%d.def" % tuple(sys.version_info[:2]) def_file = os.path.join(sys.prefix,'libs',def_name) diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index f94220c74..7c5045d62 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -273,7 +273,7 @@ class Configuration: 'libraries','headers','scripts'] _dict_keys = ['package_dir'] - scipy_include_dirs = [] + numpy_include_dirs = [] def __init__(self, package_name=None, @@ -615,7 +615,7 @@ class Configuration: ext_args['libraries'] = libnames + ext_args['libraries'] - from scipy.distutils.core import Extension + from numpy.distutils.core import Extension ext = Extension(**ext_args) self.ext_modules.append(ext) @@ -739,7 +739,7 @@ class Configuration: libraries=self.libraries, include_dirs=self.include_dirs) else: - from scipy.distutils.core import Extension + from numpy.distutils.core import Extension assert isinstance(extlib,Extension),`extlib` extlib.libraries.extend(self.libraries) extlib.include_dirs.extend(self.include_dirs) @@ -860,20 +860,20 @@ def get_cmd(cmdname,_cache={}): _cache[cmdname] = cmd return _cache[cmdname] -def get_scipy_include_dirs(): - # scipy_include_dirs are set by scipy/base/setup.py, otherwise [] - include_dirs = Configuration.scipy_include_dirs[:] +def get_numpy_include_dirs(): + # numpy_include_dirs are set by numpy/base/setup.py, otherwise [] + include_dirs = Configuration.numpy_include_dirs[:] if not include_dirs: - import scipy - if scipy.show_core_config is None: - # running from scipy_core source directory - include_dirs.append(os.path.join(os.path.dirname(scipy.__file__), + import numpy + if numpy.show_core_config is None: + # running from numpy_core source directory + include_dirs.append(os.path.join(os.path.dirname(numpy.__file__), 'base','include')) else: - # using installed scipy core headers - import scipy.base as base + # using installed numpy core headers + import numpy.base as base include_dirs.append(os.path.join(os.path.dirname(base.__file__),'include')) - # else running scipy/base/setup.py + # else running numpy/base/setup.py return include_dirs ######################### @@ -929,7 +929,7 @@ def generate_config_py(extension, build_dir): sources=[generate_config_py]) config['ext_modules'].append(ext) """ - from scipy.distutils.system_info import system_info + from numpy.distutils.system_info import system_info from distutils.dir_util import mkpath target = os.path.join(*([build_dir]+extension.name.split('.'))) + '.py' mkpath(os.path.dirname(target)) diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py index 8fe472eaf..f093bdc19 100644 --- a/numpy/distutils/setup.py +++ b/numpy/distutils/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from scipy.distutils.core import setup -from scipy.distutils.misc_util import Configuration +from numpy.distutils.core import setup +from numpy.distutils.misc_util import Configuration def configuration(parent_package='',top_path=None): config = Configuration('distutils',parent_package,top_path) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index f0cfff1d0..22d1e210d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -22,7 +22,7 @@ classes are available: blas_src_info numpy_info numarray_info - scipy_info + numpy_info boost_python_info agg2_info wx_info @@ -175,7 +175,7 @@ def get_info(name,notfound_action=0): 'numpy':numpy_info, 'numeric':numpy_info, # alias to numpy, for build_ext --backends support 'numarray':numarray_info, - 'scipy':scipy_info, + 'numpy':numpy_info, 'lapack_opt':lapack_opt_info, 'blas_opt':blas_opt_info, 'boost_python':boost_python_info, @@ -206,49 +206,49 @@ class AtlasNotFoundError(NotFoundError): """ Atlas (http://math-atlas.sourceforge.net/) libraries not found. Directories to search for the libraries can be specified in the - scipy_distutils/site.cfg file (section [atlas]) or by setting + numpy_distutils/site.cfg file (section [atlas]) or by setting the ATLAS environment variable.""" class LapackNotFoundError(NotFoundError): """ Lapack (http://www.netlib.org/lapack/) libraries not found. Directories to search for the libraries can be specified in the - scipy_distutils/site.cfg file (section [lapack]) or by setting + numpy_distutils/site.cfg file (section [lapack]) or by setting the LAPACK environment variable.""" class LapackSrcNotFoundError(LapackNotFoundError): """ Lapack (http://www.netlib.org/lapack/) sources not found. Directories to search for the sources can be specified in the - scipy_distutils/site.cfg file (section [lapack_src]) or by setting + numpy_distutils/site.cfg file (section [lapack_src]) or by setting the LAPACK_SRC environment variable.""" class BlasNotFoundError(NotFoundError): """ Blas (http://www.netlib.org/blas/) libraries not found. Directories to search for the libraries can be specified in the - scipy_distutils/site.cfg file (section [blas]) or by setting + numpy_distutils/site.cfg file (section [blas]) or by setting the BLAS environment variable.""" class BlasSrcNotFoundError(BlasNotFoundError): """ Blas (http://www.netlib.org/blas/) sources not found. Directories to search for the sources can be specified in the - scipy_distutils/site.cfg file (section [blas_src]) or by setting + numpy_distutils/site.cfg file (section [blas_src]) or by setting the BLAS_SRC environment variable.""" class FFTWNotFoundError(NotFoundError): """ FFTW (http://www.fftw.org/) libraries not found. Directories to search for the libraries can be specified in the - scipy_distutils/site.cfg file (section [fftw]) or by setting + numpy_distutils/site.cfg file (section [fftw]) or by setting the FFTW environment variable.""" class DJBFFTNotFoundError(NotFoundError): """ DJBFFT (http://cr.yp.to/djbfft.html) libraries not found. Directories to search for the libraries can be specified in the - scipy_distutils/site.cfg file (section [djbfft]) or by setting + numpy_distutils/site.cfg file (section [djbfft]) or by setting the DJBFFT environment variable.""" class F2pyNotFoundError(NotFoundError): @@ -331,7 +331,7 @@ class system_info: def get_info(self,notfound_action=0): """ Return a dictonary with items that are compatible - with scipy_distutils.setup keyword arguments. + with numpy_distutils.setup keyword arguments. """ flag = 0 if not self.has_info(): @@ -786,7 +786,7 @@ class atlas_info(system_info): size of %s is %sk (expected >4000k) Follow the instructions in the KNOWN PROBLEMS section of the file - scipy/INSTALL.txt. + numpy/INSTALL.txt. ********************************************************************* """ % (lapack_lib,sz/1024) warnings.warn(message) @@ -956,7 +956,7 @@ class lapack_src_info(system_info): self.set_info(**info) atlas_version_c_text = r''' -/* This file is generated from scipy_distutils/system_info.py */ +/* This file is generated from numpy_distutils/system_info.py */ #ifdef __CPLUSPLUS__ extern "C" { #endif @@ -1360,9 +1360,9 @@ class numarray_info(numpy_info): section = 'numarray' modulename = 'numarray' -class scipy_info(numpy_info): - section = 'scipy' - modulename = 'scipy' +class numpy_info(numpy_info): + section = 'numpy' + modulename = 'numpy' class boost_python_info(system_info): diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py index 6b786a97e..1c1ca955b 100644 --- a/numpy/distutils/tests/f2py_ext/setup.py +++ b/numpy/distutils/tests/f2py_ext/setup.py @@ -1,6 +1,6 @@ import os -from scipy.distutils.core import setup, Extension +from numpy.distutils.core import setup, Extension ext = Extension('f2py_ext.fib2',['src/fib2.pyf','src/fib1.f']) diff --git a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py index 633e2ba20..8c89db7cc 100644 --- a/numpy/distutils/tests/f2py_ext/tests/test_fib2.py +++ b/numpy/distutils/tests/f2py_ext/tests/test_fib2.py @@ -1,5 +1,5 @@ import sys -from scipy.base.testing import * +from numpy.base.testing import * set_package_path() from f2py_ext import fib2 del sys.path[0] diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py index f3ab45045..f892a5738 100644 --- a/numpy/distutils/tests/f2py_f90_ext/setup.py +++ b/numpy/distutils/tests/f2py_f90_ext/setup.py @@ -1,6 +1,6 @@ import os -from scipy_distutils.core import setup, Extension +from numpy_distutils.core import setup, Extension package = 'f2py_f90_ext' diff --git a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py index 544f94ab4..609164386 100644 --- a/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py +++ b/numpy/distutils/tests/f2py_f90_ext/tests/test_foo.py @@ -1,5 +1,5 @@ import sys -from scipy.base.testing import * +from numpy.base.testing import * set_package_path() from f2py_f90_ext import foo del sys.path[0] diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py index 7b12c1f55..c8b6ddee2 100644 --- a/numpy/distutils/tests/gen_ext/setup.py +++ b/numpy/distutils/tests/gen_ext/setup.py @@ -1,6 +1,6 @@ import os -from scipy.distutils.core import setup, Extension +from numpy.distutils.core import setup, Extension from distutils.dep_util import newer fib3_f = ''' diff --git a/numpy/distutils/tests/gen_ext/tests/test_fib3.py b/numpy/distutils/tests/gen_ext/tests/test_fib3.py index c8ee2441c..39b3e3cc4 100644 --- a/numpy/distutils/tests/gen_ext/tests/test_fib3.py +++ b/numpy/distutils/tests/gen_ext/tests/test_fib3.py @@ -1,5 +1,5 @@ import sys -from scipy.base.testing import * +from numpy.base.testing import * set_package_path() from gen_ext import fib3 del sys.path[0] diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py index b6fe8eed4..65b2f6e2a 100644 --- a/numpy/distutils/tests/swig_ext/setup.py +++ b/numpy/distutils/tests/swig_ext/setup.py @@ -1,6 +1,6 @@ import os -from scipy_distutils.core import setup, Extension +from numpy_distutils.core import setup, Extension ext_c = Extension('swig_ext._example',['src/example.i','src/example.c']) ext_cpp = Extension('swig_ext._example2',['src/zoo.i','src/zoo.cc'], diff --git a/numpy/distutils/tests/swig_ext/tests/test_example.py b/numpy/distutils/tests/swig_ext/tests/test_example.py index baedec642..4d8e81b49 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example.py @@ -1,5 +1,5 @@ import sys -from scipy.base.testing import * +from numpy.base.testing import * set_package_path() from swig_ext import example del sys.path[0] diff --git a/numpy/distutils/tests/swig_ext/tests/test_example2.py b/numpy/distutils/tests/swig_ext/tests/test_example2.py index af066be68..558d0d44a 100644 --- a/numpy/distutils/tests/swig_ext/tests/test_example2.py +++ b/numpy/distutils/tests/swig_ext/tests/test_example2.py @@ -1,5 +1,5 @@ import sys -from scipy.base.testing import * +from numpy.base.testing import * set_package_path() from swig_ext import example2 del sys.path[0] diff --git a/numpy/distutils/tests/test_misc_util.py b/numpy/distutils/tests/test_misc_util.py index 4ca21ea13..d1d53033c 100644 --- a/numpy/distutils/tests/test_misc_util.py +++ b/numpy/distutils/tests/test_misc_util.py @@ -1,6 +1,6 @@ import sys -from scipy.testing import * -from scipy.distutils.misc_util import appendpath +from numpy.testing import * +from numpy.distutils.misc_util import appendpath from os.path import join, sep ajoin = lambda *paths: join(*((sep,)+paths)) diff --git a/numpy/doc/CAPI.txt b/numpy/doc/CAPI.txt index f8bfd3981..7af8456b7 100644 --- a/numpy/doc/CAPI.txt +++ b/numpy/doc/CAPI.txt @@ -1,5 +1,5 @@ Author: Travis Oliphant -Discussions to: scipy-dev@scipy.org +Discussions to: numpy-dev@numpy.org Created: October 2005 The CAPI of SciPy is (mostly) backward compatible with Numeric. @@ -33,7 +33,7 @@ their function signatures. All of these headers are installed to -<YOUR_PYTHON_LOCATION>/site-packages/scipy/base/include +<YOUR_PYTHON_LOCATION>/site-packages/numpy/base/include Getting arrays in C-code diff --git a/numpy/doc/DISTUTILS.txt b/numpy/doc/DISTUTILS.txt index a08c50edf..1a9a8d255 100644 --- a/numpy/doc/DISTUTILS.txt +++ b/numpy/doc/DISTUTILS.txt @@ -4,7 +4,7 @@ Scipy Distutils - Users Guide ============================= :Author: Pearu Peterson <pearu@cens.ioc.ee> -:Discussions to: scipy-dev@scipy.org +:Discussions to: numpy-dev@numpy.org :Created: October 2005 :Revision: $LastChangedRevision$ :SVN source: $HeadURL$ @@ -16,11 +16,11 @@ Currently Scipy project consists of two packages: - Scipy core --- it provides packages like: - + scipy.distutils - extension to Python distutils - + scipy.f2py - a tool to bind Fortran/C codes to Python - + scipy.weave - a tool to bind C++ codes to Python - + scipy.base - future replacement of Numeric and numarray packages - + scipy.testing - scipy-style tools for unit testing + + numpy.distutils - extension to Python distutils + + numpy.f2py - a tool to bind Fortran/C codes to Python + + numpy.weave - a tool to bind C++ codes to Python + + numpy.base - future replacement of Numeric and numarray packages + + numpy.testing - numpy-style tools for unit testing + etc - Scipy --- a collection of Scientific tools for Python. @@ -32,7 +32,7 @@ Requirements for SciPy packages ''''''''''''''''''''''''''''''' Scipy consists of Python packages, called Scipy packages, that are -available to Python users via ``scipy`` name space. Each Scipy package +available to Python users via ``numpy`` name space. Each Scipy package may contain other Scipy packages. And so on. So, Scipy directory tree is a tree of packages with arbitrary depth and width. Any Scipy package may depend on Scipy core packages but the dependence on other @@ -55,9 +55,9 @@ In order to add a Python package to Scipy, its building script (the ``setup.py`` file) must meet certain requirements. The minimal and the most important one is that it must define a function ``configuration(parent_package='',top_path=None)`` that returns a -dictionary suitable for passing to ``scipy.distutils.core.setup(..)`` +dictionary suitable for passing to ``numpy.distutils.core.setup(..)`` function. In order to simplify the construction of such an distionary, -``scipy.distutils.misc_util`` provides a class ``Configuration``, the +``numpy.distutils.misc_util`` provides a class ``Configuration``, the usage of will be described below. Scipy pure Python package example @@ -68,12 +68,12 @@ Here follows a minimal example for a pure Python Scipy package #!/usr/bin/env python def configuration(parent_package='',top_path=None): - from scipy.distutils.misc_util import Configuration + from numpy.distutils.misc_util import Configuration config = Configuration('mypackage',parent_package,top_path) return config if __name__ == "__main__": - from scipy.distutils.core import setup + from numpy.distutils.core import setup setup(**configuration(top_path='').todict()) The first argument ``parent_package`` of the main configuration @@ -120,7 +120,7 @@ in writing setup scripts: ---------------------------------- + ``config.todict()`` --- returns configuration distionary suitable for - passing to ``scipy.distutils.core.setup(..)`` function. + passing to ``numpy.distutils.core.setup(..)`` function. + ``config.paths(*paths) --- applies ``glob.glob(..)`` to items of ``paths`` if necessary. Fixes ``paths`` item that is relative to @@ -242,7 +242,7 @@ in writing setup scripts: after processing all source generators, no extension module will be built. This is the recommended way to conditionally define extension modules. Source generator functions are called by the - ``build_src`` command of ``scipy.distutils``. + ``build_src`` command of ``numpy.distutils``. For example, here is a typical source generator function:: @@ -290,7 +290,7 @@ in writing setup scripts: + ``config.get_distribution()`` --- return distutils ``Distribution`` instance. -+ ``config.get_config_cmd()`` --- returns ``scipy.distutils`` config ++ ``config.get_config_cmd()`` --- returns ``numpy.distutils`` config command instance. Template files @@ -299,21 +299,21 @@ Template files XXX: Describe how files with extensions ``.f.src``, ``.pyf.src``, ``.c.src``, etc. are pre-processed by the ``build_src`` command. -Useful functions in ``scipy.distutils.misc_util`` +Useful functions in ``numpy.distutils.misc_util`` ------------------------------------------------- -+ ``get_scipy_include_dirs()`` --- return a list of Scipy base ++ ``get_numpy_include_dirs()`` --- return a list of Scipy base include directories. Scipy base include directories contain - header files such as ``scipy/arrayobject.h``, ``scipy/funcobject.h`` + header files such as ``numpy/arrayobject.h``, ``numpy/funcobject.h`` etc. For installed Scipy core the returned list has length 1 but when building Scipy core the list may contain more directories, for example, a path to ``config.h`` file that - ``scipy/base/setup.py`` file generates and is used by ``scipy`` + ``numpy/base/setup.py`` file generates and is used by ``numpy`` header files. + ``append_path(prefix,path)`` --- smart append ``path`` to ``prefix``. -+ ``def get_cmd(cmdname,_cache={})`` --- returns ``scipy.distutils`` ++ ``def get_cmd(cmdname,_cache={})`` --- returns ``numpy.distutils`` command instance. + ``all_strings(lst)`` @@ -353,25 +353,25 @@ Useful functions in ``scipy.distutils.misc_util`` + ``cxx_ext_match``, ``fortran_ext_match``, ``f90_ext_match``, ``f90_module_name_match`` -``scipy.distutils.system_info`` module +``numpy.distutils.system_info`` module -------------------------------------- + ``get_info(name,notfound_action=0)`` + ``combine_paths(*args,**kws)`` + ``show_all()`` -``scipy.distutils.cpuinfo`` module +``numpy.distutils.cpuinfo`` module ---------------------------------- + ``cpuinfo`` -``scipy.distutils.log`` module +``numpy.distutils.log`` module ------------------------------ + ``set_verbosity(v)`` -``scipy.distutils.exec_command`` module +``numpy.distutils.exec_command`` module --------------------------------------- + ``get_pythonexe()`` @@ -400,13 +400,13 @@ __all__ List of symbols that package exports. Optional. global_symbols - List of names that should be imported to scipy name space. To import - all symbols to ``scipy`` namespace, define ``global_symbols=['*']``. + List of names that should be imported to numpy name space. To import + all symbols to ``numpy`` namespace, define ``global_symbols=['*']``. depends - List of names that the package depends on. Prefix ``scipy.`` + List of names that the package depends on. Prefix ``numpy.`` will be automatically added to package names. For example, - use ``testing`` to indicate dependence on ``scipy.testing`` + use ``testing`` to indicate dependence on ``numpy.testing`` package. Default value is ``[]``. postpone_import @@ -417,7 +417,7 @@ postpone_import The ``__init__.py`` file '''''''''''''''''''''''' -To speed up the import time as well as to minimize memory usage, scipy +To speed up the import time as well as to minimize memory usage, numpy uses ppimport hooks to transparently postpone importing large modules that might not be used during the Scipy usage session. But in order to have an access to the documentation of all Scipy packages, including @@ -434,7 +434,7 @@ So, the header a typical ``__init__.py`` file is:: from info import __doc__ ... - from scipy.testing import ScipyTest + from numpy.testing import ScipyTest test = ScipyTest().test The ``tests/`` directory @@ -451,11 +451,11 @@ argument of these methods determine the level of the corresponding test. Default level is 1. A minimal example of a ``test_yyy.py`` file that implements tests for -a Scipy package module ``scipy.xxx.yyy`` containing a function +a Scipy package module ``numpy.xxx.yyy`` containing a function ``zzz()``, is shown below:: import sys - from scipy.testing import * + from numpy.testing import * set_package_path() # import xxx symbols @@ -479,7 +479,7 @@ a Scipy package module ``scipy.xxx.yyy`` containing a function basically only implements an additional method ``measure(self, code_str, times=1)``. -``scipy.testing`` module provides also the following convenience +``numpy.testing`` module provides also the following convenience functions:: assert_equal(actual,desired,err_msg='',verbose=1) diff --git a/numpy/f2py/Makefile b/numpy/f2py/Makefile index 91c199f99..4e53ac471 100644 --- a/numpy/f2py/Makefile +++ b/numpy/f2py/Makefile @@ -8,15 +8,15 @@ PYTHON=python MAJOR=2 F2PY2E_CVSROOT=:pserver:anonymous@cens.ioc.ee:/home/cvs -SCIPY_CVSROOT=:pserver:anonymous@scipy.org:/home/cvsroot +SCIPY_CVSROOT=:pserver:anonymous@numpy.org:/home/cvsroot UPLOADCMD = scp -r UPLOADDIR = pearu@kev.ioc.ee:/net/cens/home/www/unsecure/projects/f2py2e/ REV=`python -c 'from __version__ import *;print version'` -SCIPY_DISTUTILS_REV=`cd scipy_distutils && $(PYTHON) -c 'from scipy_distutils_version import *;print scipy_distutils_version' && cd ..` +SCIPY_DISTUTILS_REV=`cd numpy_distutils && $(PYTHON) -c 'from numpy_distutils_version import *;print numpy_distutils_version' && cd ..` -SRC_FILES = F2PY-$(MAJOR)-latest.tar.gz scipy_distutils-latest.tar.gz F2PY-$(MAJOR)-latest.win32.exe scipy_distutils-latest.win32.exe +SRC_FILES = F2PY-$(MAJOR)-latest.tar.gz numpy_distutils-latest.tar.gz F2PY-$(MAJOR)-latest.win32.exe numpy_distutils-latest.win32.exe HTML_FILES = index.html FAQ.html HISTORY.html THANKS.html TESTING.html OLDNEWS.html FAQ_DEPS = simple.f pytest.py pyforttest.pyf simple_session.dat @@ -64,25 +64,25 @@ f2py2e_latest: upload/tmp/$(MAJOR).x/F2PY-$(MAJOR)-latest.tar.gz upload/tmp/$(MA # Create Scipy_distutils tar-balls ############################################################################## -scipy_distutils: - test -d scipy_distutils && (cd scipy_distutils && cvs -d $(SCIPY_CVSROOT) -z7 update -Pd && cd -) || cvs -d $(SCIPY_CVSROOT) checkout scipy_distutils +numpy_distutils: + test -d numpy_distutils && (cd numpy_distutils && cvs -d $(SCIPY_CVSROOT) -z7 update -Pd && cd -) || cvs -d $(SCIPY_CVSROOT) checkout numpy_distutils -upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz: scipy_distutils - cd scipy_distutils && python setup.py sdist -f +upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz: numpy_distutils + cd numpy_distutils && python setup.py sdist -f mkdir -p upload/tmp/$(MAJOR).x - cp scipy_distutils/dist/scipy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz upload/tmp/$(MAJOR).x - ln -sf scipy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz scipy_distutils-latest.tar.gz - mv scipy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x -upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe: scipy_distutils - cd scipy_distutils && python setup.py bdist_wininst + cp numpy_distutils/dist/numpy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz upload/tmp/$(MAJOR).x + ln -sf numpy_distutils-$(SCIPY_DISTUTILS_REV).tar.gz numpy_distutils-latest.tar.gz + mv numpy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x +upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe: numpy_distutils + cd numpy_distutils && python setup.py bdist_wininst mkdir -p upload/tmp/$(MAJOR).x - cp scipy_distutils/dist/scipy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe upload/tmp/$(MAJOR).x - ln -sf scipy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe scipy_distutils-latest.win32.exe - mv scipy_distutils-latest.win32.exe upload/tmp/$(MAJOR).x + cp numpy_distutils/dist/numpy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe upload/tmp/$(MAJOR).x + ln -sf numpy_distutils-$(SCIPY_DISTUTILS_REV).win32.exe numpy_distutils-latest.win32.exe + mv numpy_distutils-latest.win32.exe upload/tmp/$(MAJOR).x -scipy_distutils_latest: upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe +numpy_distutils_latest: upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe -latest: f2py2e_latest scipy_distutils_latest +latest: f2py2e_latest numpy_distutils_latest ############################################################################## # Upload files. @@ -92,18 +92,18 @@ upload/www/$(MAJOR).x/F2PY-$(MAJOR)-latest.tar.gz: upload/tmp/$(MAJOR).x/F2PY-$( -mkdir -p `dirname $@` cp -P upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.tar.gz upload/www/$(MAJOR).x $(UPLOADCMD) upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x/ -upload/www/$(MAJOR).x/scipy_distutils-latest.tar.gz: upload/tmp/$(MAJOR).x/scipy_distutils-latest.tar.gz +upload/www/$(MAJOR).x/numpy_distutils-latest.tar.gz: upload/tmp/$(MAJOR).x/numpy_distutils-latest.tar.gz -mkdir -p `dirname $@` - cp -P upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz upload/www/$(MAJOR).x/ - $(UPLOADCMD) upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x + cp -P upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz upload/www/$(MAJOR).x/ + $(UPLOADCMD) upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.tar.gz $(UPLOADDIR)/$(MAJOR).x upload/www/$(MAJOR).x/F2PY-$(MAJOR)-latest.win32.exe: upload/tmp/$(MAJOR).x/F2PY-$(MAJOR)-latest.win32.exe -mkdir -p `dirname $@` cp -P upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.win32.exe upload/www/$(MAJOR).x $(UPLOADCMD) upload/tmp/$(MAJOR).x/F2PY-{$(MAJOR)-latest,$(REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/ -upload/www/$(MAJOR).x/scipy_distutils-latest.win32.exe: upload/tmp/$(MAJOR).x/scipy_distutils-latest.win32.exe +upload/www/$(MAJOR).x/numpy_distutils-latest.win32.exe: upload/tmp/$(MAJOR).x/numpy_distutils-latest.win32.exe -mkdir -p `dirname $@` - cp -P upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe upload/www/$(MAJOR).x - $(UPLOADCMD) upload/tmp/$(MAJOR).x/scipy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/ + cp -P upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe upload/www/$(MAJOR).x + $(UPLOADCMD) upload/tmp/$(MAJOR).x/numpy_distutils-{latest,$(SCIPY_DISTUTILS_REV)}.win32.exe $(UPLOADDIR)/$(MAJOR).x/ upload/tmp/usersguide/index.html: docs/usersguide/index.txt $(UG_FILES_DEP:%=upload/www/usersguide/%) -mkdir -p upload/tmp/usersguide @@ -167,7 +167,7 @@ clean: distclean: clean rm -f {tests/,src/,}*~ rm -f tests/*.{f,f90} - rm -rf dist {docs/,docs/usersguide/,}build f2py2e scipy_distutils upload + rm -rf dist {docs/,docs/usersguide/,}build f2py2e numpy_distutils upload rm -f MANIFEST f2py?.? f2py .PHONY: install test diff --git a/numpy/f2py/TODO.txt b/numpy/f2py/TODO.txt index fd655f2e2..093f0119e 100644 --- a/numpy/f2py/TODO.txt +++ b/numpy/f2py/TODO.txt @@ -1,5 +1,5 @@ Determine fixed/free format Fortran 90 dialect from the -contents of Fortran files. See scipy_distutils/command/build_flib.py. +contents of Fortran files. See numpy_distutils/command/build_flib.py. [DONE] ======================================================================== diff --git a/numpy/f2py/__init__.py b/numpy/f2py/__init__.py index 5c2c3e927..896156e16 100644 --- a/numpy/f2py/__init__.py +++ b/numpy/f2py/__init__.py @@ -21,7 +21,7 @@ def compile(source, ''' Build extension module from processing source with f2py. Read the source of this function for more information. ''' - from scipy.distutils.exec_command import exec_command + from numpy.distutils.exec_command import exec_command if source_fn is None: fname = os.path.join(tempfile.mktemp()+'.f') else: @@ -32,7 +32,7 @@ def compile(source, f.close() args = ' -c -m %s %s %s'%(modulename,fname,extra_args) - c = '%s -c "import scipy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable,args) + c = '%s -c "import numpy.f2py as f2py2e;f2py2e.main()" %s' %(sys.executable,args) s,o = exec_command(c) if source_fn is None: try: os.remove(fname) diff --git a/numpy/f2py/diagnose.py b/numpy/f2py/diagnose.py index 34784b39c..e4afffdd4 100644 --- a/numpy/f2py/diagnose.py +++ b/numpy/f2py/diagnose.py @@ -35,11 +35,11 @@ def run(): print 'Failed to import numarray:',sys.exc_value has_numarray = 0 try: - import scipy.base - has_newscipy = 1 + import numpy.base + has_newnumpy = 1 except ImportError: - print 'Failed to import new scipy:', sys.exc_value - has_newscipy = 0 + print 'Failed to import new numpy:', sys.exc_value + has_newnumpy = 0 try: import f2py2e has_f2py2e = 1 @@ -47,15 +47,15 @@ def run(): print 'Failed to import f2py2e:',sys.exc_value has_f2py2e = 0 try: - import scipy.distutils - has_scipy_distutils = 2 + import numpy.distutils + has_numpy_distutils = 2 except ImportError: try: - import scipy_distutils - has_scipy_distutils = 1 + import numpy_distutils + has_numpy_distutils = 1 except ImportError: - print 'Failed to import scipy_distutils:',sys.exc_value - has_scipy_distutils = 0 + print 'Failed to import numpy_distutils:',sys.exc_value + has_numpy_distutils = 0 if has_Numeric: try: print 'Found Numeric version %r in %s' % \ @@ -70,10 +70,10 @@ def run(): except Exception,msg: print 'error:',msg print '------' - if has_newscipy: + if has_newnumpy: try: - print 'Found new scipy version %r in %s' % \ - (scipy.__version__, scipy.__file__) + print 'Found new numpy version %r in %s' % \ + (numpy.__version__, numpy.__file__) except Exception,msg: print 'error:', msg print '------' @@ -84,24 +84,24 @@ def run(): except Exception,msg: print 'error:',msg print '------' - if has_scipy_distutils: + if has_numpy_distutils: try: - if has_scipy_distutils==2: - print 'Found scipy.distutils version %r in %r' % (\ - scipy.distutils.__version__, - scipy.distutils.__file__) + if has_numpy_distutils==2: + print 'Found numpy.distutils version %r in %r' % (\ + numpy.distutils.__version__, + numpy.distutils.__file__) else: - print 'Found scipy_distutils version %r in %r' % (\ - scipy_distutils.scipy_distutils_version.scipy_distutils_version, - scipy_distutils.__file__) + print 'Found numpy_distutils version %r in %r' % (\ + numpy_distutils.numpy_distutils_version.numpy_distutils_version, + numpy_distutils.__file__) print '------' except Exception,msg: print 'error:',msg print '------' try: - if has_scipy_distutils==1: - print 'Importing scipy_distutils.command.build_flib ...', - import scipy_distutils.command.build_flib as build_flib + if has_numpy_distutils==1: + print 'Importing numpy_distutils.command.build_flib ...', + import numpy_distutils.command.build_flib as build_flib print 'ok' print '------' try: @@ -113,15 +113,15 @@ def run(): print 'error:',msg print '------' except Exception,msg: - print 'error:',msg,'(ignore it, build_flib is obsolute for scipy.distutils 0.2.2 and up)' + print 'error:',msg,'(ignore it, build_flib is obsolute for numpy.distutils 0.2.2 and up)' print '------' try: - if has_scipy_distutils==2: - print 'Importing scipy.distutils.fcompiler ...', - import scipy.distutils.fcompiler as fcompiler + if has_numpy_distutils==2: + print 'Importing numpy.distutils.fcompiler ...', + import numpy.distutils.fcompiler as fcompiler else: - print 'Importing scipy_distutils.fcompiler ...', - import scipy_distutils.fcompiler as fcompiler + print 'Importing numpy_distutils.fcompiler ...', + import numpy_distutils.fcompiler as fcompiler print 'ok' print '------' try: @@ -135,21 +135,21 @@ def run(): print 'error:',msg print '------' try: - if has_scipy_distutils==2: - print 'Importing scipy.distutils.cpuinfo ...', - from scipy.distutils.cpuinfo import cpuinfo + if has_numpy_distutils==2: + print 'Importing numpy.distutils.cpuinfo ...', + from numpy.distutils.cpuinfo import cpuinfo print 'ok' print '------' else: try: - print 'Importing scipy_distutils.command.cpuinfo ...', - from scipy_distutils.command.cpuinfo import cpuinfo + print 'Importing numpy_distutils.command.cpuinfo ...', + from numpy_distutils.command.cpuinfo import cpuinfo print 'ok' print '------' except Exception,msg: print 'error:',msg,'(ignore it)' - print 'Importing scipy_distutils.cpuinfo ...', - from scipy_distutils.cpuinfo import cpuinfo + print 'Importing numpy_distutils.cpuinfo ...', + from numpy_distutils.cpuinfo import cpuinfo print 'ok' print '------' cpu = cpuinfo() diff --git a/numpy/f2py/doc/index.html b/numpy/f2py/doc/index.html index abddd7d43..6b6466b75 100644 --- a/numpy/f2py/doc/index.html +++ b/numpy/f2py/doc/index.html @@ -100,7 +100,7 @@ For more information, see the <a href="usersguide.html">User's Guide</a> of the tool. Windows users should also take a look at <a href="win32_notes.txt">f2py HOWTO for Win32</a> (its latest version can be found <a -href="http://www.scipy.org/Members/eric/f2py_win32">here</a>). +href="http://www.numpy.org/Members/eric/f2py_win32">here</a>). <h3>Requirements</h3> <ol> @@ -210,7 +210,7 @@ You can browse <code>f2py</code> CVS repository <a href="http://cens.ioc.ee/cgi- <li> <a href="http://pfdubois.com/numpy/" target="_top">Numerical Python</a>. <li> <a href="http://pyfortran.sourceforge.net/" target="_top">Pyfort</a> -- The Python-Fortran connection tool. <li> <a href="http://starship.python.net/crew/hinsen/scientific.html" target="_top">Scientific Python</a>. - <li> <a href="http://scipy.org/" target="_top">SciPy</a> -- Scientific tools for Python (includes Multipack). + <li> <a href="http://numpy.org/" target="_top">SciPy</a> -- Scientific tools for Python (includes Multipack). <li> <a href="http://www.fortran.com/fortran/" target="_top">The Fortran Company</a>. <li> <a href="http://www.j3-fortran.org/" target="_top">Fortran Standards</a>. diff --git a/numpy/f2py/doc/oldnews.html b/numpy/f2py/doc/oldnews.html index 914265bbe..0e09c032f 100644 --- a/numpy/f2py/doc/oldnews.html +++ b/numpy/f2py/doc/oldnews.html @@ -22,7 +22,7 @@ proper prototypes can be specified (this fixes SEGFAULTs when wrapping C functions with <code>f2py</code>, see <a href="NEWS.txt">NEWS.txt</a> for more details). Updated for the - latest <code>scipy_distutils</code>. Fixed few bugs. + latest <code>numpy_distutils</code>. Fixed few bugs. <dt> February 3, 2002 <dd> Introduced <code>intent(overwrite),intent(out=name)</code> attributes, <code>callstatement C-expr;</code> statement, and diff --git a/numpy/f2py/docs/FAQ.txt b/numpy/f2py/docs/FAQ.txt index e2ed79445..416560e92 100644 --- a/numpy/f2py/docs/FAQ.txt +++ b/numpy/f2py/docs/FAQ.txt @@ -93,30 +93,30 @@ If upgrading from F2PY version 2.3.321 or earlier then remove all f2py specific files from ``/path/to/python/bin`` directory before running installation command. -Q: How to get/upgrade scipy_distutils when using F2PY from CVS? +Q: How to get/upgrade numpy_distutils when using F2PY from CVS? --------------------------------------------------------------- -To get scipy_distutils from SciPy CVS repository, run +To get numpy_distutils from SciPy CVS repository, run :: cd cvs/f2py2e/ - make scipy_distutils + make numpy_distutils -This will checkout scipy_distutils to the current directory. +This will checkout numpy_distutils to the current directory. -You can upgrade scipy_distutils by executing +You can upgrade numpy_distutils by executing :: - cd cvs/f2py2e/scipy_distutils + cd cvs/f2py2e/numpy_distutils cvs update -Pd and install it by executing :: - cd cvs/f2py2e/scipy_distutils - python setup_scipy_distutils.py install + cd cvs/f2py2e/numpy_distutils + python setup_numpy_distutils.py install -In most of the time, f2py2e and scipy_distutils can be upgraded +In most of the time, f2py2e and numpy_distutils can be upgraded independently. Testing @@ -210,9 +210,9 @@ See the section `Setting up environment`__ for Cygwin and MinGW. __ http://cygwin.com/ __ http://www.mingw.org/ -__ http://cens.ioc.ee/~pearu/scipy/BUILD_WIN32.html#setting-up-environment +__ http://cens.ioc.ee/~pearu/numpy/BUILD_WIN32.html#setting-up-environment -Install scipy_distutils and F2PY. Win32 installers of these packages +Install numpy_distutils and F2PY. Win32 installers of these packages are provided in `F2PY Download`__ section. __ http://cens.ioc.ee/projects/f2py2e/#download @@ -412,14 +412,14 @@ This question may be releavant when using F2PY in Makefiles. Here follows a script demonstrating how to determine which Fortran compiler and flags F2PY will use:: - # Using post-0.2.2 scipy_distutils - from scipy_distutils.fcompiler import new_fcompiler + # Using post-0.2.2 numpy_distutils + from numpy_distutils.fcompiler import new_fcompiler compiler = new_fcompiler() # or new_fcompiler(compiler='intel') compiler.dump_properties() - # Using pre-0.2.2 scipy_distutils + # Using pre-0.2.2 numpy_distutils import os - from scipy_distutils.command.build_flib import find_fortran_compiler + from numpy_distutils.command.build_flib import find_fortran_compiler def main(): fcompiler = os.environ.get('FC_VENDOR') fcompiler_exec = os.environ.get('F77') @@ -513,7 +513,7 @@ __ https://geodoc.uchicago.edu/climatewiki/WrappingBenchmarks + `Performance Python with Weave`__ by Prabhu Ramachandran. -__ http://www.scipy.org/documentation/weave/weaveperformance.html +__ http://www.numpy.org/documentation/weave/weaveperformance.html + `How To Install py-f2py on Mac OSX`__ @@ -527,7 +527,7 @@ Q: What projects use F2PY? + `SciPy: Scientific tools for Python`__ -__ http://www.scipy.org/ +__ http://www.numpy.org/ + `The Bolometer Data Analysis Project`__ @@ -573,7 +573,7 @@ Here are some comments people have posted to f2py mailing list and c.l.py: + Fernando Perez: Anyway, many many thanks for this amazing tool. I haven't used pyfort, but I can definitely vouch for the amazing quality of - f2py. And since f2py is actively used by scipy, it won't go unmaintained. + f2py. And since f2py is actively used by numpy, it won't go unmaintained. It's quite impressive, and very easy to use. + Kevin Mueller: First off, thanks to those responsible for F2PY; diff --git a/numpy/f2py/docs/HISTORY.txt b/numpy/f2py/docs/HISTORY.txt index 876ab2362..72b683eb0 100644 --- a/numpy/f2py/docs/HISTORY.txt +++ b/numpy/f2py/docs/HISTORY.txt @@ -27,7 +27,7 @@ Release 2.46.243 * f2py2e.py - - Added support for scipy.distutils version 0.4.0. + - Added support for numpy.distutils version 0.4.0. * Documentation @@ -111,8 +111,8 @@ Release 2.45.241_1926 * setup.py - Clean up. - - Disabled ``need_scipy_distutils`` function. From now on it is assumed - that proper version of ``scipy_distutils`` is already installed. + - Disabled ``need_numpy_distutils`` function. From now on it is assumed + that proper version of ``numpy_distutils`` is already installed. * capi_maps.py @@ -168,7 +168,7 @@ Release 2.43.239_1831 - Intoduced ``--help-link`` and ``--link-<resource>`` switches to link generated extension module with system - ``<resource>`` as defined by scipy_distutils/system_info.py. + ``<resource>`` as defined by numpy_distutils/system_info.py. * fortranobject.c @@ -356,7 +356,7 @@ Release 2.39.235_1644 * docs - Initial f2py manpage file f2py.1. - - Updated usersguide and other docs when using scipy_distutils 0.2.2 + - Updated usersguide and other docs when using numpy_distutils 0.2.2 and up. * capi_maps.py @@ -383,7 +383,7 @@ Release 2.39.235_1644 * diagnose.py - - Updated for scipy_distutils 0.2.2 and up. + - Updated for numpy_distutils 0.2.2 and up. - Added numarray support to diagnose. * fortranobject.c @@ -394,7 +394,7 @@ Release 2.39.235_1644 * f2py2e.py - - Applying new hooks for scipy_distutils 0.2.2 and up, keeping + - Applying new hooks for numpy_distutils 0.2.2 and up, keeping backward compatibility with depreciation messages. - Using always os.system on non-posix platforms in f2py2e.compile function. @@ -410,8 +410,8 @@ Release 2.39.235_1644 * setup.py - Installing f2py.py instead of f2py.bat under NT. - - Introduced ``--with-scipy_distutils`` that is useful when making - f2py tar-ball with scipy_distutils included. + - Introduced ``--with-numpy_distutils`` that is useful when making + f2py tar-ball with numpy_distutils included. Release 2.37.233-1545 ===================== @@ -466,7 +466,7 @@ Release 2.35.229-1505 * setup.py - - Updated the CVS location of scipy_distutils. + - Updated the CVS location of numpy_distutils. * auxfuncs.py @@ -566,7 +566,7 @@ Public Release 2.32.225-1419 * setup.py - - Install scipy_distutils only if it is missing or is too old + - Install numpy_distutils only if it is missing or is too old for f2py. * f90modrules.py @@ -667,7 +667,7 @@ Public Release 2.32.225-1419 - Introduced dummy routine feature. - F77 and F90 wrapper subroutines (if any) as saved to different files, <modulename>-f2pywrappers.f and <modulename>-f2pywrappers2.f90, - respectively. Therefore, wrapping F90 requires scipy_distutils >= + respectively. Therefore, wrapping F90 requires numpy_distutils >= 0.2.0_alpha_2.229. - Fixed compiler warnings about meaningless ``const void (*f2py_func)(..)``. - Improved error messages for ``*_from_pyobj``. @@ -739,7 +739,7 @@ Older Releases *** Cleaned up the output of 'f2py -h': removed obsolete items, added build_flib options section. *** Added --help-compiler option: it lists available Fortran compilers - as detected by scipy_distutils/command/build_flib.py. This option + as detected by numpy_distutils/command/build_flib.py. This option is available only with -c option. @@ -789,7 +789,7 @@ Older Releases :: - *** Updated f2py for the latest scipy_distutils. + *** Updated f2py for the latest numpy_distutils. *** A nasty bug with multi-dimensional Fortran arrays is fixed (intent(out) arrays had wrong shapes). (Thanks to Eric for pointing out this bug). @@ -801,7 +801,7 @@ Older Releases :: - *** Updated f2py for the latest scipy_distutils. + *** Updated f2py for the latest numpy_distutils. *** Fixed raise error when f2py missed -m flag. *** Script name `f2py' now depends on the name of python executable. For example, `python2.2 setup.py install' will create a f2py @@ -924,7 +924,7 @@ Older Releases *** Fixed -c process. Removed pyf_extensions function and pyf_file class. *** Reorganized setup.py. It generates f2py or f2py.bat scripts depending on the OS and the location of the python executable. - *** Started to use update_version from scipy_distutils that makes + *** Started to use update_version from numpy_distutils that makes f2py startup faster. As a side effect, the version number system changed. *** Introduced test-site/test_f2py2e.py script that runs all @@ -933,20 +933,20 @@ Older Releases when run_main is called several times. *** Added 'import Numeric' to C/API init<module> function. *** Fixed f2py.bat in setup.py. - *** Switched over to scipy_distutils and dropped fortran_support. + *** Switched over to numpy_distutils and dropped fortran_support. *** On Windows create f2py.bat file. *** Introduced -c option: read fortran or pyf files, construct extension modules, build, and save them to current directory. In one word: do-it-all-in-one-call. *** Introduced pyf_extensions(sources,f2py_opts) function. It simplifies the extension building process considerably. Only for internal use. - *** Converted tests to use scipy_distutils in order to improve portability: + *** Converted tests to use numpy_distutils in order to improve portability: a,b,c *** f2py2e.run_main() returns a pyf_file class instance containing information about f2py generated files. *** Introduced `--build-dir <dirname>' command line option. *** Fixed setup.py for bdist_rpm command. - *** Added --scipy-setup command line option. + *** Added --numpy-setup command line option. *** Fixed crackfortran that did not recognized capitalized type specification with --no-lower flag. *** `-h stdout' writes signature to stdout. diff --git a/numpy/f2py/docs/OLDNEWS.txt b/numpy/f2py/docs/OLDNEWS.txt index b21215464..401d2dcee 100644 --- a/numpy/f2py/docs/OLDNEWS.txt +++ b/numpy/f2py/docs/OLDNEWS.txt @@ -19,7 +19,7 @@ February 24, 2004 Latest F2PY release (version 2.39.235-1644). - Support for scipy_distutils 0.2.2 and up (e.g. compiler flags can be + Support for numpy_distutils 0.2.2 and up (e.g. compiler flags can be changed via f2py command line options). Implemented support for character arrays and arrays of strings (e.g. ``character*(*) a(m,..)``). *Important bug fixes regarding complex arguments, upgrading is diff --git a/numpy/f2py/docs/README.txt b/numpy/f2py/docs/README.txt index fc7149645..bc1aa6943 100644 --- a/numpy/f2py/docs/README.txt +++ b/numpy/f2py/docs/README.txt @@ -82,7 +82,7 @@ facilitate: multi-dimensional Fortran and Numerical Python (i.e. C) arrays. In addition, F2PY can build the generated extension modules to shared -libraries with one command. F2PY uses the ``scipy_distutils`` module +libraries with one command. F2PY uses the ``numpy_distutils`` module from SciPy_ that supports number of major Fortran compilers. .. @@ -196,17 +196,17 @@ and/or Fortran compilers installed. Download ========== -You can download the sources for the latest F2PY and scipy_distutils +You can download the sources for the latest F2PY and numpy_distutils releases as: * `2.x`__/`F2PY-2-latest.tar.gz`__ -* `2.x`__/`scipy_distutils-latest.tar.gz`__ +* `2.x`__/`numpy_distutils-latest.tar.gz`__ Windows users might be interested in Win32 installer for F2PY and Scipy_distutils (these installers are built using Python 2.3): * `2.x`__/`F2PY-2-latest.win32.exe`__ -* `2.x`__/`scipy_distutils-latest.win32.exe`__ +* `2.x`__/`numpy_distutils-latest.win32.exe`__ Older releases are also available in the directories `rel-0.x`__, `rel-1.x`__, `rel-2.x`__, `rel-3.x`__, `rel-4.x`__, `rel-5.x`__, @@ -215,11 +215,11 @@ if you need them. .. __: 2.x/ .. __: 2.x/F2PY-2-latest.tar.gz .. __: 2.x/ -.. __: 2.x/scipy_distutils-latest.tar.gz +.. __: 2.x/numpy_distutils-latest.tar.gz .. __: 2.x/ .. __: 2.x/F2PY-2-latest.win32.exe .. __: 2.x/ -.. __: 2.x/scipy_distutils-latest.win32.exe +.. __: 2.x/numpy_distutils-latest.win32.exe .. __: rel-0.x .. __: rel-1.x .. __: rel-2.x @@ -250,7 +250,7 @@ See also Installation__ section in `F2PY FAQ`_. .. __: FAQ.html#installation -Similarly, to install ``scipy_distutils``, unpack its tar-ball and run:: +Similarly, to install ``numpy_distutils``, unpack its tar-ball and run:: python setup.py install @@ -433,7 +433,7 @@ __ http://jrfonseca.dyndns.org/debian/ .. _CVS: http://www.cvshome.org/ .. _Python: http://www.python.org/ -.. _SciPy: http://www.scipy.org/ +.. _SciPy: http://www.numpy.org/ .. _NumPy: http://www.numpy.org/ .. _Numarray: http://www.stsci.edu/resources/software_hardware/numarray .. _docutils: http://docutils.sourceforge.net/ diff --git a/numpy/f2py/docs/TESTING.txt b/numpy/f2py/docs/TESTING.txt index feae18dc6..d90521175 100644 --- a/numpy/f2py/docs/TESTING.txt +++ b/numpy/f2py/docs/TESTING.txt @@ -98,7 +98,7 @@ scripts: f2py -c --help-fcompiler to find out what compilers are available (or more precisely, which - ones are recognized by ``scipy_distutils``). + ones are recognized by ``numpy_distutils``). Reporting failures ------------------ diff --git a/numpy/f2py/docs/THANKS.txt b/numpy/f2py/docs/THANKS.txt index cbaa083fc..737e17134 100644 --- a/numpy/f2py/docs/THANKS.txt +++ b/numpy/f2py/docs/THANKS.txt @@ -43,7 +43,7 @@ out and let me know, I'll add your name.) Special thanks are due to ... Eric Jones - he and Travis O. are responsible for starting the -scipy_distutils project that allowed to move most of the platform and +numpy_distutils project that allowed to move most of the platform and compiler specific codes out from F2PY. This simplified maintaining the F2PY project considerably. diff --git a/numpy/f2py/docs/usersguide/index.txt b/numpy/f2py/docs/usersguide/index.txt index 9fafb99fb..5a8d12c68 100644 --- a/numpy/f2py/docs/usersguide/index.txt +++ b/numpy/f2py/docs/usersguide/index.txt @@ -56,7 +56,7 @@ following steps: * F2PY compiles all sources and builds an extension module containing the wrappers. In building extension modules, F2PY uses - ``scipy_distutils`` that supports a number of Fortran 77/90/95 + ``numpy_distutils`` that supports a number of Fortran 77/90/95 compilers, including Gnu, Intel, Sun Fortre, SGI MIPSpro, Absoft, NAG, Compaq etc. compilers. @@ -1458,7 +1458,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches: Search include files from given directories. ``--help-link [<list of resources names>]`` - List system resources found by ``scipy_distutils/system_info.py``. + List system resources found by ``numpy_distutils/system_info.py``. For example, try ``f2py --help-link lapack_opt``. 3. To build an extension module, use @@ -1529,7 +1529,7 @@ distinguished by the usage of ``-c`` and ``-h`` switches: ``link-<resource>`` Link extension module with <resource> as defined by - ``scipy_distutils/system_info.py``. E.g. to link with optimized + ``numpy_distutils/system_info.py``. E.g. to link with optimized LAPACK libraries (vecLib on MacOSX, ATLAS elsewhere), use ``--link-lapack_opt``. See also ``--help-link`` switch. @@ -1612,10 +1612,10 @@ The following functions are provided by the ``f2py2e`` module: :literal: ========================== -Using ``scipy_distutils`` +Using ``numpy_distutils`` ========================== -``scipy_distutils`` is part of the SciPy_ project and aims to extend +``numpy_distutils`` is part of the SciPy_ project and aims to extend standard Python ``distutils`` to deal with Fortran sources and F2PY signature files, e.g. compile Fortran sources, call F2PY to construct extension modules, etc. @@ -1638,7 +1638,7 @@ extension modules, etc. __ setup_example.py -``scipy_distutils`` extends ``distutils`` with the following features: +``numpy_distutils`` extends ``distutils`` with the following features: * ``Extension`` class argument ``sources`` may contain Fortran source files. In addition, the list ``sources`` may contain at most one @@ -1654,7 +1654,7 @@ extension modules, etc. Additional options to F2PY process can be given using ``Extension`` class argument ``f2py_options``. -``scipy_distutils`` 0.2.2 and up +``numpy_distutils`` 0.2.2 and up ================================ * The following new ``distutils`` commands are defined: @@ -1682,14 +1682,14 @@ extension modules, etc. absoft sun mips intel intelv intele intelev nag compaq compaqv gnu vast pg hpux - See ``scipy_distutils/fcompiler.py`` for up-to-date list of + See ``numpy_distutils/fcompiler.py`` for up-to-date list of supported compilers or run :: f2py -c --help-fcompiler -``scipy_distutils`` pre 0.2.2 +``numpy_distutils`` pre 0.2.2 ============================= * The following new ``distutils`` commands are defined: @@ -1715,7 +1715,7 @@ extension modules, etc. Absoft Sun SGI Intel Itanium NAG Compaq Digital Gnu VAST PG - See ``scipy_distutils/command/build_flib.py`` for up-to-date list of + See ``numpy_distutils/command/build_flib.py`` for up-to-date list of supported compilers. ====================== @@ -1769,4 +1769,4 @@ In Python: .. _F2PY: http://cens.ioc.ee/projects/f2py2e/ .. _Python: http://www.python.org/ .. _NumPy: http://www.numpy.org/ -.. _SciPy: http://www.scipy.org/ +.. _SciPy: http://www.numpy.org/ diff --git a/numpy/f2py/docs/usersguide/setup_example.py b/numpy/f2py/docs/usersguide/setup_example.py index a7d27403a..e5f5e8441 100644 --- a/numpy/f2py/docs/usersguide/setup_example.py +++ b/numpy/f2py/docs/usersguide/setup_example.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # File: setup_example.py -from scipy_distutils.core import Extension +from numpy_distutils.core import Extension ext1 = Extension(name = 'scalar', sources = ['scalar.f']) @@ -9,7 +9,7 @@ ext2 = Extension(name = 'fib2', sources = ['fib2.pyf','fib1.f']) if __name__ == "__main__": - from scipy_distutils.core import setup + from numpy_distutils.core import setup setup(name = 'f2py_example', description = "F2PY Users Guide examples", author = "Pearu Peterson", diff --git a/numpy/f2py/f2py.1 b/numpy/f2py/f2py.1 index 3b9f054af..5ca9a3ab5 100644 --- a/numpy/f2py/f2py.1 +++ b/numpy/f2py/f2py.1 @@ -151,7 +151,7 @@ The following options are effective only when -c switch is used. .TP .B \-\-link-<resource> Link extension module with <resource> as defined by -scipy_distutils/system_info.py. E.g. to link with optimized LAPACK +numpy_distutils/system_info.py. E.g. to link with optimized LAPACK libraries (vecLib on MacOSX, ATLAS elsewhere), use --link-lapack_opt. See also --help-link switch. @@ -184,7 +184,7 @@ Numerical Python 13 or higher (20.x,21.x,22.x,23.x are supported). Optional Numarray 0.9 or higher partially supported. -scipy_distutils from Scipy (can be downloaded from F2PY homepage) +numpy_distutils from Scipy (can be downloaded from F2PY homepage) .SH "SEE ALSO" python(1) .SH BUGS @@ -200,7 +200,7 @@ User's Guide: http://cens.ioc.ee/projects/f2py2e/usersguide/ Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/ -Scipy website: http://www.scipy.org +Scipy website: http://www.numpy.org .SH COPYRIGHT Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson .SH LICENSE diff --git a/numpy/f2py/f2py2e.py b/numpy/f2py/f2py2e.py index 6230590d1..384359347 100755 --- a/numpy/f2py/f2py2e.py +++ b/numpy/f2py/f2py2e.py @@ -36,9 +36,9 @@ import f90mod_rules outmess = auxfuncs.outmess try: - from scipy import __core_version__ as scipy_core_version + from numpy import __core_version__ as numpy_core_version except ImportError: - scipy_distutils_version = 'N/A' + numpy_distutils_version = 'N/A' __usage__ = """\ Usage: @@ -117,7 +117,7 @@ Options: -v Print f2py version ID and exit. -scipy.distutils options (only effective with -c): +numpy.distutils options (only effective with -c): --fcompiler= Specify Fortran compiler type by vendor --compiler= Specify C compiler type (as defined by distutils) @@ -136,7 +136,7 @@ scipy.distutils options (only effective with -c): Extra options (only effective with -c): --link-<resource> Link extension module with <resource> as defined - by scipy.distutils/system_info.py. E.g. to link + by numpy.distutils/system_info.py. E.g. to link with optimized LAPACK libraries (vecLib on MacOSX, ATLAS elsewhere), use --link-lapack_opt. See also --help-link switch. @@ -160,11 +160,11 @@ Extra options (only effective with -c): a message should be shown. Version: %s -scipy_core Version: %s +numpy_core Version: %s Requires: Python 2.3 or higher. License: LGPL (see http://www.fsf.org) Copyright 1999 - 2005 Pearu Peterson all rights reserved. -http://cens.ioc.ee/projects/f2py2e/"""%(f2py_version, scipy_core_version) +http://cens.ioc.ee/projects/f2py2e/"""%(f2py_version, numpy_core_version) def scaninputline(inputline): @@ -430,7 +430,7 @@ def run_compile(): for s in flib_flags: v = '--fcompiler=' if s[:len(v)]==v: - from scipy.distutils import fcompiler + from numpy.distutils import fcompiler allowed_keys = fcompiler.fcompiler_class.keys() nv = ov = s[len(v):].lower() if ov not in allowed_keys: @@ -461,7 +461,7 @@ def run_compile(): del sys.argv[i+1],sys.argv[i] sources = sys.argv[1:] else: - from scipy.distutils.command.build_src import get_f2py_modulename + from numpy.distutils.command.build_src import get_f2py_modulename pyf_files,sources = filter_files('','[.]pyf([.]src|)',sources) sources = pyf_files + sources for f in pyf_files: @@ -486,20 +486,20 @@ def run_compile(): else: print 'Invalid use of -D:',name_value - from scipy.distutils.system_info import get_info + from numpy.distutils.system_info import get_info num_include_dir = None num_info = {} - #import scipy - #n = 'scipy' - #p = get_prefix(scipy) - #from scipy.distutils.misc_util import get_scipy_include_dirs - #num_info = {'include_dirs': get_scipy_include_dirs()} + #import numpy + #n = 'numpy' + #p = get_prefix(numpy) + #from numpy.distutils.misc_util import get_numpy_include_dirs + #num_info = {'include_dirs': get_numpy_include_dirs()} if num_info: include_dirs.extend(num_info.get('include_dirs',[])) - from scipy.distutils.core import setup,Extension + from numpy.distutils.core import setup,Extension ext_args = {'name':modulename,'sources':sources, 'include_dirs': include_dirs, 'library_dirs': library_dirs, @@ -511,7 +511,7 @@ def run_compile(): } if sysinfo_flags: - from scipy.distutils.misc_util import dict_append + from numpy.distutils.misc_util import dict_append for n in sysinfo_flags: i = get_info(n) if not i: @@ -539,7 +539,7 @@ def run_compile(): def main(): if '--help-link' in sys.argv[1:]: sys.argv.remove('--help-link') - from scipy.distutils.system_info import show_all + from numpy.distutils.system_info import show_all show_all() return if '-c' in sys.argv[1:]: diff --git a/numpy/f2py/rules.py b/numpy/f2py/rules.py index cb2d78e65..d61489951 100644 --- a/numpy/f2py/rules.py +++ b/numpy/f2py/rules.py @@ -174,7 +174,7 @@ DL_EXPORT(void) init#modulename#(void) { \tPyFortran_Type.ob_type = &PyType_Type; \timport_array(); \tif (PyErr_Occurred()) -\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import scipy.base)\"); +\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import numpy.base)\"); \td = PyModule_GetDict(m); \ts = PyString_FromString(\"$R"""+"""evision: $\"); \tPyDict_SetItemString(d, \"__version__\", s); diff --git a/numpy/f2py/setup.py b/numpy/f2py/setup.py index 2616ccbd5..8c6a4a698 100755 --- a/numpy/f2py/setup.py +++ b/numpy/f2py/setup.py @@ -21,8 +21,8 @@ __version__ = "$Id: setup.py,v 1.32 2005/01/30 17:22:14 pearu Exp $" import os import sys from distutils.dep_util import newer -from scipy.distutils.core import setup -from scipy.distutils.misc_util import Configuration +from numpy.distutils.core import setup +from numpy.distutils.misc_util import Configuration from __version__ import version @@ -53,7 +53,7 @@ def configuration(parent_package='',top_path=None): # See http://cens.ioc.ee/projects/f2py2e/ import os os.environ["NO_SCIPY_IMPORT"]="f2py" -import scipy.f2py as f2py +import numpy.f2py as f2py f2py.main() '''%(os.path.basename(sys.executable))) f.close() diff --git a/numpy/f2py/src/fortranobject.h b/numpy/f2py/src/fortranobject.h index 680e6690e..44778822a 100644 --- a/numpy/f2py/src/fortranobject.h +++ b/numpy/f2py/src/fortranobject.h @@ -10,7 +10,7 @@ extern "C" { #define NO_IMPORT_ARRAY #endif #define PY_ARRAY_UNIQUE_SYMBOL PyArray_API -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" /* #ifdef F2PY_REPORT_ATEXIT_DISABLE diff --git a/numpy/f2py/tests/array_from_pyobj/setup.py b/numpy/f2py/tests/array_from_pyobj/setup.py index ff7ff8cfc..f449117a7 100644 --- a/numpy/f2py/tests/array_from_pyobj/setup.py +++ b/numpy/f2py/tests/array_from_pyobj/setup.py @@ -1,10 +1,10 @@ import os def configuration(parent_name='',top_path=None): - from scipy.distutils.misc_util import Configuration + from numpy.distutils.misc_util import Configuration config = Configuration('array_from_pyobj',parent_name,top_path) - #import scipy.f2py as f2py + #import numpy.f2py as f2py #f2pydir=os.path.dirname(os.path.abspath(f2py.__file__)) f2pydir=os.path.join(config.local_path,'..','..') fobjhsrc = os.path.join(f2pydir,'src','fortranobject.h') @@ -22,5 +22,5 @@ def configuration(parent_name='',top_path=None): return config if __name__ == "__main__": - from scipy.distutils.core import setup + from numpy.distutils.core import setup setup(**configuration(top_path='').todict()) diff --git a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py index 309ad03f6..8df22d2a5 100644 --- a/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py +++ b/numpy/f2py/tests/array_from_pyobj/tests/test_array_from_pyobj.py @@ -2,8 +2,8 @@ import unittest import sys import copy -from scipy.test.testing import * -from scipy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros +from numpy.test.testing import * +from numpy.base import array, typeinfo, alltrue, ndarray, asarray, can_cast,zeros set_package_path() from array_from_pyobj import wrap del sys.path[0] diff --git a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c index 0d9e41f1c..972cdb403 100644 --- a/numpy/f2py/tests/array_from_pyobj/wrapmodule.c +++ b/numpy/f2py/tests/array_from_pyobj/wrapmodule.c @@ -120,7 +120,7 @@ DL_EXPORT(void) initwrap(void) { PyFortran_Type.ob_type = &PyType_Type; import_array(); if (PyErr_Occurred()) - Py_FatalError("can't initialize module wrap (failed to import scipy.base)"); + Py_FatalError("can't initialize module wrap (failed to import numpy.base)"); d = PyModule_GetDict(m); s = PyString_FromString("This module 'wrap' is auto-generated with f2py (version:2_1330).\nFunctions:\n" " arr = call(type_num,dims,intent,obj)\n" diff --git a/numpy/f2py/tests/f77/return_integer.py b/numpy/f2py/tests/f77/return_integer.py index f50ab52da..0f5d270c4 100644 --- a/numpy/f2py/tests/f77/return_integer.py +++ b/numpy/f2py/tests/f77/return_integer.py @@ -7,8 +7,8 @@ Examples: python return_integer.py --quiet """ -import scipy.f2py as f2py2e -from scipy.base import array +import numpy.f2py as f2py2e +from numpy.base import array def build(f2py_opts): try: @@ -144,5 +144,5 @@ if __name__=='__main__': if status: print '*'*20 print 'Running f2py2e.diagnose' - import scipy.f2py.diagnose as diagnose + import numpy.f2py.diagnose as diagnose #diagnose.run() diff --git a/numpy/f2py/tests/f77/return_real.py b/numpy/f2py/tests/f77/return_real.py index 37f97a06d..4df26a587 100644 --- a/numpy/f2py/tests/f77/return_real.py +++ b/numpy/f2py/tests/f77/return_real.py @@ -7,8 +7,8 @@ Examples: """ -import scipy.f2py as f2py2e -from scipy.base import array +import numpy.f2py as f2py2e +from numpy.base import array def build(f2py_opts): try: diff --git a/numpy/lib/convertcode.py b/numpy/lib/convertcode.py index aba998f78..6e590fa25 100644 --- a/numpy/lib/convertcode.py +++ b/numpy/lib/convertcode.py @@ -1,5 +1,5 @@ -# This module converts code written for Numeric to run with scipy.base +# This module converts code written for Numeric to run with numpy.base # Makes the following changes: # * Converts typecharacters @@ -97,7 +97,7 @@ def fromstr(filestr): 'numpy.core.umath') filestr, fromall1 = changeimports(filestr, 'Precision', 'numpy.core') filestr, fromall2 = changeimports(filestr, 'numerix', 'numpy.core') - filestr, fromall3 = changeimports(filestr, 'scipy_base', 'numpy.core') + filestr, fromall3 = changeimports(filestr, 'numpy_base', 'numpy.core') filestr, fromall3 = changeimports(filestr, 'MLab', 'numpy.core.mlab') filestr, fromall3 = changeimports(filestr, 'LinearAlgebra', 'numpy.linalg') filestr, fromall3 = changeimports(filestr, 'RNG', 'numpy.random') @@ -110,7 +110,7 @@ def fromstr(filestr): today = datetime.date.today().strftime('%b %d, %Y') name = os.path.split(sys.argv[0])[-1] filestr = '## Automatically adapted for '\ - 'scipy %s by %s\n\n%s' % (today, name, filestr) + 'numpy %s by %s\n\n%s' % (today, name, filestr) return filestr def makenewfile(name, filestr): diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 60e4b4be0..b7c8c04be 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -479,9 +479,9 @@ def trim_zeros(filt, trim='fb'): """ Trim the leading and trailing zeros from a 1D array. Example: - >>> import scipy + >>> import numpy >>> a = array((0, 0, 0, 1, 2, 3, 2, 1, 0)) - >>> scipy.trim_zeros(a) + >>> numpy.trim_zeros(a) array([1, 2, 3, 2, 1]) """ first = 0 @@ -583,10 +583,10 @@ class vectorize(object): Description: Define a vectorized function which takes nested sequence - objects or scipy arrays as inputs and returns a - scipy array as output, evaluating the function over successive + objects or numpy arrays as inputs and returns a + numpy array as output, evaluating the function over successive tuples of the input arrays like the python map function except it uses - the broadcasting rules of scipy. + the broadcasting rules of numpy. Input: @@ -768,10 +768,10 @@ def hamming(M): def kaiser(M,beta): """kaiser(M, beta) returns a Kaiser window of length M with shape parameter - beta. It depends on scipy.special (in full scipy) for the modified bessel + beta. It depends on numpy.special (in full numpy) for the modified bessel function i0. """ - from scipy.special import i0 + from numpy.special import i0 n = arange(0,M) alpha = (M-1)/2.0 return i0(beta * sqrt(1-((n-alpha)/alpha)**2.0))/i0(beta) diff --git a/numpy/lib/getlimits.py b/numpy/lib/getlimits.py index 41030af2d..3220d0bab 100644 --- a/numpy/lib/getlimits.py +++ b/numpy/lib/getlimits.py @@ -56,21 +56,21 @@ class finfo(object): lambda v:_frz(v.astype('i'))[0], lambda v:array(_frz(v)[0],'d'), lambda v:'%24.16e' % array(_frz(v)[0],'d'), - 'scipy float precision floating point '\ + 'numpy float precision floating point '\ 'number') elif dtype is numeric.single: machar = MachAr(lambda v:array([v],'f'), lambda v:_frz(v.astype('i'))[0], lambda v:array(_frz(v)[0],'f'), # lambda v:'%15.7e' % array(_frz(v)[0],'f'), - "scipy single precision floating "\ + "numpy single precision floating "\ "point number") elif dtype is numeric.longfloat: machar = MachAr(lambda v:array([v],'g'), lambda v:_frz(v.astype('i'))[0], lambda v:array(_frz(v)[0],'g'), # lambda v:str(array(_frz(v)[0],'g')), - "scipy longfloat precision floating "\ + "numpy longfloat precision floating "\ "point number") else: raise ValueError,`dtype` diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 71d30a387..e2c8d2a13 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -1,4 +1,4 @@ -## Automatically adapted for scipy Sep 19, 2005 by convertcode.py +## Automatically adapted for numpy Sep 19, 2005 by convertcode.py __all__ = ['mgrid','ogrid','r_', 'c_', 'index_exp', 'ix_','ndenumerate'] diff --git a/numpy/lib/mlab.py b/numpy/lib/mlab.py index 749600d9b..9085c26be 100644 --- a/numpy/lib/mlab.py +++ b/numpy/lib/mlab.py @@ -10,5 +10,5 @@ from function_base import msort, median, trapz, diff, cov, corrcoef, kaiser, bla from oldnumeric import cumsum, ptp, mean, std, prod, cumprod, squeeze from polynomial import roots -from scipy.random import rand, randn -from scipy.corelinalg import eig, svd +from numpy.random import rand, randn +from numpy.corelinalg import eig, svd diff --git a/numpy/lib/polynomial.py b/numpy/lib/polynomial.py index df7013bab..3cebba552 100644 --- a/numpy/lib/polynomial.py +++ b/numpy/lib/polynomial.py @@ -17,9 +17,9 @@ eigvals = None lstsq = None def get_linalg_funcs(): - "Look for linear algebra functions in scipy" + "Look for linear algebra functions in numpy" global eigvals, lstsq - from scipy.corelinalg import eigvals, lstsq + from numpy.corelinalg import eigvals, lstsq return def _eigvals(arg): @@ -286,9 +286,9 @@ def polymul(a1, a2): def deconvolve(signal, divisor): - """Deconvolves divisor out of signal. Requires scipy.signal library + """Deconvolves divisor out of signal. Requires numpy.signal library """ - import scipy.signal + import numpy.signal num = atleast_1d(signal) den = atleast_1d(divisor) N = len(num) @@ -299,7 +299,7 @@ def deconvolve(signal, divisor): else: input = NX.ones(N-D+1, float) input[1:] = 0 - quot = scipy.signal.lfilter(num, den, input) + quot = numpy.signal.lfilter(num, den, input) rem = num - NX.convolve(den, quot, mode='full') return quot, rem diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index 8d66b41d1..f4db3f59c 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -203,15 +203,15 @@ def vstack(tup): tup -- sequence of arrays. All arrays must have the same shape. Examples: - >>> import scipy + >>> import numpy >>> a = array((1,2,3)) >>> b = array((2,3,4)) - >>> scipy.vstack((a,b)) + >>> numpy.vstack((a,b)) array([[1, 2, 3], [2, 3, 4]]) >>> a = array([[1],[2],[3]]) >>> b = array([[2],[3],[4]]) - >>> scipy.vstack((a,b)) + >>> numpy.vstack((a,b)) array([[1], [2], [3], @@ -234,14 +234,14 @@ def hstack(tup): tup -- sequence of arrays. All arrays must have the same shape. Examples: - >>> import scipy + >>> import numpy >>> a = array((1,2,3)) >>> b = array((2,3,4)) - >>> scipy.hstack((a,b)) + >>> numpy.hstack((a,b)) array([1, 2, 3, 2, 3, 4]) >>> a = array([[1],[2],[3]]) >>> b = array([[2],[3],[4]]) - >>> scipy.hstack((a,b)) + >>> numpy.hstack((a,b)) array([[1, 2], [2, 3], [3, 4]]) @@ -260,10 +260,10 @@ def column_stack(tup): tup -- sequence of 1D arrays. All arrays must have the same length. Examples: - >>> import scipy + >>> import numpy >>> a = array((1,2,3)) >>> b = array((2,3,4)) - >>> scipy.column_stack((a,b)) + >>> numpy.column_stack((a,b)) array([[1, 2], [2, 3], [3, 4]]) @@ -285,16 +285,16 @@ def dstack(tup): tup -- sequence of arrays. All arrays must have the same shape. Examples: - >>> import scipy + >>> import numpy >>> a = array((1,2,3)) >>> b = array((2,3,4)) - >>> scipy.dstack((a,b)) + >>> numpy.dstack((a,b)) array([ [[1, 2], [2, 3], [3, 4]]]) >>> a = array([[1],[2],[3]]) >>> b = array([[2],[3],[4]]) - >>> scipy.dstack((a,b)) + >>> numpy.dstack((a,b)) array([[ [1, 2]], [ [2, 3]], [ [3, 4]]]) @@ -441,9 +441,9 @@ def hsplit(ary,indices_or_sections): Related: hstack, split, array_split, vsplit, dsplit. Examples: - >>> import scipy + >>> import numpy >>> a= array((1,2,3,4)) - >>> scipy.hsplit(a,2) + >>> numpy.hsplit(a,2) [array([1, 2]), array([3, 4])] >>> a = array([[1,2,3,4],[1,2,3,4]]) [array([[1, 2], @@ -489,10 +489,10 @@ def vsplit(ary,indices_or_sections): Related: vstack, split, array_split, hsplit, dsplit. Examples: - import scipy + import numpy >>> a = array([[1,2,3,4], ... [1,2,3,4]]) - >>> scipy.vsplit(a) + >>> numpy.vsplit(a) [array([ [1, 2, 3, 4]]), array([ [1, 2, 3, 4]])] """ diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index 3ce3743d7..7c20d4f96 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -1,6 +1,6 @@ #include "Python.h" #include "structmember.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" static PyObject *ErrorObject; #define Py_Try(BOOLEAN) {if (!(BOOLEAN)) goto fail;} @@ -427,7 +427,7 @@ DL_EXPORT(void) init_compiled_base(void) { PyObject *m, *d, *s; /* Create the module and add the functions */ - m = Py_InitModule("scipy.base._compiled_base", methods); + m = Py_InitModule("numpy.base._compiled_base", methods); /* Import the array and ufunc objects */ import_array(); @@ -439,7 +439,7 @@ DL_EXPORT(void) init_compiled_base(void) { PyDict_SetItemString(d, "__version__", s); Py_DECREF(s); - ErrorObject = PyString_FromString("scipy.base._compiled_base.error"); + ErrorObject = PyString_FromString("numpy.base._compiled_base.error"); PyDict_SetItemString(d, "error", ErrorObject); Py_DECREF(ErrorObject); diff --git a/numpy/lib/test_shape_base.py b/numpy/lib/test_shape_base.py index 005868e96..175bc8584 100644 --- a/numpy/lib/test_shape_base.py +++ b/numpy/lib/test_shape_base.py @@ -1,8 +1,8 @@ -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base; -from scipy.base import * +import numpy.base; +from numpy.base import * restore_path() class test_apply_along_axis(ScipyTestCase): diff --git a/numpy/lib/tests/test_function_base.py b/numpy/lib/tests/test_function_base.py index fafd75eef..37d3db1bf 100644 --- a/numpy/lib/tests/test_function_base.py +++ b/numpy/lib/tests/test_function_base.py @@ -1,10 +1,10 @@ import sys -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base) -from scipy.base import * +import numpy.base;reload(numpy.base) +from numpy.base import * del sys.path[0] class test_any(ScipyTestCase): @@ -335,4 +335,4 @@ def compare_results(res,desired): assert_array_equal(res[i],desired[i]) if __name__ == "__main__": - ScipyTest('scipy.base.function_base').run() + ScipyTest('numpy.base.function_base').run() diff --git a/numpy/lib/tests/test_getlimits.py b/numpy/lib/tests/test_getlimits.py index 99a6f5160..5e8706895 100644 --- a/numpy/lib/tests/test_getlimits.py +++ b/numpy/lib/tests/test_getlimits.py @@ -1,11 +1,11 @@ """ Test functions for limits module. """ -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base) -from scipy.base.getlimits import finfo -from scipy import single,double,longdouble +import numpy.base;reload(numpy.base) +from numpy.base.getlimits import finfo +from numpy import single,double,longdouble restore_path() ################################################## diff --git a/numpy/lib/tests/test_index_tricks.py b/numpy/lib/tests/test_index_tricks.py index 96e9dff84..c5091909e 100644 --- a/numpy/lib/tests/test_index_tricks.py +++ b/numpy/lib/tests/test_index_tricks.py @@ -1,8 +1,8 @@ -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base) -from scipy.base import * +import numpy.base;reload(numpy.base) +from numpy.base import * restore_path() class test_grid(ScipyTestCase): diff --git a/numpy/lib/tests/test_polynomial.py b/numpy/lib/tests/test_polynomial.py index 51d4b5707..d37e8b6b9 100644 --- a/numpy/lib/tests/test_polynomial.py +++ b/numpy/lib/tests/test_polynomial.py @@ -1,6 +1,6 @@ """ ->>> import scipy.base as nx ->>> from scipy.base.polynomial import poly1d, polydiv +>>> import numpy.base as nx +>>> from numpy.base.polynomial import poly1d, polydiv >>> p = poly1d([1.,2,3]) >>> p @@ -73,7 +73,7 @@ poly1d([ 2.]) (poly1d([ 1., -1.]), poly1d([ 0.])) """ -from scipy.testing import * +from numpy.testing import * import doctest def test_suite(level=1): diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py index b061d4a5d..329a23f5b 100644 --- a/numpy/lib/tests/test_twodim_base.py +++ b/numpy/lib/tests/test_twodim_base.py @@ -2,10 +2,10 @@ """ -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base) -from scipy.base import * +import numpy.base;reload(numpy.base) +from numpy.base import * restore_path() ################################################## diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py index aac24bd6e..e84d86e0c 100644 --- a/numpy/lib/tests/test_type_check.py +++ b/numpy/lib/tests/test_type_check.py @@ -1,10 +1,10 @@ import sys -from scipy.testing import * +from numpy.testing import * set_package_path() -import scipy.base;reload(scipy.base);reload(scipy.base.type_check) -from scipy.base import * +import numpy.base;reload(numpy.base);reload(numpy.base.type_check) +from numpy.base import * restore_path() def assert_all(x): diff --git a/numpy/lib/tests/test_ufunclike.py b/numpy/lib/tests/test_ufunclike.py index ca06140c7..f7313526d 100644 --- a/numpy/lib/tests/test_ufunclike.py +++ b/numpy/lib/tests/test_ufunclike.py @@ -1,6 +1,6 @@ """ ->>> import scipy.base as nx ->>> import scipy.base.ufunclike as U +>>> import numpy.base as nx +>>> import numpy.base.ufunclike as U Test fix: >>> a = nx.array([[1.0, 1.1, 1.5, 1.8], [-1.0, -1.1, -1.5, -1.8]]) @@ -53,7 +53,7 @@ array([ 2.169925 , 1.20163386, 2.70043972]) """ -from scipy.testing import * +from numpy.testing import * import doctest def test_suite(level=1): diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py index 4c802ca86..97b7e9832 100644 --- a/numpy/lib/type_check.py +++ b/numpy/lib/type_check.py @@ -1,4 +1,4 @@ -## Automatically adapted for scipy Sep 19, 2005 by convertcode.py +## Automatically adapted for numpy Sep 19, 2005 by convertcode.py __all__ = ['iscomplexobj','isrealobj','imag','iscomplex', 'isscalar', diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index 19fb18d4d..be5a34295 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -1,6 +1,6 @@ from numerictypes import obj2dtype -__all__ = ['issubclass_', 'get_scipy_include', 'issubdtype'] +__all__ = ['issubclass_', 'get_numpy_include', 'issubdtype'] def issubclass_(arg1, arg2): try: @@ -11,18 +11,18 @@ def issubclass_(arg1, arg2): def issubdtype(arg1, arg2): return issubclass(obj2dtype(arg1), obj2dtype(arg2)) -def get_scipy_include(): - """Return the directory in the package that contains the scipy/*.h header +def get_numpy_include(): + """Return the directory in the package that contains the numpy/*.h header files. - Extension modules that need to compile against scipy.base should use this + Extension modules that need to compile against numpy.base should use this function to locate the appropriate include directory. Using distutils: - import scipy + import numpy Extension('extension_name', ... - include_dirs=[scipy.get_scipy_include()]) + include_dirs=[numpy.get_numpy_include()]) """ - from scipy.distutils.misc_util import get_scipy_include_dirs - include_dirs = get_scipy_include_dirs() + from numpy.distutils.misc_util import get_numpy_include_dirs + include_dirs = get_numpy_include_dirs() assert len(include_dirs)==1,`include_dirs` return include_dirs[0] diff --git a/numpy/linalg/__init__.py b/numpy/linalg/__init__.py index 561ab3438..bbfff25c0 100644 --- a/numpy/linalg/__init__.py +++ b/numpy/linalg/__init__.py @@ -3,23 +3,23 @@ from info import __doc__ from linalg import * -# re-define duplicated functions if full scipy installed. +# re-define duplicated functions if full numpy installed. try: - import scipy.linalg + import numpy.linalg except ImportError: pass else: - inv = scipy.linalg.inv - svd = scipy.linalg.svd - solve = scipy.linalg.solve - det = scipy.linalg.det - eig = scipy.linalg.eig - eigvals = scipy.linalg.eigvals - lstsq = scipy.linalg.lstsq - pinv = scipy.linalg.pinv - cholesky = scipy.linalg.cholesky + inv = numpy.linalg.inv + svd = numpy.linalg.svd + solve = numpy.linalg.solve + det = numpy.linalg.det + eig = numpy.linalg.eig + eigvals = numpy.linalg.eigvals + lstsq = numpy.linalg.lstsq + pinv = numpy.linalg.pinv + cholesky = numpy.linalg.cholesky -from scipy.testing import ScipyTest +from numpy.testing import ScipyTest test = ScipyTest().test diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c index bf7170fbc..10ce4b944 100644 --- a/numpy/linalg/lapack_litemodule.c +++ b/numpy/linalg/lapack_litemodule.c @@ -4,7 +4,7 @@ More modifications by Jeff Whitaker */ #include "Python.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #ifdef NO_APPEND_FORTRAN # define FNAME(x) x diff --git a/numpy/linalg/linalg.py b/numpy/linalg/linalg.py index 9629b60f2..5ae5b5592 100644 --- a/numpy/linalg/linalg.py +++ b/numpy/linalg/linalg.py @@ -1,4 +1,4 @@ -"""Lite version of scipy.linalg. +"""Lite version of numpy.linalg. """ # This module is a lite version of LinAlg.py module which contains # high-level Python interface to the LAPACK library. The lite version @@ -12,7 +12,7 @@ __all__ = ['LinAlgError', 'solve_linear_equations', 'solve', 'eigenvectors', 'eig', 'Heigenvectors', 'eigh','lstsq', 'linear_least_squares' ] -from scipy.base import * +from numpy.base import * import lapack_lite import math diff --git a/numpy/random/__init__.py b/numpy/random/__init__.py index 39607f993..8dc354e81 100644 --- a/numpy/random/__init__.py +++ b/numpy/random/__init__.py @@ -13,5 +13,5 @@ def __RandomState_ctor(): """ return RandomState() -from scipy.testing import ScipyTest +from numpy.testing import ScipyTest test = ScipyTest().test diff --git a/numpy/random/mtrand/mtrand.c b/numpy/random/mtrand/mtrand.c index 995e4871d..0094f251b 100644 --- a/numpy/random/mtrand/mtrand.c +++ b/numpy/random/mtrand/mtrand.c @@ -7,7 +7,7 @@ #endif #include "string.h" #include "math.h" -#include "scipy/arrayobject.h" +#include "numpy/arrayobject.h" #include "randomkit.h" #include "distributions.h" #include "initarray.h" @@ -163,7 +163,7 @@ static PyObject *__pyx_n_multivariate_normal; static PyObject *__pyx_n_multinomial; static PyObject *__pyx_n_shuffle; static PyObject *__pyx_n_permutation; -static PyObject *__pyx_n_scipy; +static PyObject *__pyx_n_numpy; static PyObject *__pyx_n_empty; static PyObject *__pyx_n_Float64; @@ -181,11 +181,11 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":128 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":128 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":129 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":129 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -194,7 +194,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":131 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":131 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -214,20 +214,20 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":132 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":132 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":133 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":133 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":134 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":134 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":135 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":135 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":136 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":136 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -261,11 +261,11 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":144 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":144 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":145 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":145 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -274,7 +274,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":147 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":147 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -294,20 +294,20 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":148 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":148 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":149 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":149 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":150 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":150 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":151 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":151 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":152 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":152 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -341,11 +341,11 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":161 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":161 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":162 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":162 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -354,7 +354,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":164 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":164 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -374,20 +374,20 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":165 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":165 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":166 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":166 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":167 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":167 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":168 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":168 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":169 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":169 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -421,11 +421,11 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":179 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":179 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":180 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":180 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -434,7 +434,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":182 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":182 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -454,20 +454,20 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":183 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":183 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":184 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":184 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":185 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":185 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":186 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":186 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":187 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":187 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -503,11 +503,11 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":195 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":195 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":196 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":196 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -516,7 +516,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":198 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":198 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -536,20 +536,20 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":199 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":199 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":200 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":200 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":201 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":201 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":202 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":202 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":203 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":203 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -583,11 +583,11 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":211 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":211 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":212 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":212 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 212; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -596,7 +596,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":214 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":214 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -616,20 +616,20 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":215 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":215 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":216 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":216 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":217 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":217 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":218 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":218 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":219 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":219 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -663,11 +663,11 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":228 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":228 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":229 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":229 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -676,7 +676,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":231 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":231 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -696,20 +696,20 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":232 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":232 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":233 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":233 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":234 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":234 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":235 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":235 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":236 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":236 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -743,11 +743,11 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":244 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":244 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":245 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":245 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -756,7 +756,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":247 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":247 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -776,20 +776,20 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":248 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":248 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":249 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":249 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":250 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":250 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":251 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":251 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":252 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":252 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -818,29 +818,29 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) { long __pyx_v_i; double __pyx_r; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":257 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":257 */ __pyx_v_sum = (__pyx_v_darr[0]); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":258 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":258 */ __pyx_v_c = 0.0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":259 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":259 */ for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":260 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":260 */ __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":261 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":261 */ __pyx_v_t = (__pyx_v_sum + __pyx_v_y); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":262 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":262 */ __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":263 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":263 */ __pyx_v_sum = __pyx_v_t; } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":264 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":264 */ __pyx_r = __pyx_v_sum; goto __pyx_L0; @@ -864,10 +864,10 @@ static int __pyx_f_6mtrand_11RandomState___init__(PyObject *__pyx_v_self, PyObje Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":287 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":287 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state )))); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":289 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":289 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; goto __pyx_L1;} Py_INCREF(__pyx_v_seed); @@ -896,11 +896,11 @@ static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self) { int __pyx_1; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":292 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":292 */ __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":293 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":293 */ PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } @@ -934,11 +934,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_seed); arrayObject_obj = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_obj); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":307 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":307 */ __pyx_1 = __pyx_v_seed == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":308 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":308 */ __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } @@ -955,21 +955,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":310 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":310 */ __pyx_5 = PyLong_AsUnsignedLong(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; goto __pyx_L1;} rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":312 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":312 */ __pyx_3 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_seed,PyArray_LONG,1,1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 312; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_3)); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":313 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":313 */ init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0])); } __pyx_L2:; @@ -1006,7 +1006,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); arrayObject_state = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_state); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":322 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":322 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1027,10 +1027,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, arrayObject_state = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":323 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":323 */ memcpy(((void (*))arrayObject_state->data),((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long )))); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":324 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":324 */ __pyx_4 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;} __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 324; goto __pyx_L1;} Py_INCREF(__pyx_n_MT19937); @@ -1087,7 +1087,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, __pyx_v_algorithm_name = Py_None; Py_INCREF(__pyx_v_algorithm_name); __pyx_v_key = Py_None; Py_INCREF(__pyx_v_key); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":335 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":335 */ __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1095,12 +1095,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, __pyx_v_algorithm_name = __pyx_2; __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":336 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":336 */ if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;} __pyx_3 = __pyx_3 != 0; if (__pyx_3) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":337 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":337 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 337; goto __pyx_L1;} Py_INCREF(__pyx_k62p); @@ -1115,7 +1115,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":338 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":338 */ __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} __pyx_2 = __Pyx_UnpackItem(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} Py_DECREF(__pyx_v_key); @@ -1128,18 +1128,18 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, if (__Pyx_EndUnpack(__pyx_1, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":339 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":339 */ __pyx_4 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_key,PyArray_LONG,1,1)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 339; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":340 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":340 */ __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624); if (__pyx_3) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":341 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":341 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; goto __pyx_L1;} Py_INCREF(__pyx_k63p); @@ -1154,10 +1154,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, } __pyx_L3:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":342 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":342 */ memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,((void (*))arrayObject_obj->data),(624 * (sizeof(long )))); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":343 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":343 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos; __pyx_r = Py_None; Py_INCREF(__pyx_r); @@ -1187,7 +1187,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":347 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":347 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;} __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;} __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;} @@ -1222,7 +1222,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___setstate__(PyObject *__pyx_v_se Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_state); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":350 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":350 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; goto __pyx_L1;} Py_INCREF(__pyx_v_state); @@ -1261,7 +1261,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":353 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":353 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1311,7 +1311,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_sample(PyObject *__pyx_v_s Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":361 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":361 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -1341,7 +1341,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":368 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":368 */ __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -1392,38 +1392,38 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_size); arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":383 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":383 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":384 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":384 */ __pyx_v_lo = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":385 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":385 */ __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; goto __pyx_L1;} __pyx_v_hi = __pyx_2; goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":387 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":387 */ __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; goto __pyx_L1;} __pyx_v_lo = __pyx_2; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":388 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":388 */ __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;} __pyx_v_hi = __pyx_2; } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":390 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":390 */ __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":391 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":391 */ __pyx_1 = (__pyx_v_diff < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":392 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":392 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; goto __pyx_L1;} Py_INCREF(__pyx_k64p); @@ -1438,11 +1438,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P } __pyx_L3:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":394 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":394 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":395 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":395 */ __pyx_3 = PyLong_FromUnsignedLong(rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 395; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; @@ -1451,7 +1451,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":397 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":397 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -1471,20 +1471,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":398 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":398 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":399 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":399 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":400 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":400 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":401 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":401 */ (__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/oliphant/core/scipy/lib/mtrand/mtrand.pyx":402 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":402 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1521,22 +1521,22 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO Py_INCREF(__pyx_v_self); __pyx_v_bytestring = Py_None; Py_INCREF(__pyx_v_bytestring); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":410 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":410 */ __pyx_v_bytes = PyMem_Malloc(__pyx_v_length); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":411 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":411 */ rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":412 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":412 */ __pyx_1 = PyString_FromString(((char (*))__pyx_v_bytes)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 412; goto __pyx_L1;} Py_DECREF(__pyx_v_bytestring); __pyx_v_bytestring = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":413 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":413 */ PyMem_Free(__pyx_v_bytes); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":414 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":414 */ Py_INCREF(__pyx_v_bytestring); __pyx_r = __pyx_v_bytestring; goto __pyx_L0; @@ -1569,7 +1569,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":421 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":421 */ __pyx_1 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_low,(__pyx_v_high - __pyx_v_low)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -1611,7 +1611,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb } Py_INCREF(__pyx_v_self); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":430 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":430 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 430; goto __pyx_L1;} Py_INCREF(__pyx_v_args); @@ -1626,7 +1626,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":431 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":431 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;} __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;} __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; goto __pyx_L1;} @@ -1639,7 +1639,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":433 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":433 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;} __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;} __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 433; goto __pyx_L1;} @@ -1690,7 +1690,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO } Py_INCREF(__pyx_v_self); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":441 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":441 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 441; goto __pyx_L1;} Py_INCREF(__pyx_v_args); @@ -1705,7 +1705,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":442 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":442 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;} __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;} __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; goto __pyx_L1;} @@ -1718,7 +1718,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":444 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":444 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 444; goto __pyx_L1;} Py_INCREF(__pyx_v_args); @@ -1768,16 +1768,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v Py_INCREF(__pyx_v_high); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":453 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":453 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":454 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":454 */ Py_INCREF(__pyx_v_low); Py_DECREF(__pyx_v_high); __pyx_v_high = __pyx_v_low; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":455 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":455 */ __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; goto __pyx_L1;} Py_DECREF(__pyx_v_low); __pyx_v_low = __pyx_2; @@ -1786,7 +1786,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":456 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":456 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;} __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;} __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;} @@ -1833,7 +1833,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_normal(PyObject *__pyx_v Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":464 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":464 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 464; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -1874,11 +1874,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":471 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":471 */ __pyx_1 = (__pyx_v_scale <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":472 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":472 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; goto __pyx_L1;} Py_INCREF(__pyx_k66p); @@ -1893,7 +1893,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":473 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":473 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 473; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -1936,11 +1936,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":480 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":480 */ __pyx_1 = (__pyx_v_a <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":481 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":481 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 481; goto __pyx_L1;} Py_INCREF(__pyx_k67p); @@ -1956,7 +1956,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb __pyx_1 = (__pyx_v_b <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":483 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":483 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; goto __pyx_L1;} Py_INCREF(__pyx_k68p); @@ -1971,7 +1971,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":484 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":484 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_a,__pyx_v_b); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2012,11 +2012,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":491 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":491 */ __pyx_1 = (__pyx_v_scale <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":492 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":492 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 492; goto __pyx_L1;} Py_INCREF(__pyx_k69p); @@ -2031,7 +2031,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":493 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":493 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 493; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2063,7 +2063,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":500 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":500 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2101,11 +2101,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":507 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":507 */ __pyx_1 = (__pyx_v_shape <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":508 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":508 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 508; goto __pyx_L1;} Py_INCREF(__pyx_k70p); @@ -2120,7 +2120,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":509 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":509 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 509; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2164,11 +2164,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":516 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":516 */ __pyx_1 = (__pyx_v_shape <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":517 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":517 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; goto __pyx_L1;} Py_INCREF(__pyx_k71p); @@ -2184,7 +2184,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO __pyx_1 = (__pyx_v_scale <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":519 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":519 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 519; goto __pyx_L1;} Py_INCREF(__pyx_k72p); @@ -2199,7 +2199,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":520 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":520 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_shape,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 520; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2242,11 +2242,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":527 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":527 */ __pyx_1 = (__pyx_v_dfnum <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":528 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":528 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} Py_INCREF(__pyx_k73p); @@ -2262,7 +2262,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec __pyx_1 = (__pyx_v_dfden <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":530 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":530 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_INCREF(__pyx_k74p); @@ -2277,7 +2277,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":531 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":531 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_dfnum,__pyx_v_dfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2323,11 +2323,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":538 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":538 */ __pyx_1 = (__pyx_v_dfnum <= 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":539 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":539 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;} Py_INCREF(__pyx_k75p); @@ -2343,7 +2343,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se __pyx_1 = (__pyx_v_dfden <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":541 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":541 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} Py_INCREF(__pyx_k76p); @@ -2359,7 +2359,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se __pyx_1 = (__pyx_v_nonc < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":543 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":543 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;} Py_INCREF(__pyx_k77p); @@ -2374,7 +2374,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":544 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":544 */ __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_dfnum,__pyx_v_dfden,__pyx_v_nonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2414,11 +2414,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":552 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":552 */ __pyx_1 = (__pyx_v_df <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":553 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":553 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 553; goto __pyx_L1;} Py_INCREF(__pyx_k78p); @@ -2433,7 +2433,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":554 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":554 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_df); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 554; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2476,11 +2476,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":561 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":561 */ __pyx_1 = (__pyx_v_df <= 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":562 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":562 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; goto __pyx_L1;} Py_INCREF(__pyx_k79p); @@ -2496,7 +2496,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ __pyx_1 = (__pyx_v_nonc < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":564 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":564 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} Py_INCREF(__pyx_k80p); @@ -2511,7 +2511,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":565 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":565 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_df,__pyx_v_nonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 565; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2543,7 +2543,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":573 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":573 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 573; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2581,11 +2581,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":580 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":580 */ __pyx_1 = (__pyx_v_df <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":581 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":581 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 581; goto __pyx_L1;} Py_INCREF(__pyx_k81p); @@ -2600,7 +2600,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":582 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":582 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_df); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 582; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2641,11 +2641,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":590 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":590 */ __pyx_1 = (__pyx_v_kappa < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":591 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":591 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 591; goto __pyx_L1;} Py_INCREF(__pyx_k82p); @@ -2660,7 +2660,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":592 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":592 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_mu,__pyx_v_kappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 592; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2700,11 +2700,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":599 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":599 */ __pyx_1 = (__pyx_v_a <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":600 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":600 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;} Py_INCREF(__pyx_k83p); @@ -2719,7 +2719,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":601 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":601 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 601; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2759,11 +2759,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":608 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":608 */ __pyx_1 = (__pyx_v_a <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":609 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":609 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 609; goto __pyx_L1;} Py_INCREF(__pyx_k84p); @@ -2778,7 +2778,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":610 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":610 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2818,11 +2818,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":617 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":617 */ __pyx_1 = (__pyx_v_a <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":618 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":618 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} Py_INCREF(__pyx_k85p); @@ -2837,7 +2837,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":619 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":619 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 619; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2880,11 +2880,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":626 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":626 */ __pyx_1 = (__pyx_v_scale <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":627 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":627 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; goto __pyx_L1;} Py_INCREF(__pyx_k86p); @@ -2899,7 +2899,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":628 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":628 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 628; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2942,11 +2942,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":635 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":635 */ __pyx_1 = (__pyx_v_scale <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":636 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":636 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} Py_INCREF(__pyx_k87p); @@ -2961,7 +2961,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":637 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":637 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3004,11 +3004,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":644 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":644 */ __pyx_1 = (__pyx_v_scale <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":645 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":645 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; goto __pyx_L1;} Py_INCREF(__pyx_k88p); @@ -3023,7 +3023,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":646 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":646 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_loc,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3066,11 +3066,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":658 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":658 */ __pyx_1 = (__pyx_v_sigma <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":659 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":659 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} Py_INCREF(__pyx_k89p); @@ -3085,7 +3085,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":660 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":660 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_mean,__pyx_v_sigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3126,11 +3126,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":667 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":667 */ __pyx_1 = (__pyx_v_scale <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":668 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":668 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 668; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 668; goto __pyx_L1;} Py_INCREF(__pyx_k90p); @@ -3145,7 +3145,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":669 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":669 */ __pyx_2 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 669; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3188,11 +3188,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":676 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":676 */ __pyx_1 = (__pyx_v_mean <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":677 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":677 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;} Py_INCREF(__pyx_k91p); @@ -3208,7 +3208,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb __pyx_1 = (__pyx_v_scale <= 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":679 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":679 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 679; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 679; goto __pyx_L1;} Py_INCREF(__pyx_k92p); @@ -3223,7 +3223,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":680 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":680 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_mean,__pyx_v_scale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 680; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3269,11 +3269,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":688 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":688 */ __pyx_1 = (__pyx_v_left > __pyx_v_mode); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":689 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":689 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} Py_INCREF(__pyx_k93p); @@ -3289,7 +3289,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self __pyx_1 = (__pyx_v_mode > __pyx_v_right); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":691 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":691 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 691; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 691; goto __pyx_L1;} Py_INCREF(__pyx_k94p); @@ -3305,7 +3305,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self __pyx_1 = (__pyx_v_left == __pyx_v_right); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":693 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":693 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; goto __pyx_L1;} Py_INCREF(__pyx_k95p); @@ -3320,7 +3320,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":694 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":694 */ __pyx_2 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_left,__pyx_v_mode,__pyx_v_right); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 694; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3365,11 +3365,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":703 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":703 */ __pyx_1 = (__pyx_v_n <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":704 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":704 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;} Py_INCREF(__pyx_k96p); @@ -3385,7 +3385,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, __pyx_1 = (__pyx_v_p < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":706 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":706 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 706; goto __pyx_L1;} Py_INCREF(__pyx_k97p); @@ -3401,7 +3401,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, __pyx_1 = (__pyx_v_p > 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":708 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":708 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} Py_INCREF(__pyx_k98p); @@ -3416,7 +3416,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":709 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":709 */ __pyx_2 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_n,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3461,11 +3461,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":716 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":716 */ __pyx_1 = (__pyx_v_n <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":717 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":717 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;} Py_INCREF(__pyx_k99p); @@ -3481,7 +3481,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx __pyx_1 = (__pyx_v_p < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":719 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":719 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} Py_INCREF(__pyx_k100p); @@ -3497,7 +3497,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx __pyx_1 = (__pyx_v_p > 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":721 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":721 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 721; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 721; goto __pyx_L1;} Py_INCREF(__pyx_k101p); @@ -3512,7 +3512,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":722 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":722 */ __pyx_2 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_n,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 722; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3553,11 +3553,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":730 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":730 */ __pyx_1 = (__pyx_v_lam <= 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":731 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":731 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} Py_INCREF(__pyx_k102p); @@ -3572,7 +3572,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":732 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":732 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_lam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 732; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3612,11 +3612,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":739 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":739 */ __pyx_1 = (__pyx_v_a <= 1.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":740 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":740 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} Py_INCREF(__pyx_k103p); @@ -3631,7 +3631,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":741 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":741 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_a); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3673,11 +3673,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":749 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":749 */ __pyx_1 = (__pyx_v_p < 0.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":750 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":750 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 750; goto __pyx_L1;} Py_INCREF(__pyx_k104p); @@ -3693,7 +3693,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, __pyx_1 = (__pyx_v_p > 1.0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":752 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":752 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 752; goto __pyx_L1;} Py_INCREF(__pyx_k105p); @@ -3708,7 +3708,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":753 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":753 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 753; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3756,11 +3756,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":765 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":765 */ __pyx_1 = (__pyx_v_ngood < 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":766 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":766 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_INCREF(__pyx_k106p); @@ -3776,7 +3776,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ __pyx_1 = (__pyx_v_nbad < 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":768 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":768 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; goto __pyx_L1;} Py_INCREF(__pyx_k107p); @@ -3792,7 +3792,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ __pyx_1 = ((__pyx_v_ngood + __pyx_v_nbad) < __pyx_v_nsample); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":770 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":770 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 770; goto __pyx_L1;} Py_INCREF(__pyx_k108p); @@ -3808,7 +3808,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ __pyx_1 = (__pyx_v_nsample < 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":772 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":772 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;} Py_INCREF(__pyx_k109p); @@ -3823,7 +3823,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":773 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":773 */ __pyx_2 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ngood,__pyx_v_nbad,__pyx_v_nsample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3865,11 +3865,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":781 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":781 */ __pyx_1 = (__pyx_v_p < 0); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":782 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":782 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 782; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 782; goto __pyx_L1;} Py_INCREF(__pyx_k110p); @@ -3885,7 +3885,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, __pyx_1 = (__pyx_v_p > 1); if (__pyx_1) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":784 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":784 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; goto __pyx_L1;} Py_INCREF(__pyx_k111p); @@ -3900,7 +3900,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":785 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":785 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_p); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3942,7 +3942,7 @@ static PyObject *__pyx_k115p; static char (__pyx_k112[]) = "mean must be 1 dimensional"; static char (__pyx_k113[]) = "cov must be 2 dimensional and square"; static char (__pyx_k114[]) = "mean and cov must have same length"; -static char (__pyx_k115[]) = "scipy.corelinalg"; +static char (__pyx_k115[]) = "numpy.corelinalg"; static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_multivariate_normal[] = "Return an array containing multivariate normally distributed random numbers\n with specified mean and covariance.\n\n multivariate_normal(mean, cov) -> random values\n multivariate_normal(mean, cov, [m, n, ...]) -> random values\n\n mean must be a 1 dimensional array. cov must be a square two dimensional\n array with the same number of rows and columns as mean has elements.\n\n The first form returns a single 1-D array containing a multivariate\n normal.\n\n The second form returns an array of shape (m, n, ..., cov.shape[0]).\n In this case, output[i,j,...,:] is a 1-D array containing a multivariate\n normal.\n "; @@ -3978,7 +3978,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_s = Py_None; Py_INCREF(__pyx_v_s); __pyx_v_v = Py_None; Py_INCREF(__pyx_v_v); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":806 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":806 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3992,7 +3992,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_mean = __pyx_3; __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":807 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":807 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -4006,11 +4006,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_cov = __pyx_2; __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":808 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":808 */ __pyx_4 = __pyx_v_size == Py_None; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":809 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":809 */ __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_1; @@ -4019,14 +4019,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":811 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":811 */ Py_INCREF(__pyx_v_size); Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_v_size; } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":812 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":812 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;} @@ -4042,7 +4042,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":813 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":813 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;} Py_INCREF(__pyx_k112p); @@ -4057,7 +4057,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L3:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":814 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":814 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} @@ -4089,7 +4089,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":815 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":815 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} Py_INCREF(__pyx_k113p); @@ -4104,7 +4104,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L4:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":816 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":816 */ __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} @@ -4121,7 +4121,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":817 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":817 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ArgumentError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_INCREF(__pyx_k114p); @@ -4136,7 +4136,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L5:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":819 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":819 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} @@ -4151,7 +4151,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":820 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":820 */ __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;} Py_INCREF(__pyx_v_shape); PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape); @@ -4162,7 +4162,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L6:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":821 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":821 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;} __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;} @@ -4175,7 +4175,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_final_shape = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":822 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":822 */ __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;} __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 822; goto __pyx_L1;} @@ -4190,7 +4190,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":826 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":826 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} @@ -4213,7 +4213,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_x = __pyx_5; __pyx_5 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":827 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":827 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4252,7 +4252,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":836 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":836 */ __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 836; goto __pyx_L1;} Py_INCREF(__pyx_n_svd); PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd); @@ -4264,7 +4264,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":838 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":838 */ __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;} Py_INCREF(__pyx_v_cov); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_cov); @@ -4285,7 +4285,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p if (__Pyx_EndUnpack(__pyx_2, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":839 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":839 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_matrixmultiply); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4312,7 +4312,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_x = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":842 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":842 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -4328,7 +4328,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":843 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":843 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); @@ -4339,7 +4339,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":844 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":844 */ Py_INCREF(__pyx_v_x); __pyx_r = __pyx_v_x; goto __pyx_L0; @@ -4408,7 +4408,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape); __pyx_v_multin = Py_None; Py_INCREF(__pyx_v_multin); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":862 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":862 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} Py_INCREF(__pyx_v_pvals); @@ -4420,21 +4420,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_v_d = __pyx_4; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":863 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":863 */ __pyx_1 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_pvals,PyArray_DOUBLE,1,1)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_1)); Py_DECREF(((PyObject *)arrayObject_parr)); arrayObject_parr = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":864 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":864 */ __pyx_v_pix = ((double (*))arrayObject_parr->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":866 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":866 */ __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > 1.0); if (__pyx_5) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":867 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":867 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} Py_INCREF(__pyx_k117p); @@ -4449,11 +4449,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":869 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":869 */ __pyx_5 = __pyx_v_size == Py_None; if (__pyx_5) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":870 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":870 */ __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); @@ -4476,7 +4476,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":872 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":872 */ __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} Py_INCREF(__pyx_v_size); @@ -4490,7 +4490,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":874 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":874 */ __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); @@ -4503,7 +4503,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } __pyx_L3:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":876 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":876 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4522,68 +4522,68 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel __pyx_v_multin = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":877 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":877 */ Py_INCREF(((PyObject *)__pyx_v_multin)); Py_DECREF(((PyObject *)arrayObject_mnarr)); arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":878 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":878 */ __pyx_v_mnix = ((long (*))arrayObject_mnarr->data); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":879 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":879 */ __pyx_v_i = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":880 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":880 */ while (1) { __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr)); if (!__pyx_5) break; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":881 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":881 */ __pyx_v_Sum = 1.0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":882 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":882 */ __pyx_v_dn = __pyx_v_n; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":883 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":883 */ __pyx_4 = (__pyx_v_d - 1); for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":884 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":884 */ (__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_v_pix[__pyx_v_j]) / __pyx_v_Sum)); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":885 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":885 */ __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)])); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":886 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":886 */ __pyx_5 = (__pyx_v_dn <= 0); if (__pyx_5) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":887 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":887 */ goto __pyx_L7; goto __pyx_L8; } __pyx_L8:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":888 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":888 */ __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j])); } __pyx_L7:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":889 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":889 */ __pyx_5 = (__pyx_v_dn > 0); if (__pyx_5) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":890 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":890 */ (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn; goto __pyx_L9; } __pyx_L9:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":892 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":892 */ __pyx_v_i = (__pyx_v_i + __pyx_v_d); } - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":894 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":894 */ Py_INCREF(__pyx_v_multin); __pyx_r = __pyx_v_multin; goto __pyx_L0; @@ -4624,7 +4624,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_x); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":905 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":905 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; goto __pyx_L1;} Py_INCREF(__pyx_v_x); @@ -4640,15 +4640,15 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_i = __pyx_4; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":906 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":906 */ while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":907 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":907 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":908 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":908 */ __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 908; goto __pyx_L1;} __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 908; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4664,7 +4664,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":909 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":909 */ __pyx_v_i = (__pyx_v_i - 1); } @@ -4700,7 +4700,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_x); __pyx_v_arr = Py_None; Py_INCREF(__pyx_v_arr); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":917 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":917 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} Py_INCREF(__pyx_v_x); @@ -4714,7 +4714,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":918 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":918 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -4731,7 +4731,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel } /*else*/ { - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":920 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":920 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -4747,7 +4747,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":921 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":921 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; goto __pyx_L1;} Py_INCREF(__pyx_v_arr); @@ -4757,7 +4757,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":922 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":922 */ Py_INCREF(__pyx_v_arr); __pyx_r = __pyx_v_arr; goto __pyx_L0; @@ -4830,7 +4830,7 @@ static __Pyx_InternTabEntry __pyx_intern_tab[] = { {&__pyx_n_random_sample, "random_sample"}, {&__pyx_n_rayleigh, "rayleigh"}, {&__pyx_n_reduce, "reduce"}, - {&__pyx_n_scipy, "scipy"}, + {&__pyx_n_numpy, "numpy"}, {&__pyx_n_seed, "seed"}, {&__pyx_n_set_state, "set_state"}, {&__pyx_n_shape, "shape"}, @@ -5082,7 +5082,7 @@ statichere PyTypeObject __pyx_type_6mtrand_RandomState = { 0, /*tp_setattro*/ &__pyx_tp_as_buffer_RandomState, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ - "Container for the Mersenne Twister PRNG.\n\n Constructor\n -----------\n RandomState(seed=None): initializes the PRNG with the given seed. See the\n seed() method for details.\n\n Distribution Methods\n -----------------\n RandomState exposes a number of methods for generating random numbers drawn\n from a variety of probability distributions. In addition to the\n distribution-specific arguments, each method takes a keyword argument\n size=None. If size is None, then a single value is generated and returned.\n If size is an integer, then a 1-D scipy array filled with generated values\n is returned. If size is a tuple, then a scipy array with that shape is\n filled and returned.\n ", /*tp_doc*/ + "Container for the Mersenne Twister PRNG.\n\n Constructor\n -----------\n RandomState(seed=None): initializes the PRNG with the given seed. See the\n seed() method for details.\n\n Distribution Methods\n -----------------\n RandomState exposes a number of methods for generating random numbers drawn\n from a variety of probability distributions. In addition to the\n distribution-specific arguments, each method takes a keyword argument\n size=None. If size is None, then a single value is generated and returned.\n If size is an integer, then a 1-D numpy array filled with generated values\n is returned. If size is a tuple, then a numpy array with that shape is\n filled and returned.\n ", /*tp_doc*/ __pyx_tp_traverse_6mtrand_RandomState, /*tp_traverse*/ __pyx_tp_clear_6mtrand_RandomState, /*tp_clear*/ 0, /*tp_richcompare*/ @@ -5124,516 +5124,516 @@ DL_EXPORT(void) initmtrand(void) { if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}; if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}; if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}; - __pyx_ptype_6mtrand_dtypedescr = __Pyx_ImportType("scipy", "dtypedescr", sizeof(PyArray_Descr)); if (!__pyx_ptype_6mtrand_dtypedescr) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; goto __pyx_L1;} - __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("scipy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_6mtrand_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 36; goto __pyx_L1;} + __pyx_ptype_6mtrand_dtypedescr = __Pyx_ImportType("numpy", "dtypedescr", sizeof(PyArray_Descr)); if (!__pyx_ptype_6mtrand_dtypedescr) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; goto __pyx_L1;} + __pyx_ptype_6mtrand_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_6mtrand_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 36; goto __pyx_L1;} if (PyType_Ready(&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; goto __pyx_L1;} if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 266; goto __pyx_L1;} __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":118 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":118 */ import_array(); - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":120 */ - __pyx_1 = __Pyx_Import(__pyx_n_scipy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":120 */ + __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":286 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":286 */ Py_INCREF(Py_None); __pyx_k2 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":295 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":295 */ Py_INCREF(Py_None); __pyx_k3 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":356 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":356 */ Py_INCREF(Py_None); __pyx_k4 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":363 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":363 */ Py_INCREF(Py_None); __pyx_k5 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":370 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":370 */ Py_INCREF(Py_None); __pyx_k6 = Py_None; Py_INCREF(Py_None); __pyx_k7 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":416 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":416 */ __pyx_k8 = 0.0; __pyx_k9 = 1.0; Py_INCREF(Py_None); __pyx_k10 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":446 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":446 */ Py_INCREF(Py_None); __pyx_k11 = Py_None; Py_INCREF(Py_None); __pyx_k12 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":459 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":459 */ Py_INCREF(Py_None); __pyx_k13 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":466 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":466 */ __pyx_k14 = 0.0; __pyx_k15 = 1.0; Py_INCREF(Py_None); __pyx_k16 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":475 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":475 */ Py_INCREF(Py_None); __pyx_k17 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":486 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":486 */ __pyx_k18 = 1.0; Py_INCREF(Py_None); __pyx_k19 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":495 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":495 */ Py_INCREF(Py_None); __pyx_k20 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":502 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":502 */ Py_INCREF(Py_None); __pyx_k21 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":511 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":511 */ __pyx_k22 = 1.0; Py_INCREF(Py_None); __pyx_k23 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":522 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":522 */ Py_INCREF(Py_None); __pyx_k24 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":533 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":533 */ Py_INCREF(Py_None); __pyx_k25 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":547 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":547 */ Py_INCREF(Py_None); __pyx_k26 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":556 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":556 */ Py_INCREF(Py_None); __pyx_k27 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":568 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":568 */ Py_INCREF(Py_None); __pyx_k28 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":575 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":575 */ Py_INCREF(Py_None); __pyx_k29 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":584 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":584 */ Py_INCREF(Py_None); __pyx_k30 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":594 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":594 */ Py_INCREF(Py_None); __pyx_k31 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":603 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":603 */ Py_INCREF(Py_None); __pyx_k32 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":612 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":612 */ Py_INCREF(Py_None); __pyx_k33 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":621 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":621 */ __pyx_k34 = 0.0; __pyx_k35 = 1.0; Py_INCREF(Py_None); __pyx_k36 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":630 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":630 */ __pyx_k37 = 0.0; __pyx_k38 = 1.0; Py_INCREF(Py_None); __pyx_k39 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":639 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":639 */ __pyx_k40 = 0.0; __pyx_k41 = 1.0; Py_INCREF(Py_None); __pyx_k42 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":648 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":648 */ __pyx_k43 = 0.0; __pyx_k44 = 1.0; Py_INCREF(Py_None); __pyx_k45 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":662 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":662 */ __pyx_k46 = 1.0; Py_INCREF(Py_None); __pyx_k47 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":671 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":671 */ Py_INCREF(Py_None); __pyx_k48 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":682 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":682 */ Py_INCREF(Py_None); __pyx_k49 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":698 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":698 */ Py_INCREF(Py_None); __pyx_k50 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":711 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":711 */ Py_INCREF(Py_None); __pyx_k51 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":725 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":725 */ __pyx_k52 = 1.0; Py_INCREF(Py_None); __pyx_k53 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":734 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":734 */ Py_INCREF(Py_None); __pyx_k54 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":743 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":743 */ Py_INCREF(Py_None); __pyx_k55 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":755 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":755 */ Py_INCREF(Py_None); __pyx_k56 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":776 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":776 */ Py_INCREF(Py_None); __pyx_k57 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":788 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":788 */ Py_INCREF(Py_None); __pyx_k58 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":846 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":846 */ Py_INCREF(Py_None); __pyx_k59 = Py_None; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":924 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":924 */ __pyx_1 = PyTuple_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;} __pyx_2 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":925 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":925 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_seed); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":926 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":926 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_get_state); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":927 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":927 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_set_state); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":928 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":928 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":929 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":929 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":930 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":930 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_bytes); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":931 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":931 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_uniform); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":932 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":932 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_rand); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":933 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":933 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_randn); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":934 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":934 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random_integers); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 934; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":935 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":935 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":936 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":936 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 936; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":937 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":937 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_beta); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 937; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":938 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":938 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_exponential); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 938; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":939 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":939 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_exponential); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":940 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":940 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_gamma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":941 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":941 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_gamma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":942 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":942 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_f); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":943 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":943 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_noncentral_f); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 943; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":944 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":944 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_chisquare); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 944; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":945 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":945 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_noncentral_chisquare); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":946 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":946 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_cauchy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 946; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":947 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":947 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_standard_t); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":948 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":948 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_vonmises); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":949 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":949 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_pareto); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":950 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":950 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_weibull); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":951 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":951 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_power); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":952 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":952 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_laplace); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":953 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":953 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_gumbel); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":954 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":954 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_logistic); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":955 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":955 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_lognormal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":956 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":956 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_rayleigh); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":957 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":957 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_wald); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":958 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":958 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_triangular); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":960 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":960 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_binomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":961 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":961 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_negative_binomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":962 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":962 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_poisson); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 962; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":963 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":963 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zipf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 963; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":964 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":964 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_geometric); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 964; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":965 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":965 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_hypergeometric); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":966 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":966 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 966; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_logseries); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 966; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 966; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":968 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":968 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_multivariate_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":969 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":969 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_multinomial); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":971 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":971 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/core/scipy/lib/mtrand/mtrand.pyx":972 */ + /* "/home/oliphant/core/numpy/lib/mtrand/mtrand.pyx":972 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_permutation); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5648,7 +5648,7 @@ DL_EXPORT(void) initmtrand(void) { static char *__pyx_filenames[] = { "mtrand.pyx", - "scipy.pxi", + "numpy.pxi", }; statichere char **__pyx_f = __pyx_filenames; diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index bf20ac913..4a49d009f 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -22,7 +22,7 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. include "Python.pxi" -include "scipy.pxi" +include "numpy.pxi" cdef extern from "math.h": double exp(double x) @@ -114,10 +114,10 @@ cdef extern from "initarray.h": void init_by_array(rk_state *self, unsigned long *init_key, unsigned long key_length) -# Initialize scipy +# Initialize numpy import_array() -import scipy as _sp +import numpy as _sp cdef object cont0_array(rk_state *state, rk_cont0 func, object size): cdef double *array_data @@ -277,8 +277,8 @@ cdef class RandomState: from a variety of probability distributions. In addition to the distribution-specific arguments, each method takes a keyword argument size=None. If size is None, then a single value is generated and returned. - If size is an integer, then a 1-D scipy array filled with generated values - is returned. If size is a tuple, then a scipy array with that shape is + If size is an integer, then a 1-D numpy array filled with generated values + is returned. If size is a tuple, then a numpy array with that shape is filled and returned. """ cdef rk_state *internal_state @@ -833,7 +833,7 @@ cdef class RandomState: # covariance. Note that sqrt(s)*v where (u,s,v) is the singular value # decomposition of cov is such an A. - from scipy.corelinalg import svd + from numpy.corelinalg import svd # XXX: we really should be doing this by Cholesky decomposition (u,s,v) = svd(cov) x = _sp.matrixmultiply(x*_sp.sqrt(s),v) diff --git a/numpy/random/mtrand/scipy.pxi b/numpy/random/mtrand/scipy.pxi index 9c7b4d01c..9ce61583a 100644 --- a/numpy/random/mtrand/scipy.pxi +++ b/numpy/random/mtrand/scipy.pxi @@ -3,7 +3,7 @@ # :License: BSD Style -cdef extern from "scipy/arrayobject.h": +cdef extern from "numpy/arrayobject.h": ctypedef enum PyArray_TYPES: PyArray_BOOL PyArray_BYTE @@ -29,11 +29,11 @@ cdef extern from "scipy/arrayobject.h": ctypedef int intp - ctypedef extern class scipy.dtypedescr [object PyArray_Descr]: + ctypedef extern class numpy.dtypedescr [object PyArray_Descr]: cdef int type_num, elsize cdef char type - ctypedef extern class scipy.ndarray [object PyArrayObject]: + ctypedef extern class numpy.ndarray [object PyArrayObject]: cdef char *data cdef int nd cdef intp *dimensions diff --git a/numpy/testing/__init__.py b/numpy/testing/__init__.py index a0a1405f0..028890a49 100644 --- a/numpy/testing/__init__.py +++ b/numpy/testing/__init__.py @@ -1,4 +1,4 @@ from info import __doc__ -from scipytest import * +from numpytest import * from utils import * diff --git a/numpy/testing/scipytest.py b/numpy/testing/scipytest.py index b2aea7b72..d23b6f0e4 100644 --- a/numpy/testing/scipytest.py +++ b/numpy/testing/scipytest.py @@ -207,7 +207,7 @@ class ScipyTest: """ def __init__(self, package=None): if package is None: - from scipy.distutils.misc_util import get_frame + from numpy.distutils.misc_util import get_frame f = get_frame(1) package = f.f_locals['__name__'] self.package = package diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py index 0f7764f07..96647f84e 100755 --- a/numpy/testing/setup.py +++ b/numpy/testing/setup.py @@ -1,16 +1,16 @@ #!/usr/bin/env python def configuration(parent_package='',top_path=None): - from scipy.distutils.misc_util import Configuration + from numpy.distutils.misc_util import Configuration config = Configuration('testing',parent_package,top_path) return config if __name__ == '__main__': - from scipy.distutils.core import setup + from numpy.distutils.core import setup setup(maintainer = "SciPy Developers", - maintainer_email = "scipy-dev@scipy.org", + maintainer_email = "numpy-dev@numpy.org", description = "SciPy test module", - url = "http://www.scipy.org", + url = "http://www.numpy.org", license = "SciPy License (BSD Style)", **configuration(top_path='').todict() ) diff --git a/scipy_compatibility b/scipy_compatibility index 062aadceb..ab0a13fd9 100644 --- a/scipy_compatibility +++ b/scipy_compatibility @@ -1,4 +1,4 @@ Changed names and behaviors in limits Changed usage of types Moved around some names -Moved scimath functions to scipy.math +Moved scimath functions to numpy.math @@ -44,10 +44,10 @@ def setup_package(): try: config = Configuration( maintainer = "SciPy Developers", - maintainer_email = "scipy-dev@scipy.org", + maintainer_email = "numpy-dev@numpy.org", description = DOCLINES[0], long_description = "\n".join(DOCLINES[2:]), - url = "http://numeric.scipy.org", + url = "http://numeric.numpy.org", download_url = "http://sourceforge.net/projects/numpy", license = 'BSD', classifiers=filter(None, CLASSIFIERS.split('\n')), |