On 7/14/2011 8:04 PM, Christoph Gohlke wrote:
A patch for the build issues is attached. Remove the build directory
before rebuilding.
Christoph,
I had other issues (I think in one case, a *.c file was not getting
re-built from the *.c.src file. But anyway, at the end the patch appears
to work.
Could someone with commit privileges commit it?
-Chris
--
Christopher Barker, Ph.D.
Oceanographer
Emergency Response Division
NOAA/NOS/OR&R (206) 526-6959 voice
7600 Sand Point Way NE (206) 526-6329 fax
Seattle, WA 98115 (206) 526-6317 main reception
[email protected]
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index d5f2edc..b7f6670 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -349,7 +349,7 @@ def check_types(config_cmd, ext, build_dir):
def check_mathlib(config_cmd):
# Testing the C math library
mathlibs = []
- mathlibs_choices = [[],['m'],['cpml']]
+ mathlibs_choices = [[],['cpml']]
mathlib = os.environ.get('MATHLIB')
if mathlib:
mathlibs_choices.insert(0,mathlib.split(','))
diff --git a/numpy/core/src/dummymodule.c b/numpy/core/src/dummymodule.c
index 595f84d..8aa4f2f 100644
--- a/numpy/core/src/dummymodule.c
+++ b/numpy/core/src/dummymodule.c
@@ -42,7 +42,7 @@ PyObject *PyInit__dummy(void) {
}
#else
PyMODINIT_FUNC
-init_sort(void) {
+init_dummy(void) {
Py_InitModule("_dummy", methods);
}
#endif
diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src
index e85b24c..0d1841b 100644
--- a/numpy/core/src/umath/loops.c.src
+++ b/numpy/core/src/umath/loops.c.src
@@ -1169,7 +1169,7 @@ TIMEDELTA_md_m_multiply(char **args, npy_intp
*dimensions, npy_intp *steps, void
BINARY_LOOP {
const npy_timedelta in1 = *(npy_timedelta *)ip1;
const double in2 = *(double *)ip2;
- if (in1 == NPY_DATETIME_NAT || isnan(in2)) {
+ if (in1 == NPY_DATETIME_NAT || npy_isnan(in2)) {
*((npy_timedelta *)op1) = NPY_DATETIME_NAT;
}
else {
@@ -1184,7 +1184,7 @@ TIMEDELTA_dm_m_multiply(char **args, npy_intp
*dimensions, npy_intp *steps, void
BINARY_LOOP {
const double in1 = *(double *)ip1;
const npy_timedelta in2 = *(npy_timedelta *)ip2;
- if (isnan(in1) || in2 == NPY_DATETIME_NAT) {
+ if (npy_isnan(in1) || in2 == NPY_DATETIME_NAT) {
*((npy_timedelta *)op1) = NPY_DATETIME_NAT;
}
else {
@@ -1220,7 +1220,7 @@ TIMEDELTA_md_m_divide(char **args, npy_intp *dimensions,
npy_intp *steps, void *
}
else {
double result = in1 / in2;
- if (isnan(result)) {
+ if (npy_isnan(result)) {
*((npy_timedelta *)op1) = NPY_DATETIME_NAT;
}
else {
_______________________________________________
NumPy-Discussion mailing list
[email protected]
http://mail.scipy.org/mailman/listinfo/numpy-discussion
