[SciPy-dev] Data type change completed
Robert Cimrman
cimrman3 at ntc.zcu.cz
Tue Dec 6 05:22:21 EST 2005
a small patch to make full scipy compile:
Index: Lib/signal/sigtoolsmodule.c
===================================================================
--- Lib/signal/sigtoolsmodule.c (revision 1471)
+++ Lib/signal/sigtoolsmodule.c (working copy)
@@ -1408,7 +1408,7 @@
temp_ind[k]++;
if (!(check && index_out_of_bounds(temp_ind,dims1,ndims)) && \
- memcmp(ip2, ptr, ap2->itemsize)) {
+ memcmp(ip2, ptr, PyArray_ITEMSIZE( ap2 ))) {
memcpy(sort_buffer, ip1, elsize);
sort_buffer += elsize;
}
@@ -1621,7 +1621,7 @@
gen->data = py_arr->data;
gen->nd = py_arr->nd;
gen->dimensions = py_arr->dimensions;
- gen->elsize = py_arr->itemsize;
+ gen->elsize = PyArray_ITEMSIZE( py_arr );
gen->strides = py_arr->strides;
gen->zero = PyArray_Zero(py_arr);
return;
@@ -1629,7 +1629,7 @@
static void Py_copy_info_vec(Generic_Vector *gen, PyArrayObject *py_arr) {
gen->data = py_arr->data;
- gen->elsize = py_arr->itemsize;
+ gen->elsize = PyArray_ITEMSIZE( py_arr );
gen->numels = PyArray_Size((PyObject *)py_arr);
gen->zero = PyArray_Zero(py_arr);
return;
-----------------
and then:
In [4]:nm.__scipy_version__
Out[4]:'0.4.3.1471'
In [5]:nm.__core_version__
Out[5]:'0.8.0.1581'
======================================================================
FAIL: check_odeint1 (scipy.integrate.test_integrate.test_odeint)
----------------------------------------------------------------------
Traceback (most recent call last):
File
"/home/share/software/usr/lib/python2.4/site-packages/scipy/integrate/tests/test_integrate.py",
line 51, in check_odeint1
assert res < 1.0e-6
AssertionError
----------------------------------------------------------------------
Ran 1377 tests in 151.758s
FAILED (failures=1)
r.
More information about the SciPy-Dev
mailing list