[Scipy-svn] r2054 - in trunk/Lib: . cluster/src io ndimage ndimage/src optimize sandbox/delaunay sandbox/numexpr sandbox/xplt/pygist signal special
scipy-svn at scipy.org
scipy-svn at scipy.org
Fri Jul 7 21:51:18 EDT 2006
Author: oliphant
Date: 2006-07-07 20:51:06 -0500 (Fri, 07 Jul 2006)
New Revision: 2054
Modified:
trunk/Lib/cluster/src/swig_num.i
trunk/Lib/cluster/src/vq_wrap.cpp
trunk/Lib/io/numpyiomodule.c
trunk/Lib/ndimage/setup.py
trunk/Lib/ndimage/src/nd_image.h
trunk/Lib/optimize/minpack.h
trunk/Lib/sandbox/delaunay/_delaunay.cpp
trunk/Lib/sandbox/numexpr/interpreter.c
trunk/Lib/sandbox/xplt/pygist/gistCmodule.c
trunk/Lib/setup.py
trunk/Lib/signal/C_bspline_util.c
trunk/Lib/signal/D_bspline_util.c
trunk/Lib/signal/S_bspline_util.c
trunk/Lib/signal/Z_bspline_util.c
trunk/Lib/signal/medianfilter.c
trunk/Lib/signal/sigtools.h
trunk/Lib/signal/splinemodule.c
trunk/Lib/special/ufunc_extras.h
Log:
Get compilation of SciPy except for ndimage.
Modified: trunk/Lib/cluster/src/swig_num.i
===================================================================
--- trunk/Lib/cluster/src/swig_num.i 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/cluster/src/swig_num.i 2006-07-08 01:51:06 UTC (rev 2054)
@@ -279,7 +279,7 @@
//PyErr_SetString(PyExc_ValueError, "error converting internal data to array");
return NULL;
}
- res->flags |= OWN_DATA; // we want the array to deallocate mem when it is finished.
+ res->flags |= NPY_OWNDATA; // we want the array to deallocate mem when it is finished.
// stick result in the output tuple (target).
// Need to think about generality of this one...
return (PyObject *) res;
Modified: trunk/Lib/cluster/src/vq_wrap.cpp
===================================================================
--- trunk/Lib/cluster/src/vq_wrap.cpp 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/cluster/src/vq_wrap.cpp 2006-07-08 01:51:06 UTC (rev 2054)
@@ -560,7 +560,7 @@
}
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
// hmmm. how do we prevent typedefs from conflicting
// with users definition on complex numbers?
@@ -731,7 +731,7 @@
//PyErr_SetString(PyExc_ValueError, "error converting internal data to array");
return NULL;
}
- res->flags |= OWN_DATA; // we want the array to deallocate mem when it is finished.
+ res->flags |= NPY_OWNDATA; // we want the array to deallocate mem when it is finished.
// stick result in the output tuple (target).
// Need to think about generality of this one...
return (PyObject *) res;
Modified: trunk/Lib/io/numpyiomodule.c
===================================================================
--- trunk/Lib/io/numpyiomodule.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/io/numpyiomodule.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -41,7 +41,7 @@
#define OBJECTTYPE(arr) ((arr)->descr->type_num)
#define BASEOBJ(arr) ((PyArrayObject *)((arr)->base))
#define RANK(arr) ((arr)->nd)
-#define ISCONTIGUOUS(m) ((m)->flags & CONTIGUOUS)
+#define ISCONTIGUOUS(m) ((m)->flags & NPY_CONTIGUOUS)
#define PYSETERROR(message) \
{ PyErr_SetString(ErrorObject, message); goto fail; }
@@ -635,7 +635,7 @@
}
size = PySequence_Size(res);
- for (k=0; k < MIN(size,2); k++) {
+ for (k=0; k < NPY_MIN(size,2); k++) {
elobj = PySequence_GetItem(res, k);
if (elobj == NULL) goto fail;
elN = PyString_Size(elobj);
@@ -695,7 +695,7 @@
switch(ctype) {
case 'c': return PyArray_CHAR;
case 'b': return PyArray_UBYTE;
- case '1': return PyArray_SBYTE;
+ case '1': return PyArray_BYTE;
case 's': return PyArray_SHORT;
case 'i': return PyArray_INT;
#ifdef PyArray_UNSIGNED_TYPES
Modified: trunk/Lib/ndimage/setup.py
===================================================================
--- trunk/Lib/ndimage/setup.py 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/ndimage/setup.py 2006-07-08 01:51:06 UTC (rev 2054)
@@ -8,7 +8,7 @@
config.add_extension("_nd_image",
sources=["src/nd_image.c","src/ni_filters.c",
"src/ni_fourier.c","src/ni_interpolation.c",
- "src/ni_measure.c","src/numcompat.c",
+ "src/ni_measure.c",
"src/ni_morphology.c","src/ni_support.c"],
include_dirs=['src'],
)
Modified: trunk/Lib/ndimage/src/nd_image.h
===================================================================
--- trunk/Lib/ndimage/src/nd_image.h 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/ndimage/src/nd_image.h 2006-07-08 01:51:06 UTC (rev 2054)
@@ -36,7 +36,7 @@
#define NO_IMPORT_ARRAY
#endif
#include "Python.h"
-#include "numcompat.h"
+#include "numpy/libnumarray.h"
#define NI_MAXDIM MAXDIM
Modified: trunk/Lib/optimize/minpack.h
===================================================================
--- trunk/Lib/optimize/minpack.h 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/optimize/minpack.h 2006-07-08 01:51:06 UTC (rev 2054)
@@ -33,7 +33,7 @@
#define PYERR(errobj,message) {PyErr_SetString(errobj,message); goto fail;}
#define PYERR2(errobj,message) {PyErr_Print(); PyErr_SetString(errobj, message); goto fail;}
-#define ISCONTIGUOUS(m) ((m)->flags & CONTIGUOUS)
+#define ISCONTIGUOUS(m) ((m)->flags & NPY_CONTIGUOUS)
#define STORE_VARS() PyObject *store_multipack_globals[4]; int store_multipack_globals3;
Modified: trunk/Lib/sandbox/delaunay/_delaunay.cpp
===================================================================
--- trunk/Lib/sandbox/delaunay/_delaunay.cpp 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/sandbox/delaunay/_delaunay.cpp 2006-07-08 01:51:06 UTC (rev 2054)
@@ -5,7 +5,7 @@
#include "VoronoiDiagramGenerator.h"
#include "delaunay_utils.h"
#include "natneighbors.h"
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
using namespace std;
Modified: trunk/Lib/sandbox/numexpr/interpreter.c
===================================================================
--- trunk/Lib/sandbox/numexpr/interpreter.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/sandbox/numexpr/interpreter.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -1,6 +1,6 @@
#include "Python.h"
#include "structmember.h"
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
#include "math.h"
#include "complex_functions.inc"
Modified: trunk/Lib/sandbox/xplt/pygist/gistCmodule.c
===================================================================
--- trunk/Lib/sandbox/xplt/pygist/gistCmodule.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/sandbox/xplt/pygist/gistCmodule.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -187,6 +187,7 @@
#include "pyfpe.h"
#include "numpy/arrayobject.h"
+#define OWN_DATA NPY_OWNDATA
#include "hlevel.h"
#include "pstdlib.h"
Modified: trunk/Lib/setup.py
===================================================================
--- trunk/Lib/setup.py 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/setup.py 2006-07-08 01:51:06 UTC (rev 2054)
@@ -19,7 +19,7 @@
config.add_subpackage('sparse')
config.add_subpackage('special')
config.add_subpackage('stats')
- config.add_subpackage('ndimage')
+ #config.add_subpackage('ndimage')
config.add_subpackage('weave')
config.make_svn_version_py() # installs __svn_version__.py
config.make_config_py()
Modified: trunk/Lib/signal/C_bspline_util.c
===================================================================
--- trunk/Lib/signal/C_bspline_util.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/C_bspline_util.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -26,7 +26,7 @@
void C_IIR_order2_cascade (__complex__ float,__complex__ float,__complex__ float,__complex__ float,__complex__ float*,__complex__ float*,int,int,int);
int C_IIR_forback1(__complex__ float,__complex__ float,__complex__ float*,__complex__ float*,int,int,int,float);
void C_FIR_mirror_symmetric(__complex__ float*,__complex__ float*,int,__complex__ float*,int,int,int);
-int C_separable_2Dconvolve_mirror(__complex__ float*,__complex__ float*,int,int,__complex__ float*,__complex__ float*,int,int,intp*,intp*);
+int C_separable_2Dconvolve_mirror(__complex__ float*,__complex__ float*,int,int,__complex__ float*,__complex__ float*,int,int,npy_intp*,npy_intp*);
void
C_IIR_order1 (a1, a2, x, y, N, stridex, stridey)
@@ -262,7 +262,7 @@
int M, N;
__complex__ float *hr, *hc;
int Nhr, Nhc;
- intp *instrides, *outstrides;
+ npy_intp *instrides, *outstrides;
{
int m, n;
__complex__ float *tmpmem;
Modified: trunk/Lib/signal/D_bspline_util.c
===================================================================
--- trunk/Lib/signal/D_bspline_util.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/D_bspline_util.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -21,10 +21,10 @@
void D_IIR_order2_cascade(double,double,double,double,double*,double*,int,int,int);
int D_IIR_forback1(double,double,double*,double*,int,int,int,double);
void D_FIR_mirror_symmetric(double*,double*,int,double*,int,int,int);
-int D_separable_2Dconvolve_mirror(double*,double*,int,int,double*,double*,int,int,intp*,intp*);
+int D_separable_2Dconvolve_mirror(double*,double*,int,int,double*,double*,int,int,npy_intp*,npy_intp*);
int D_IIR_forback2(double,double,double*,double*,int,int,int,double);
-int D_cubic_spline2D(double*,double*,int,int,double,intp*,intp*,double);
-int D_quadratic_spline2D(double*,double*,int,int,double,intp*,intp*,double);
+int D_cubic_spline2D(double*,double*,int,int,double,npy_intp*,npy_intp*,double);
+int D_quadratic_spline2D(double*,double*,int,int,double,npy_intp*,npy_intp*,double);
/* Implement the following difference equation */
/* y[n] = a1 * x[n] + a2 * y[n-1] */
@@ -264,7 +264,7 @@
int M, N;
double *hr, *hc;
int Nhr, Nhc;
- intp *instrides, *outstrides;
+ npy_intp *instrides, *outstrides;
{
int m, n;
double *tmpmem;
@@ -505,7 +505,7 @@
double *coeffs;
int M, N;
double lambda;
- intp *strides, *cstrides;
+ npy_intp *strides, *cstrides;
double precision;
{
double r, omega;
@@ -598,7 +598,7 @@
double *coeffs;
int M, N;
double lambda;
- intp *strides, *cstrides;
+ npy_intp *strides, *cstrides;
double precision;
{
double r;
Modified: trunk/Lib/signal/S_bspline_util.c
===================================================================
--- trunk/Lib/signal/S_bspline_util.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/S_bspline_util.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -5,7 +5,7 @@
#include <string.h>
#include <stdio.h>
#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
void compute_root_from_lambda(double, double *, double *);
Modified: trunk/Lib/signal/Z_bspline_util.c
===================================================================
--- trunk/Lib/signal/Z_bspline_util.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/Z_bspline_util.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -18,7 +18,7 @@
void Z_IIR_order2_cascade (__complex__ double,__complex__ double,__complex__ double,__complex__ double,__complex__ double*,__complex__ double*,int,int,int);
int Z_IIR_forback1(__complex__ double,__complex__ double,__complex__ double*,__complex__ double*,int,int,int,double);
void Z_FIR_mirror_symmetric(__complex__ double*,__complex__ double*,int,__complex__ double*,int,int,int);
-int Z_separable_2Dconvolve_mirror(__complex__ double*,__complex__ double*,int,int,__complex__ double*,__complex__ double*,int,int,intp*,intp*);
+int Z_separable_2Dconvolve_mirror(__complex__ double*,__complex__ double*,int,int,__complex__ double*,__complex__ double*,int,int,npy_intp*,npy_intp*);
/* Implement the following difference equation */
/* y[n] = a1 * x[n] + a2 * y[n-1] */
@@ -260,7 +260,7 @@
int M, N;
__complex__ double *hr, *hc;
int Nhr, Nhc;
- intp *instrides, *outstrides;
+ npy_intp *instrides, *outstrides;
{
int m, n;
__complex__ double *tmpmem;
Modified: trunk/Lib/signal/medianfilter.c
===================================================================
--- trunk/Lib/signal/medianfilter.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/medianfilter.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -9,7 +9,7 @@
#include "Python.h"
#define NO_IMPORT_ARRAY
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
void f_medfilt2(float*,float*,intp*,intp*);
void d_medfilt2(double*,double*,intp*,intp*);
Modified: trunk/Lib/signal/sigtools.h
===================================================================
--- trunk/Lib/signal/sigtools.h 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/sigtools.h 2006-07-08 01:51:06 UTC (rev 2054)
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
#define BOUNDARY_MASK 12
#define OUTSIZE_MASK 3
Modified: trunk/Lib/signal/splinemodule.c
===================================================================
--- trunk/Lib/signal/splinemodule.c 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/signal/splinemodule.c 2006-07-08 01:51:06 UTC (rev 2054)
@@ -13,31 +13,31 @@
#define RANK(arr) ((arr)->nd)
#define ISCONTIGUOUS(m) ((m)->flags & CONTIGUOUS)
-static void convert_strides(intp*,intp*,int,int);
+static void convert_strides(npy_intp*,npy_intp*,int,int);
-extern int S_cubic_spline2D(float*,float*,int,int,double,intp*,intp*,float);
-extern int S_quadratic_spline2D(float*,float*,int,int,double,intp*,intp*,float);
+extern int S_cubic_spline2D(float*,float*,int,int,double,npy_intp*,npy_intp*,float);
+extern int S_quadratic_spline2D(float*,float*,int,int,double,npy_intp*,npy_intp*,float);
extern int S_IIR_forback1(float,float,float*,float*,int,int,int,float);
extern int S_IIR_forback2(double,double,float*,float*,int,int,int,float);
-extern int S_separable_2Dconvolve_mirror(float*,float*,int,int,float*,float*,int,int,intp*,intp*);
+extern int S_separable_2Dconvolve_mirror(float*,float*,int,int,float*,float*,int,int,npy_intp*,npy_intp*);
-extern int D_cubic_spline2D(double*,double*,int,int,double,intp*,intp*,double);
-extern int D_quadratic_spline2D(double*,double*,int,int,double,intp*,intp*,double);
+extern int D_cubic_spline2D(double*,double*,int,int,double,npy_intp*,npy_intp*,double);
+extern int D_quadratic_spline2D(double*,double*,int,int,double,npy_intp*,npy_intp*,double);
extern int D_IIR_forback1(double,double,double*,double*,int,int,int,double);
extern int D_IIR_forback2(double,double,double*,double*,int,int,int,double);
-extern int D_separable_2Dconvolve_mirror(double*,double*,int,int,double*,double*,int,int,intp*,intp*);
+extern int D_separable_2Dconvolve_mirror(double*,double*,int,int,double*,double*,int,int,npy_intp*,npy_intp*);
#ifdef __GNUC__
extern int C_IIR_forback1(__complex__ float,__complex__ float,__complex__ float*,__complex__ float*,int,int,int,float);
-extern int C_separable_2Dconvolve_mirror(__complex__ float*,__complex__ float*,int,int,__complex__ float*,__complex__ float*,int,int,intp*,intp*);
+extern int C_separable_2Dconvolve_mirror(__complex__ float*,__complex__ float*,int,int,__complex__ float*,__complex__ float*,int,int,npy_intp*,npy_intp*);
extern int Z_IIR_forback1(__complex__ double,__complex__ double,__complex__ double*,__complex__ double*,int,int,int,double);
-extern int Z_separable_2Dconvolve_mirror(__complex__ double*,__complex__ double*,int,int,__complex__ double*,__complex__ double*,int,int,intp*,intp*);
+extern int Z_separable_2Dconvolve_mirror(__complex__ double*,__complex__ double*,int,int,__complex__ double*,__complex__ double*,int,int,npy_intp*,npy_intp*);
#endif
static void
-convert_strides(intp* instrides,intp* convstrides,int size,int N)
+convert_strides(npy_intp* instrides,npy_intp* convstrides,int size,int N)
{
- int n; intp bitshift;
+ int n; npy_intp bitshift;
bitshift = -1;
@@ -69,7 +69,7 @@
double lambda = 0.0;
double precision = -1.0;
int thetype, M, N, retval=0;
- intp outstrides[2], instrides[2];
+ npy_intp outstrides[2], instrides[2];
if (!PyArg_ParseTuple(args, "O|dd", &image, &lambda, &precision)) return NULL;
@@ -126,7 +126,7 @@
double lambda = 0.0;
double precision = -1.0;
int thetype, M, N, retval=0;
- intp outstrides[2], instrides[2];
+ npy_intp outstrides[2], instrides[2];
if (!PyArg_ParseTuple(args, "O|dd", &image, &lambda, &precision)) return NULL;
@@ -182,7 +182,7 @@
PyObject *image=NULL, *hrow=NULL, *hcol=NULL;
PyArrayObject *a_image=NULL, *a_hrow=NULL, *a_hcol=NULL, *out=NULL;
int thetype, M, N, ret;
- intp outstrides[2], instrides[2];
+ npy_intp outstrides[2], instrides[2];
if (!PyArg_ParseTuple(args, "OOO", &image, &hrow, &hcol)) return NULL;
@@ -291,7 +291,7 @@
Py_complex c0, z1;
double precision = -1.0;
int thetype, N, ret;
- intp outstrides, instrides;
+ npy_intp outstrides, instrides;
if (!PyArg_ParseTuple(args, "ODD|d", &sig, &c0, &z1, &precision))
return NULL;
@@ -411,7 +411,7 @@
double r, omega;
double precision = -1.0;
int thetype, N, ret;
- intp outstrides, instrides;
+ npy_intp outstrides, instrides;
if (!PyArg_ParseTuple(args, "Odd|d", &sig, &r, &omega, &precision))
return NULL;
Modified: trunk/Lib/special/ufunc_extras.h
===================================================================
--- trunk/Lib/special/ufunc_extras.h 2006-07-07 22:15:59 UTC (rev 2053)
+++ trunk/Lib/special/ufunc_extras.h 2006-07-08 01:51:06 UTC (rev 2054)
@@ -1,5 +1,5 @@
#include "Python.h"
-#include "numpy/arrayobject.h"
+#include "numpy/noprefix.h"
typedef int IntFunc_d_dd(double x, double *y, double *z);
typedef int IntFunc_d_dddd(double v, double *w, double *x, double *y, double *z);
More information about the Scipy-svn
mailing list