[Numpy-svn] r5839 - branches/clean_math_config/numpy/core

numpy-svn@scip... numpy-svn@scip...
Sat Sep 20 05:05:57 CDT 2008


Author: cdavid
Date: 2008-09-20 05:05:52 -0500 (Sat, 20 Sep 2008)
New Revision: 5839

Modified:
   branches/clean_math_config/numpy/core/setup.py
Log:
Assume mandatory funcs available with MSVC.

Modified: branches/clean_math_config/numpy/core/setup.py
===================================================================
--- branches/clean_math_config/numpy/core/setup.py	2008-09-20 09:48:01 UTC (rev 5838)
+++ branches/clean_math_config/numpy/core/setup.py	2008-09-20 10:05:52 UTC (rev 5839)
@@ -66,9 +66,17 @@
     use_msvc = config.check_decl("_MSC_VER")
 
     # Mandatory functions: if not found, fail the build
-    mandatory_funcs = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs",
-                       "floor", "ceil", "sqrt", "log10", "log", "exp", "asin",
-                       "acos", "atan", "fmod", 'modf', 'frexp', 'ldexp']
+    if use_msvc:
+        # MSVC use intrisincs functions when build with e.g. /Ox, and this
+        # breaks tests. Fixing the tests is not trivial, so we assume the
+        # intrisincs functions are available.
+        # Functions which have intrisinces: sin, cos, tan, sin, cosh, tanh,
+        # fabs, sqrt, log10, log, exp, asin, acos, atan, fmod
+        mandatory_funcs = ["floor", "ceil", 'modf', 'frexp', 'ldexp']
+    else:
+        mandatory_funcs = ["sin", "cos", "tan", "sinh", "cosh", "tanh", "fabs",
+                        "floor", "ceil", "sqrt", "log10", "log", "exp", "asin",
+                        "acos", "atan", "fmod", 'modf', 'frexp', 'ldexp']
 
     if not check_funcs_once(mandatory_funcs):
         raise SystemError("One of the required function to build numpy is not"



More information about the Numpy-svn mailing list