diff options
| author | David Cournapeau <cournape@gmail.com> | 2013-01-21 19:37:50 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-01-24 09:52:12 -0700 |
| commit | 08dfe2f48ea6bab6935b1f13d9385df9f9f4f782 (patch) | |
| tree | 705b197d2e36a08dc5db9c817637fc251d305efa | |
| parent | 63cf49de635ec1d64967ed746ea4839935d80bcd (diff) | |
| download | numpy-08dfe2f48ea6bab6935b1f13d9385df9f9f4f782.tar.gz | |
FEAT: use separate build by default.
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | numpy/core/bscript | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index a91d1c476..61580a2ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ python: matrix: include: - python: 2.7 - env: NPY_SEPARATE_COMPILATION=1 + env: NPY_SEPARATE_COMPILATION=0 - python: 3.2 - env: NPY_SEPARATE_COMPILATION=1 + env: NPY_SEPARATE_COMPILATION=0 before_install: - mkdir builds - pushd builds diff --git a/numpy/core/bscript b/numpy/core/bscript index 83c0b4b6f..d24b7732c 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -30,7 +30,7 @@ from setup_common \ C99_FUNCS_SINGLE, C99_COMPLEX_TYPES, C99_COMPLEX_FUNCS, \ MANDATORY_FUNCS, C_ABI_VERSION, C_API_VERSION -ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "0") != "0") +ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0") NUMPYCONFIG_SYM = [] diff --git a/numpy/core/setup.py b/numpy/core/setup.py index e0a114483..6a8b0fc38 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -12,7 +12,7 @@ import re from setup_common import * # Set to True to enable multiple file compilations (experimental) -ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "0") != "0") +ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0") # XXX: ugly, we use a class to avoid calling twice some expensive functions in # config.h/numpyconfig.h. I don't see a better way because distutils force |