[Numpy-svn] r6437 - in branches/coremath/numpy/core: . include/numpy

numpy-svn@scip... numpy-svn@scip...
Sat Feb 21 11:01:17 CST 2009


Author: cdavid
Date: 2009-02-21 11:00:45 -0600 (Sat, 21 Feb 2009)
New Revision: 6437

Modified:
   branches/coremath/numpy/core/SConscript
   branches/coremath/numpy/core/include/numpy/numpyconfig.h.in
Log:
Update isnan and co checks for npymath.

Modified: branches/coremath/numpy/core/SConscript
===================================================================
--- branches/coremath/numpy/core/SConscript	2009-02-21 05:42:52 UTC (rev 6436)
+++ branches/coremath/numpy/core/SConscript	2009-02-21 17:00:45 UTC (rev 6437)
@@ -131,7 +131,7 @@
 #----------------------------------
 # Function to check:
 mfuncs = ('expl', 'expf', 'log1p', 'expm1', 'asinh', 'atanhf', 'atanhl',
-          'isnan', 'isinf', 'rint', 'trunc')
+          'rint', 'trunc')
 
 # Set value to 1 for each defined function (in math lib)
 mfuncs_defined = dict([(f, 0) for f in mfuncs])
@@ -185,7 +185,11 @@
 #include <Python.h>
 #include <math.h>
 """
-    config.CheckDeclaration(f, includes=includes)
+    st = config.CheckDeclaration(f, includes=includes)
+    if st:
+	numpyconfig_sym.append(('DEFINE_NPY_HAVE_%s_DECL' % f.upper(), 
+		'#define NPY_HAVE_%s_DECL' % f.upper()))
+        
 
 #-------------------------------------------------------
 # Define the function PyOS_ascii_strod if not available

Modified: branches/coremath/numpy/core/include/numpy/numpyconfig.h.in
===================================================================
--- branches/coremath/numpy/core/include/numpy/numpyconfig.h.in	2009-02-21 05:42:52 UTC (rev 6436)
+++ branches/coremath/numpy/core/include/numpy/numpyconfig.h.in	2009-02-21 17:00:45 UTC (rev 6437)
@@ -6,6 +6,11 @@
 #define NPY_SIZEOF_LONGDOUBLE   @SIZEOF_LONG_DOUBLE@
 #define NPY_SIZEOF_PY_INTPTR_T  @SIZEOF_PY_INTPTR_T@
 
+@DEFINE_NPY_HAVE_ISNAN_DECL@
+@DEFINE_NPY_HAVE_ISINF_DECL@
+@DEFINE_NPY_HAVE_ISFINITE_DECL@
+@DEFINE_NPY_HAVE_SIGNBIT_DECL@
+
 @DEFINE_NPY_NO_SIGNAL@
 #define NPY_NO_SMP       @NPY_NO_SMP@
 



More information about the Numpy-svn mailing list