Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit dc98a3d

Browse files
charrischarris
committed
Merge pull request numpy#4671 from charris/prepare-1.10-devel
MAINT: start 1.10-devel.
2 parents 594b0de + d1422d3 commit dc98a3d

16 files changed

Lines changed: 78 additions & 1038 deletions

File tree

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ matrix:
1717
- python: 3.3
1818
env: NPY_SEPARATE_COMPILATION=0
1919
- python: 2.7
20-
env: NPY_RELAXED_STRIDES_CHECKING=1
20+
env: NPY_RELAXED_STRIDES_CHECKING=0
2121
- python: 3.3
22-
env: NPY_RELAXED_STRIDES_CHECKING=1
22+
env: NPY_RELAXED_STRIDES_CHECKING=0
2323
- python: 2.7
2424
env: USE_BENTO=1
2525
- python: 2.7

‎doc/release/1.10.0-notes.rst‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
NumPy 1.10.0 Release Notes
2+
**************************
3+
4+
This release supports Python 2.6 - 2.7 and 3.2 - 3.4.
5+
6+
7+
Highlights
8+
==========
9+
10+
11+
Dropped Support
12+
===============
13+
* The polytemplate.py file has been removed.
14+
15+
16+
Future Changes
17+
==============
18+
19+
20+
Compatibility notes
21+
===================
22+
NPY_RELAXED_STRIDE_CHECKING is now true by default.
23+
24+
25+
New Features
26+
============
27+
28+
29+
Improvements
30+
============
31+
32+
33+
Changes
34+
=======
35+
36+
37+
Deprecations
38+
============

‎doc/source/reference/ufuncs.rst‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,16 +313,15 @@ advanced usage and will not typically be used.
313313

314314
.. versionadded:: 1.6
315315

316+
May be 'no', 'equiv', 'safe', 'same_kind', or 'unsafe'.
317+
See :func:`can_cast` for explanations of the parameter values.
318+
316319
Provides a policy for what kind of casting is permitted. For compatibility
317-
with previous versions of NumPy, this defaults to 'unsafe'. May be 'no',
318-
'equiv', 'safe', 'same_kind', or 'unsafe'. See :func:`can_cast` for
319-
explanations of the parameter values.
320-
321-
In a future version of numpy, this argument will default to
322-
'same_kind'. As part of this transition, starting in version 1.7,
323-
ufuncs will produce a DeprecationWarning for calls which are
324-
allowed under the 'unsafe' rules, but not under the 'same_kind'
325-
rules.
320+
with previous versions of NumPy, this defaults to 'unsafe' for numpy < 1.7.
321+
In numpy 1.7 a transition to 'same_kind' was begun where ufuncs produce a
322+
DeprecationWarning for calls which are allowed under the 'unsafe'
323+
rules, but not under the 'same_kind' rules. In numpy 1.10 the default
324+
will be 'same_kind'.
326325

327326
*order*
328327

‎doc/source/release.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
Release Notes
33
*************
44

5+
.. include:: ../release/1.10.0-notes.rst
56
.. include:: ../release/1.9.0-notes.rst
67
.. include:: ../release/1.8.0-notes.rst
78
.. include:: ../release/1.7.2-notes.rst

‎numpy/core/bscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ from setup_common \
2828
MANDATORY_FUNCS, C_ABI_VERSION, C_API_VERSION
2929

3030
ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0")
31-
NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "0") != "0")
31+
NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "1") != "0")
3232

3333
NUMPYCONFIG_SYM = []
3434

‎numpy/core/include/numpy/ndarraytypes.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,12 +203,6 @@ typedef enum {
203203
NPY_SAME_KIND_CASTING=3,
204204
/* Allow any casts */
205205
NPY_UNSAFE_CASTING=4,
206-
207-
/*
208-
* Temporary internal definition only, will be removed in upcoming
209-
* release, see below
210-
* */
211-
NPY_INTERNAL_UNSAFE_CASTING_BUT_WARN_UNLESS_SAME_KIND = 100,
212206
} NPY_CASTING;
213207

214208
typedef enum {

‎numpy/core/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
ENABLE_SEPARATE_COMPILATION = (os.environ.get('NPY_SEPARATE_COMPILATION', "1") != "0")
2020
# Set to True to enable relaxed strides checking. This (mostly) means
2121
# that `strides[dim]` is ignored if `shape[dim] == 1` when setting flags.
22-
NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "0") != "0")
22+
NPY_RELAXED_STRIDES_CHECKING = (os.environ.get('NPY_RELAXED_STRIDES_CHECKING', "1") != "0")
2323

2424
# XXX: ugly, we use a class to avoid calling twice some expensive functions in
2525
# config.h/numpyconfig.h. I don't see a better way because distutils force

‎numpy/core/src/multiarray/common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ PyArray_GetAttrString_SuppressException(PyObject *obj, char *name)
8484

8585

8686

87-
NPY_NO_EXPORT NPY_CASTING NPY_DEFAULT_ASSIGN_CASTING = NPY_INTERNAL_UNSAFE_CASTING_BUT_WARN_UNLESS_SAME_KIND;
87+
NPY_NO_EXPORT NPY_CASTING NPY_DEFAULT_ASSIGN_CASTING = NPY_SAME_KIND_CASTING;
8888

8989

9090
NPY_NO_EXPORT PyArray_Descr *

‎numpy/core/src/multiarray/convert_datatype.c‎

Lines changed: 5 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -624,63 +624,19 @@ type_num_unsigned_to_signed(int type_num)
624624
}
625625
}
626626

627-
/*
628-
* NOTE: once the UNSAFE_CASTING -> SAME_KIND_CASTING transition is over,
629-
* we should remove NPY_INTERNAL_UNSAFE_CASTING_BUT_WARN_UNLESS_SAME_KIND
630-
* and PyArray_CanCastTypeTo_impl should be renamed back to
631-
* PyArray_CanCastTypeTo.
632-
*/
633-
static npy_bool
634-
PyArray_CanCastTypeTo_impl(PyArray_Descr *from, PyArray_Descr *to,
635-
NPY_CASTING casting);
636-
637627
/*NUMPY_API
638628
* Returns true if data of type 'from' may be cast to data of type
639629
* 'to' according to the rule 'casting'.
640630
*/
641631
NPY_NO_EXPORT npy_bool
642632
PyArray_CanCastTypeTo(PyArray_Descr *from, PyArray_Descr *to,
643-
NPY_CASTING casting)
644-
{
645-
/* fast path for basic types */
646-
if (NPY_LIKELY(from->type_num < NPY_OBJECT) &&
647-
NPY_LIKELY(from->type_num == to->type_num) &&
648-
NPY_LIKELY(from->byteorder == to->byteorder)) {
649-
return 1;
650-
}
651-
else if (casting == NPY_INTERNAL_UNSAFE_CASTING_BUT_WARN_UNLESS_SAME_KIND) {
652-
npy_bool unsafe_ok, same_kind_ok;
653-
unsafe_ok = PyArray_CanCastTypeTo_impl(from, to, NPY_UNSAFE_CASTING);
654-
same_kind_ok = PyArray_CanCastTypeTo_impl(from, to,
655-
NPY_SAME_KIND_CASTING);
656-
if (unsafe_ok && !same_kind_ok) {
657-
char * msg = "Implicitly casting between incompatible kinds. In "
658-
"a future numpy release, this will raise an error. "
659-
"Use casting=\"unsafe\" if this is intentional.";
660-
if (DEPRECATE(msg) < 0) {
661-
/* We have no way to propagate an exception :-( */
662-
PyErr_Clear();
663-
PySys_WriteStderr("Sorry, you requested this warning "
664-
"be raised as an error, but we couldn't "
665-
"do it. (See issue #3806 in the numpy "
666-
"bug tracker.) So FYI, it was: "
667-
"DeprecationWarning: %s\n",
668-
msg);
669-
}
670-
}
671-
return unsafe_ok;
672-
}
673-
else {
674-
return PyArray_CanCastTypeTo_impl(from, to, casting);
675-
}
676-
}
677-
678-
static npy_bool
679-
PyArray_CanCastTypeTo_impl(PyArray_Descr *from, PyArray_Descr *to,
680633
NPY_CASTING casting)
681634
{
682-
/* If unsafe casts are allowed */
683-
if (casting == NPY_UNSAFE_CASTING) {
635+
/* Fast path for unsafe casts or basic types */
636+
if (casting == NPY_UNSAFE_CASTING ||
637+
(NPY_LIKELY(from->type_num < NPY_OBJECT) &&
638+
NPY_LIKELY(from->type_num == to->type_num) &&
639+
NPY_LIKELY(from->byteorder == to->byteorder))) {
684640
return 1;
685641
}
686642
/* Equivalent types can be cast with any value of 'casting' */

‎numpy/core/tests/test_ufunc.py‎

Lines changed: 7 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -838,45 +838,20 @@ def t(expect, func, n, m):
838838

839839
def test_safe_casting(self):
840840
# In old versions of numpy, in-place operations used the 'unsafe'
841-
# casting rules. In some future version, 'same_kind' will become the
842-
# default.
841+
# casting rules. In versions >= 1.10, 'same_kind' is the
842+
# default and an exception is raised instead of a warning.
843+
# when 'same_kind' is not satisfied.
843844
a = np.array([1, 2, 3], dtype=int)
844845
# Non-in-place addition is fine
845846
assert_array_equal(assert_no_warnings(np.add, a, 1.1),
846847
[2.1, 3.1, 4.1])
847-
assert_warns(DeprecationWarning, np.add, a, 1.1, out=a)
848-
assert_array_equal(a, [2, 3, 4])
848+
assert_raises(TypeError, np.add, a, 1.1, out=a)
849849
def add_inplace(a, b):
850850
a += b
851-
assert_warns(DeprecationWarning, add_inplace, a, 1.1)
852-
assert_array_equal(a, [3, 4, 5])
853-
# Make sure that explicitly overriding the warning is allowed:
851+
assert_raises(TypeError, add_inplace, a, 1.1)
852+
# Make sure that explicitly overriding the exception is allowed:
854853
assert_no_warnings(np.add, a, 1.1, out=a, casting="unsafe")
855-
assert_array_equal(a, [4, 5, 6])
856-
857-
# There's no way to propagate exceptions from the place where we issue
858-
# this deprecation warning, so we must throw the exception away
859-
# entirely rather than cause it to be raised at some other point, or
860-
# trigger some other unsuspecting if (PyErr_Occurred()) { ...} at some
861-
# other location entirely.
862-
import warnings
863-
import sys
864-
if sys.version_info[0] >= 3:
865-
from io import StringIO
866-
else:
867-
from StringIO import StringIO
868-
with warnings.catch_warnings():
869-
warnings.simplefilter("error")
870-
old_stderr = sys.stderr
871-
try:
872-
sys.stderr = StringIO()
873-
# No error, but dumps to stderr
874-
a += 1.1
875-
# No error on the next bit of code executed either
876-
1 + 1
877-
assert_("Implicitly casting" in sys.stderr.getvalue())
878-
finally:
879-
sys.stderr = old_stderr
854+
assert_array_equal(a, [2, 3, 4])
880855

881856
def test_ufunc_custom_out(self):
882857
# Test ufunc with built in input types and custom output type

0 commit comments

Comments
 (0)