Fix-up usage of NPY_ALLOW_THREADS. Default is now WITH_THREAD but an environment variable NUMPY_NOSMP can be set which will make the default 0

1 files changed, 10 insertions, 2 deletions

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index fa42f2aaf..aa6450207 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -35,8 +35,16 @@ def configuration(parent_package='',top_path=None):
                                         library_dirs = default_lib_dirs)
             if not result:
                 raise "ERROR: Failed to test configuration"
-            moredefs = []
-
+            # Perhaps a fancier check is in order here.
+            try:
+                nosmp = os.environ['NPY_NOSMP']
+                nosmp = 1
+            except KeyError:
+                nosmp = 0
+            if nosmp:
+                moredefs = [('NPY_ALLOW_THREADS', '0')]
+            else:
+                moredefs = [('NPY_ALLOW_THREADS','WITH_THREAD')]
             #
             mathlibs = []
             tc = testcode_mathlib()