summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2018-10-08 17:07:44 +0300
committermattip <matti.picus@gmail.com>2018-10-08 17:24:54 +0300
commitb0308d1a65935fc1df7411875598890b16983d62 (patch)
tree7c38c3bb63031ab96818554408b8b02a4d6643ff /doc
parent1462362754f2053561d08eba5bc12960056104af (diff)
downloadnumpy-b0308d1a65935fc1df7411875598890b16983d62.tar.gz
:DOC: update to reflect API changes
Diffstat (limited to 'doc')
-rw-r--r--doc/release/1.16.0-notes.rst4
-rw-r--r--doc/source/reference/c-api.types-and-structures.rst16
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/release/1.16.0-notes.rst b/doc/release/1.16.0-notes.rst
index 8c14e0070..cd8399910 100644
--- a/doc/release/1.16.0-notes.rst
+++ b/doc/release/1.16.0-notes.rst
@@ -72,8 +72,8 @@ comparisons.
C API changes
=============
-The ``NPY_API_VERSION`` was incremented to 0x0000D since the `PyUFuncObject`'s
-size changed.
+The :c:data:`NPY_API_VERSION` was incremented to 0x0000D since
+``core_dim_flags`` and ``core_dim_sizes`` were added to :c:type:`PyUFuncObject`.
New Features
============
diff --git a/doc/source/reference/c-api.types-and-structures.rst b/doc/source/reference/c-api.types-and-structures.rst
index 4ad476ad9..51818142a 100644
--- a/doc/source/reference/c-api.types-and-structures.rst
+++ b/doc/source/reference/c-api.types-and-structures.rst
@@ -730,12 +730,12 @@ PyUFunc_Type
char *core_signature;
PyUFunc_TypeResolutionFunc *type_resolver;
PyUFunc_LegacyInnerLoopSelectionFunc *legacy_inner_loop_selector;
- ufunc_extension *extension;
PyUFunc_MaskedInnerLoopSelectionFunc *masked_inner_loop_selector;
npy_uint32 *op_flags;
npy_uint32 *iter_flags;
- /* new in version 1 */
- ufunc_extension s_extension;
+ /* new in API version 0x0000000D */
+ npy_intp *core_dim_sizes;
+ npy_intp *core_dim_flags;
} PyUFuncObject;
@@ -798,7 +798,9 @@ PyUFunc_Type
.. c:member:: int PyUFuncObject.version
- The version of this struct, currently set to 1
+ The ``NPY_API_VERSION`` used during the call to
+ :c:func:`PyUFunc_FromFuncAndDataAndSignature`. If less than
+ 0x0000000D, ``core_dim_sizes`` and ``core_dim_flags`` will be ignored.
.. c:member:: char *PyUFuncObject.name
@@ -894,14 +896,14 @@ PyUFunc_Type
Override the default nditer flags for the ufunc.
- Added in version 1
+ Added in API version 0x0000000D
- .. c:member:: npy_intp *PyUFuncObject.extension->core_dim_sizes
+ .. c:member:: npy_intp *PyUFuncObject.core_dim_sizes
For each distinct core dimension, the possible
"frozen" size (``-1`` if not frozen)
- .. c:member:: npy_uint32 *PyUFuncObject.extension->core_dim_flags
+ .. c:member:: npy_uint32 *PyUFuncObject.core_dim_flags
For each distinct core dimension, a set of flags ``OR`` ed together: