[Numpy-svn] r5909 - in branches/ufunc_cleanup/numpy/core: code_generators include/numpy

numpy-svn@scip... numpy-svn@scip...
Sun Oct 5 00:19:55 CDT 2008


Author: charris
Date: 2008-10-05 00:19:52 -0500 (Sun, 05 Oct 2008)
New Revision: 5909

Modified:
   branches/ufunc_cleanup/numpy/core/code_generators/generate_umath.py
   branches/ufunc_cleanup/numpy/core/include/numpy/ufuncobject.h
Log:
Fix invalid use of identity fmax,fmin.

Modified: branches/ufunc_cleanup/numpy/core/code_generators/generate_umath.py
===================================================================
--- branches/ufunc_cleanup/numpy/core/code_generators/generate_umath.py	2008-10-04 01:54:58 UTC (rev 5908)
+++ branches/ufunc_cleanup/numpy/core/code_generators/generate_umath.py	2008-10-05 05:19:52 UTC (rev 5909)
@@ -6,7 +6,6 @@
 
 Zero = "PyUFunc_Zero"
 One = "PyUFunc_One"
-Nan = "PyUFunc_Nan"
 None_ = "PyUFunc_None"
 
 class TypeDescription(object):
@@ -318,14 +317,14 @@
           TD(O, f='_npy_ObjectMin')
           ),
 'fmax' :
-    Ufunc(2, 1, Nan,
+    Ufunc(2, 1, None,
           "",
-          TD(inexact),
+          TD(inexact)
           ),
 'fmin' :
-    Ufunc(2, 1, Nan,
+    Ufunc(2, 1, None,
           "",
-          TD(inexact),
+          TD(inexact)
           ),
 'bitwise_and' :
     Ufunc(2, 1, One,

Modified: branches/ufunc_cleanup/numpy/core/include/numpy/ufuncobject.h
===================================================================
--- branches/ufunc_cleanup/numpy/core/include/numpy/ufuncobject.h	2008-10-04 01:54:58 UTC (rev 5908)
+++ branches/ufunc_cleanup/numpy/core/include/numpy/ufuncobject.h	2008-10-05 05:19:52 UTC (rev 5909)
@@ -184,7 +184,6 @@
 #define PyUFunc_One 1
 #define PyUFunc_Zero 0
 #define PyUFunc_None -1
-#define PyUFunc_Nan NAN
 
 #define UFUNC_REDUCE 0
 #define UFUNC_ACCUMULATE 1



More information about the Numpy-svn mailing list