diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-05-13 03:01:53 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-05-13 03:01:53 +0000 |
| commit | 005cd6f839501b2685d6a54f882364bf12dd13cc (patch) | |
| tree | aebba729bdc1e84fe6dcb1134d4fea936f467304 /numpy/core | |
| parent | 866336de09843829232ab76a6047e892e9fa9a65 (diff) | |
| download | numpy-005cd6f839501b2685d6a54f882364bf12dd13cc.tar.gz | |
Add function to return builtin NPY_FEATURE_VERSION.
Diffstat (limited to 'numpy/core')
| -rw-r--r-- | numpy/core/code_generators/cversions.txt | 1 | ||||
| -rw-r--r-- | numpy/core/code_generators/numpy_api_order.txt | 1 | ||||
| -rw-r--r-- | numpy/core/setup_common.py | 2 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 9 |
4 files changed, 12 insertions, 1 deletions
diff --git a/numpy/core/code_generators/cversions.txt b/numpy/core/code_generators/cversions.txt index b466e3880..92e6338c6 100644 --- a/numpy/core/code_generators/cversions.txt +++ b/numpy/core/code_generators/cversions.txt @@ -1,2 +1,3 @@ 0x00000001 = 603580d224763e58c5e7147f804dc0f5 0x00000002 = 8ecb29306758515ae69749c803a75da1 +0x00000003 = bf22c0d05b31625d2a7015988d61ce5a diff --git a/numpy/core/code_generators/numpy_api_order.txt b/numpy/core/code_generators/numpy_api_order.txt index 05735bbda..55091e9e5 100644 --- a/numpy/core/code_generators/numpy_api_order.txt +++ b/numpy/core/code_generators/numpy_api_order.txt @@ -172,3 +172,4 @@ PyArray_OverflowMultiplyList PyArray_CompareString PyArray_MultiIterFromObjects PyArray_GetEndianness +PyArray_GetNDArrayCFeatureVersion diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py index fd08aa551..37023e8db 100644 --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -25,7 +25,7 @@ C_ABI_VERSION = 0x01000009 # without breaking binary compatibility. In this case, only the C_API_VERSION # (*not* C_ABI_VERSION) would be increased. Whenever binary compatibility is # broken, both C_API_VERSION and C_ABI_VERSION should be increased. -C_API_VERSION = 0x00000002 +C_API_VERSION = 0x00000003 class MismatchCAPIWarning(Warning): pass diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 97d82fc4d..67d4fa9c2 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -1685,6 +1685,15 @@ PyArray_GetNDArrayCVersion(void) return (unsigned int)NPY_VERSION; } +/*NUMPY_API + * Returns the built-in (at compilation time) C API version + */ +NPY_NO_EXPORT unsigned int +PyArray_GetNDArrayCFeatureVersion(void) +{ + return (unsigned int)NPY_FEATURE_VERSION; +} + static PyObject * array__get_ndarray_c_version(PyObject *NPY_UNUSED(dummy), PyObject *args, PyObject *kwds) { |