diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | doc/release/1.10.0-notes.rst | 1 | ||||
| -rw-r--r-- | numpy/core/bscript | 2 | ||||
| -rw-r--r-- | numpy/core/setup.py | 2 | ||||
| -rw-r--r-- | tools/test-installed-numpy.py | 2 | ||||
| -rw-r--r-- | tox.ini | 10 |
6 files changed, 11 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 944818428..8e1fbdb7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ matrix: - python: 3.3 env: NPY_SEPARATE_COMPILATION=0 - python: 2.7 - env: NPY_RELAXED_STRIDES_CHECKING=1 + env: NPY_RELAXED_STRIDES_CHECKING=0 - python: 3.3 - env: NPY_RELAXED_STRIDES_CHECKING=1 + env: NPY_RELAXED_STRIDES_CHECKING=0 - python: 2.7 env: USE_BENTO=1 before_install: diff --git a/doc/release/1.10.0-notes.rst b/doc/release/1.10.0-notes.rst index f7ecd46c0..3f52bd5af 100644 --- a/doc/release/1.10.0-notes.rst +++ b/doc/release/1.10.0-notes.rst @@ -19,6 +19,7 @@ Future Changes Compatibility notes =================== +NPY_RELAXED_STRIDE_CHECKING is now true by default. New Features diff --git a/numpy/core/bscript b/numpy/core/bscript index 872d4d2ba..b4cdd243a 100644 --- a/numpy/core/bscript +++ b/numpy/core/bscript @@ -28,7 +28,7 @@ from setup_common \ MANDATORY_FUNCS, C_ABI_VERSION, C_API_VERSION ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0") -NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "0") != "0") +NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "1") != "0") NUMPYCONFIG_SYM = [] diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 3cde96d77..3502f1221 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -19,7 +19,7 @@ from setup_common import * ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0") # Set to True to enable relaxed strides checking. This (mostly) means # that `strides[dim]` is ignored if `shape[dim] == 1` when setting flags. -NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "0") != "0") +NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "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 diff --git a/tools/test-installed-numpy.py b/tools/test-installed-numpy.py index 0174e0708..26a50b2fa 100644 --- a/tools/test-installed-numpy.py +++ b/tools/test-installed-numpy.py @@ -38,7 +38,7 @@ import numpy # Check that NPY_RELAXED_STRIDES_CHECKING is active when set. # The same flags check is also used in the tests to switch behavior. -if (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "0") != "0"): +if (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "1") != "0"): if not numpy.ones((10, 1), order='C').flags.f_contiguous: print('NPY_RELAXED_STRIDES_CHECKING set, but not active.') sys.exit(1) @@ -25,7 +25,7 @@ # installed and that they can be run as 'python2.7', 'python3.3', etc. [tox] -envlist = py26,py27,py32,py33,py27-monolithic,py33-monolithic,py27-relaxed-strides,py33-relaxed-strides +envlist = py26,py27,py32,py33,py27-monolithic,py33-monolithic,py27-not-relaxed-strides,py33-not-relaxed-strides [testenv] deps= @@ -41,13 +41,13 @@ env=NPY_SEPARATE_COMPILATION=0 basepython=python3.3 env=NPY_SEPARATE_COMPILATION=0 -[testenv:py27-relaxed-strides] +[testenv:py27-not-relaxed-strides] basepython=python2.7 -env=NPY_RELAXED_STRIDES_CHECKING=1 +env=NPY_RELAXED_STRIDES_CHECKING=0 -[testenv:py33-relaxed-strides] +[testenv:py33-not-relaxed-strides] basepython=python3.3 -env=NPY_RELAXED_STRIDES_CHECKING=1 +env=NPY_RELAXED_STRIDES_CHECKING=0 # Not run by default. Set up the way you want then use 'tox -e debug' # if you want it: |