diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-09-07 14:37:29 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-09-07 14:37:29 -0700 |
| commit | 25445cd10ae39deea072b84cfe2ede509e599ea5 (patch) | |
| tree | 09c92004bd0c0455519c37c827b83ae0daa8742b | |
| parent | 089cc017cdc0b8105d40d74eae15539b1e309e01 (diff) | |
| parent | e20a54b72cb2c8a15cba3e6fe5c2045fdf5286c9 (diff) | |
| download | numpy-25445cd10ae39deea072b84cfe2ede509e599ea5.tar.gz | |
Merge pull request #3697 from charris/fix-simd-for-windows
BUG: Fix UFUNC_CHECK_STATUS to work on both 32 and 64 bit Windows.
| -rw-r--r-- | numpy/core/include/numpy/ufuncobject.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h index aab336da8..423fbc279 100644 --- a/numpy/core/include/numpy/ufuncobject.h +++ b/numpy/core/include/numpy/ufuncobject.h @@ -365,11 +365,21 @@ typedef struct _loop1d_info { #include <float.h> - /* Clear the floating point exception default of Borland C++ */ +/* Clear the floating point exception default of Borland C++ */ #if defined(__BORLANDC__) #define UFUNC_NOFPE _control87(MCW_EM, MCW_EM); #endif +#if defined(_WIN64) +#define UFUNC_CHECK_STATUS(ret) { \ + int fpstatus = (int) _clearfp(); \ + \ + ret = ((SW_ZERODIVIDE & fpstatus) ? UFUNC_FPE_DIVIDEBYZERO : 0) \ + | ((SW_OVERFLOW & fpstatus) ? UFUNC_FPE_OVERFLOW : 0) \ + | ((SW_UNDERFLOW & fpstatus) ? UFUNC_FPE_UNDERFLOW : 0) \ + | ((SW_INVALID & fpstatus) ? UFUNC_FPE_INVALID : 0); \ + } +#else /* windows enables sse on 32 bit, so check both flags */ #define UFUNC_CHECK_STATUS(ret) { \ int fpstatus, fpstatus2; \ @@ -382,6 +392,7 @@ typedef struct _loop1d_info { | ((SW_UNDERFLOW & fpstatus) ? UFUNC_FPE_UNDERFLOW : 0) \ | ((SW_INVALID & fpstatus) ? UFUNC_FPE_INVALID : 0); \ } +#endif /* Solaris --------------------------------------------------------*/ /* --------ignoring SunOS ieee_flags approach, someone else can |