8000 Win32 build by mwiebe · Pull Request #118 · numpy/numpy · GitHub
[go: up one dir, main page]

Skip to content

Win32 build #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: Fixes build on Win32 with MSVC, thanks to Christoph Gohlke
  • Loading branch information
Mark Wiebe committed Jul 20, 2011
commit 03122fa9c90056597958d933745a0fb053984716
2 changes: 1 addition & 1 deletion numpy/core/src/dummymodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ PyObject *PyInit__dummy(void) {
}
#else
PyMODINIT_FUNC
init_sort(void) {
init_dummy(void) {
Py_InitModule("_dummy", methods);
}
#endif
6 changes: 3 additions & 3 deletions numpy/core/src/umath/loops.c.src
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
0