[Scipy-svn] r4953 - trunk/scipy/integrate

scipy-svn@scip... scipy-svn@scip...
Mon Nov 3 01:23:08 CST 2008


Author: chris.burns
Date: 2008-11-03 01:22:35 -0600 (Mon, 03 Nov 2008)
New Revision: 4953

Modified:
   trunk/scipy/integrate/__odepack.h
   trunk/scipy/integrate/__quadpack.h
   trunk/scipy/integrate/multipack.h
   trunk/scipy/integrate/setup.py
Log:
Update deprecated numpy array creation functions.

Changed PyArray_FromDims to PyArray_SimpleNew.
Change params to use npy_intp for 64bit platforms.
Update dependencies in setup.py.
Most of the work was done by paul.ivanov.



Modified: trunk/scipy/integrate/__odepack.h
===================================================================
--- trunk/scipy/integrate/__odepack.h	2008-11-03 07:02:14 UTC (rev 4952)
+++ trunk/scipy/integrate/__odepack.h	2008-11-03 07:22:35 UTC (rev 4953)
@@ -120,11 +120,11 @@
 {
   int itol = 0;
   double tol=1.49012e-8;
-  int one = 1;
+  npy_intp one = 1;
 
   /* Setup tolerances */
   if (o_rtol == NULL) {
-    *ap_rtol = (PyArrayObject *)PyArray_FromDims(1,&one,PyArray_DOUBLE);
+    *ap_rtol = (PyArrayObject *)PyArray_SimpleNew(1, &one, PyArray_DOUBLE);
     if (*ap_rtol == NULL) PYERR2(odepack_error,"Error constructing relative tolerance.");
     *(double *)(*ap_rtol)->data = tol;                /* Default */
   }
@@ -139,7 +139,7 @@
   }
 
   if (o_atol == NULL) {
-    *ap_atol = (PyArrayObject *)PyArray_FromDims(1,&one,PyArray_DOUBLE);
+    *ap_atol = (PyArrayObject *)PyArray_SimpleNew(1,&one,PyArray_DOUBLE);
     if (*ap_atol == NULL) PYERR2(odepack_error,"Error constructing absolute tolerance");
     *(double *)(*ap_atol)->data = tol;
   }
@@ -211,8 +211,9 @@
   PyArrayObject *ap_hu=NULL, *ap_tcur=NULL, *ap_tolsf=NULL, *ap_tsw=NULL;
   PyArrayObject *ap_nst=NULL, *ap_nfe=NULL, *ap_nje=NULL, *ap_nqu=NULL;
   PyArrayObject *ap_mused=NULL;
-  int      imxer=0, lenrw=0, leniw=0, out_sz=0, col_deriv = 0;
-  int      k, dims[2], ntimes, crit_ind=0;
+  int      imxer=0, lenrw=0, leniw=0, col_deriv = 0;
+  npy_intp out_sz=0,dims[2];
+  int      k, ntimes, crit_ind=0;
   int      allocated = 0, full_output = 0, numcrit=0;
   double   *yout, *yout_ptr, *tout_ptr, *tcrit;
   double   *wa;
@@ -258,7 +259,7 @@
   t = tout[0];
 
   /* Setup array to hold the output evaluations*/
-  ap_yout= (PyArrayObject *)PyArray_FromDims(2,dims,PyArray_DOUBLE);
+  ap_yout= (PyArrayObject *)PyArray_SimpleNew(2,dims,PyArray_DOUBLE);
   if (ap_yout== NULL) goto fail;
   yout = (double *) ap_yout->data;
   /* Copy initial vector into first row of output */
@@ -296,15 +297,15 @@
   /* If full output make some useful output arrays */
   if (full_output) {
     out_sz = ntimes-1;
-    ap_hu = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_DOUBLE);
-    ap_tcur = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_DOUBLE);
-    ap_tolsf = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_DOUBLE);
-    ap_tsw = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_DOUBLE);
-    ap_nst = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_INT);
-    ap_nfe = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_INT);
-    ap_nje = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_INT);
-    ap_nqu = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_INT);
-    ap_mused = (PyArrayObject *)PyArray_FromDims(1,&out_sz,PyArray_INT);
+    ap_hu = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_DOUBLE);
+    ap_tcur = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_DOUBLE);
+    ap_tolsf = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_DOUBLE);
+    ap_tsw = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_DOUBLE);
+    ap_nst = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_INT);
+    ap_nfe = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_INT);
+    ap_nje = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_INT);
+    ap_nqu = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_INT);
+    ap_mused = (PyArrayObject *)PyArray_SimpleNew(1,&out_sz,PyArray_INT);
     if (ap_hu == NULL || ap_tcur == NULL || ap_tolsf == NULL || ap_tsw == NULL || ap_nst == NULL || ap_nfe == NULL || ap_nje == NULL || ap_nqu == NULL || ap_mused == NULL) goto fail;
   }
 

Modified: trunk/scipy/integrate/__quadpack.h
===================================================================
--- trunk/scipy/integrate/__quadpack.h	2008-11-03 07:02:14 UTC (rev 4952)
+++ trunk/scipy/integrate/__quadpack.h	2008-11-03 07:22:35 UTC (rev 4953)
@@ -105,7 +105,8 @@
   PyObject *extra_args = NULL;
   PyObject *fcn;
 
-  int      limit=50, full_output = 0;
+  npy_intp limit=50;
+  int      full_output = 0;
   double   a, b, epsabs=1.49e-8, epsrel=1.49e-8;
   int      neval=0, ier=6, last=0, *iord;
   double   result=0.0, abserr=0.0;
@@ -122,11 +123,11 @@
   QUAD_INIT_FUNC(fcn,extra_args)
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL) goto fail;
   iord = (int *)ap_iord->data;
   alist = (double *)ap_alist->data;
@@ -183,7 +184,8 @@
   PyObject *extra_args = NULL;
   PyObject *fcn;
 
-  int      limit=50, full_output = 0;
+  npy_intp limit=50;
+  int      full_output = 0;
   double   bound, epsabs=1.49e-8, epsrel=1.49e-8;
   int      inf, neval=0, ier=6, last=0, *iord;
   double   result=0.0, abserr=0.0;
@@ -200,11 +202,11 @@
   QUAD_INIT_FUNC(fcn,extra_args);
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL) goto fail;
   iord = (int *)ap_iord->data;
   alist = (double *)ap_alist->data;
@@ -265,7 +267,8 @@
   PyObject *extra_args = NULL;
   PyObject *fcn, *o_points;
 
-  int      limit=50, full_output = 0, npts2;
+  npy_intp limit=50, npts2;
+  int      full_output = 0;
   double   a, b, epsabs=1.49e-8, epsrel=1.49e-8;
   int      neval=0, ier=6, last=0, *iord;
   int      *level, *ndin;
@@ -289,14 +292,14 @@
   points = (double *)ap_points->data;
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_pts = (PyArrayObject *)PyArray_FromDims(1,&npts2,PyArray_DOUBLE);
-  ap_level = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_ndin = (PyArrayObject *)PyArray_FromDims(1,&npts2,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_pts = (PyArrayObject *)PyArray_SimpleNew(1,&npts2,PyArray_DOUBLE);
+  ap_level = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_ndin = (PyArrayObject *)PyArray_SimpleNew(1,&npts2,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL || ap_pts == NULL || ap_level == NULL || ap_ndin == NULL) goto fail;
   iord = (int *)ap_iord->data;
   alist = (double *)ap_alist->data;
@@ -366,10 +369,11 @@
   PyObject *extra_args = NULL, *o_chebmo = NULL;
   PyObject *fcn;
 
-  int      limit=50, full_output = 0, maxp1=50, icall=1;
+  npy_intp limit=50, sz[2];
+  int      full_output = 0, maxp1=50, icall=1;
   double   a, b, epsabs=1.49e-8, epsrel=1.49e-8;
   int      neval=0, ier=6, integr=1, last=0, momcom=0, *iord;
-  int      sz[2], *nnlog;
+  int      *nnlog;
   double   result=0.0, abserr=0.0, omega=0.0;
   double   *chebmo;
   double   *alist, *blist, *rlist, *elist;
@@ -393,18 +397,18 @@
   else {
     sz[0] = 25;
     sz[1] = maxp1;
-    ap_chebmo = (PyArrayObject *)PyArray_FromDims(2,sz,PyArray_DOUBLE);
+    ap_chebmo = (PyArrayObject *)PyArray_SimpleNew(2,sz,PyArray_DOUBLE);
     if (ap_chebmo == NULL) goto fail;
   }
   chebmo = (double *) ap_chebmo->data;
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_nnlog = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_nnlog = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_nnlog == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL) goto fail;
   iord = (int *)ap_iord->data;
   nnlog = (int *)ap_nnlog->data;
@@ -469,10 +473,11 @@
   PyObject *extra_args = NULL;
   PyObject *fcn;
 
-  int      limlst = 50, limit=50, full_output = 0, maxp1=50;
+  npy_intp limlst = 50, limit=50, sz[2];
+  int      full_output = 0, maxp1=50;
   double   a, epsabs=1.49e-8;
   int      neval=0, ier=6, integr=1, *iord;
-  int      sz[2], lst, *nnlog, *ierlst;
+  int      lst, *nnlog, *ierlst;
   double   *chebmo, *rslst, *erlst;
   double   result=0.0, abserr=0.0, omega=0.0;
   double   *alist, *blist, *rlist, *elist;
@@ -489,20 +494,20 @@
 
   sz[0] = 25;
   sz[1] = maxp1;
-  ap_chebmo = (PyArrayObject *)PyArray_FromDims(2,sz,PyArray_DOUBLE);
+  ap_chebmo = (PyArrayObject *)PyArray_SimpleNew(2,sz,PyArray_DOUBLE);
   if (ap_chebmo == NULL) goto fail;
   chebmo = (double *) ap_chebmo->data;
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_nnlog = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rslst = (PyArrayObject *)PyArray_FromDims(1,&limlst,PyArray_DOUBLE);
-  ap_erlst = (PyArrayObject *)PyArray_FromDims(1,&limlst,PyArray_DOUBLE);
-  ap_ierlst = (PyArrayObject *)PyArray_FromDims(1,&limlst,PyArray_INT);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_nnlog = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rslst = (PyArrayObject *)PyArray_SimpleNew(1,&limlst,PyArray_DOUBLE);
+  ap_erlst = (PyArrayObject *)PyArray_SimpleNew(1,&limlst,PyArray_DOUBLE);
+  ap_ierlst = (PyArrayObject *)PyArray_SimpleNew(1,&limlst,PyArray_INT);
   if (ap_iord == NULL || ap_nnlog == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL || ap_rslst == NULL || ap_erlst == NULL || ap_ierlst == NULL) goto fail;
   iord = (int *)ap_iord->data;
   nnlog = (int *)ap_nnlog->data;
@@ -574,7 +579,8 @@
   PyObject *extra_args = NULL;
   PyObject *fcn;
 
-  int      limit=50, full_output = 0;
+  npy_intp limit=50;
+  int      full_output = 0;
   double   a, b, c, epsabs=1.49e-8, epsrel=1.49e-8;
   int      neval=0, ier=6, last=0, *iord;
   double   result=0.0, abserr=0.0;
@@ -591,11 +597,11 @@
   QUAD_INIT_FUNC(fcn,extra_args)
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL) goto fail;
   iord = (int *)ap_iord->data;
   alist = (double *)ap_alist->data;
@@ -653,7 +659,8 @@
   PyObject *extra_args = NULL;
   PyObject *fcn;
 
-  int      limit=50, full_output = 0, integr;
+  int      full_output = 0, integr;
+  npy_intp limit=50;
   double   a, b, epsabs=1.49e-8, epsrel=1.49e-8;
   double   alfa, beta;
   int      neval=0, ier=6, last=0, *iord;
@@ -671,11 +678,11 @@
   QUAD_INIT_FUNC(fcn,extra_args)
 
   /* Setup iwork and work arrays */
-  ap_iord = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_INT);
-  ap_alist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_blist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_rlist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
-  ap_elist = (PyArrayObject *)PyArray_FromDims(1,&limit,PyArray_DOUBLE);
+  ap_iord = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_INT);
+  ap_alist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_blist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_rlist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
+  ap_elist = (PyArrayObject *)PyArray_SimpleNew(1,&limit,PyArray_DOUBLE);
   if (ap_iord == NULL || ap_alist == NULL || ap_blist == NULL || ap_rlist == NULL || ap_elist == NULL) goto fail;
   iord = (int *)ap_iord->data;
   alist = (double *)ap_alist->data;

Modified: trunk/scipy/integrate/multipack.h
===================================================================
--- trunk/scipy/integrate/multipack.h	2008-11-03 07:02:14 UTC (rev 4952)
+++ trunk/scipy/integrate/multipack.h	2008-11-03 07:22:35 UTC (rev 4953)
@@ -83,7 +83,7 @@
 
 #define SET_DIAG(ap_diag,o_diag,mode) { /* Set the diag vector from input */ \
   if (o_diag == NULL || o_diag == Py_None) { \
-    ap_diag = (PyArrayObject *)PyArray_FromDims(1,&n,PyArray_DOUBLE); \
+    ap_diag = (PyArrayObject *)PyArray_SimpleNew(1,&n,PyArray_DOUBLE); \
     if (ap_diag == NULL) goto fail; \
     diag = (double *)ap_diag -> data; \
     mode = 1; \
@@ -130,7 +130,7 @@
   return new_array;
 }
 
-static PyObject *call_python_function(PyObject *func, int n, double *x, PyObject *args, int dim, PyObject *error_obj)
+static PyObject *call_python_function(PyObject *func, npy_intp n, double *x, PyObject *args, int dim, PyObject *error_obj)
 {
   /*
     This is a generic function to call a python function that takes a 1-D
@@ -152,7 +152,7 @@
   PyArrayObject *result_array = NULL;
 
   /* Build sequence argument from inputs */
-  sequence = (PyArrayObject *)PyArray_FromDimsAndData(1, &n, PyArray_DOUBLE, (char *)x);
+  sequence = (PyArrayObject *)PyArray_SimpleNewFromData(1, &n, PyArray_DOUBLE, (char *)x);
   if (sequence == NULL) PYERR2(error_obj,"Internal failure to make an array of doubles out of first\n                 argument to function call.");
 
   /* Build argument list */

Modified: trunk/scipy/integrate/setup.py
===================================================================
--- trunk/scipy/integrate/setup.py	2008-11-03 07:02:14 UTC (rev 4952)
+++ trunk/scipy/integrate/setup.py	2008-11-03 07:22:35 UTC (rev 4953)
@@ -29,7 +29,8 @@
 
     config.add_extension('_quadpack',
                          sources=['_quadpackmodule.c'],
-                         libraries=['quadpack', 'linpack_lite', 'mach'])
+                         libraries=['quadpack', 'linpack_lite', 'mach'],
+                         depends=['quadpack.h','__quadpack.h'])
     # odepack
     libs = ['odepack','linpack_lite','mach']
 
@@ -44,6 +45,7 @@
     config.add_extension('_odepack',
                          sources=['_odepackmodule.c'],
                          libraries=libs,
+                         depends=['__odepack.h','multipack.h'],
                          **newblas)
 
     # vode



More information about the Scipy-svn mailing list