[Numpy-svn] r4733 - in branches/build_with_scons/numpy/core: . include/numpy

numpy-svn@scip... numpy-svn@scip...
Sun Jan 20 23:35:29 CST 2008


Author: cdavid
Date: 2008-01-20 23:35:20 -0600 (Sun, 20 Jan 2008)
New Revision: 4733

Modified:
   branches/build_with_scons/numpy/core/SConstruct
   branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
Log:
Fixes for config and numpyconfig header generation:
 - Replace NPY_NOSMP by NPY_NO_SMP in numpyconfig.h, and remove the NPY_NO_SMP
   define in config.h, because it is not needed.


Modified: branches/build_with_scons/numpy/core/SConstruct
===================================================================
--- branches/build_with_scons/numpy/core/SConstruct	2008-01-21 05:29:36 UTC (rev 4732)
+++ branches/build_with_scons/numpy/core/SConstruct	2008-01-21 05:35:20 UTC (rev 4733)
@@ -63,9 +63,11 @@
 #---------------------
 # Checking SMP option
 #---------------------
-st = define_no_smp()
-numpyconfig_sym.append(('NPY_NOSMP', st))
-config.Define('NPY_NOSMP', st, "define to 1 to disable SMP support ")
+if define_no_smp():
+    nosmp = 1
+else:
+    nosmp = 0
+numpyconfig_sym.append(('NPY_NO_SMP', nosmp))
 
 #----------------------
 # Checking the mathlib 

Modified: branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in
===================================================================
--- branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-21 05:29:36 UTC (rev 4732)
+++ branches/build_with_scons/numpy/core/include/numpy/numpyconfig.h.in	2008-01-21 05:35:20 UTC (rev 4733)
@@ -7,7 +7,7 @@
 #define NPY_SIZEOF_PY_INTPTR_T  @SIZEOF_PY_INTPTR_T@
 
 #define NPY_NO_SIGNAL    @NPY_NO_SIGNAL@
-#define NPY_NOSMP        @NPY_NOSMP@
+#define NPY_NO_SMP       @NPY_NO_SMP@
 
 /* XXX: this has really nothing to do in a config file... */
 #define NPY_MATHLIB      @MATHLIB@



More information about the Numpy-svn mailing list