Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
ecf1fda8
Commit
ecf1fda8
authored
Aug 01, 2018
by
mattip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MAINT: avoid numpy internals in {sg}et_array_base
parent
ad6493a4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
15 deletions
+8
-15
CHANGES.rst
CHANGES.rst
+2
-0
Cython/Includes/numpy/__init__.pxd
Cython/Includes/numpy/__init__.pxd
+6
-15
No files found.
CHANGES.rst
View file @
ecf1fda8
...
...
@@ -71,6 +71,8 @@ Other changes
package size to about half of its previous size. This makes the compiler
slightly slower, by about 5-7%.
* ``set_array_base`` now calls ``PyArray_SetBaseObject``. Also modified
``get_array_base`` to remove direct access to NumPy internals.
0.28.4 (2018-07-08)
===================
...
...
Cython/Includes/numpy/__init__.pxd
View file @
ecf1fda8
...
...
@@ -719,6 +719,7 @@ cdef extern from "numpy/arrayobject.h":
object
PyArray_CheckAxis
(
ndarray
,
int
*
,
int
)
npy_intp
PyArray_OverflowMultiplyList
(
npy_intp
*
,
int
)
int
PyArray_CompareString
(
char
*
,
char
*
,
size_t
)
int
PyArray_SetBaseObject
(
object
,
object
)
# Typedefs that matches the runtime dtype objects in
...
...
@@ -973,22 +974,12 @@ cdef extern from "numpy/ufuncobject.h":
int
_import_umath
()
except
-
1
cdef
inline
void
set_array_base
(
object
arr
,
object
base
):
Py_INCREF
(
base
)
PyArray_SetBaseObject
(
arr
,
base
)
cdef
inline
void
set_array_base
(
ndarray
arr
,
object
base
):
cdef
PyObject
*
baseptr
if
base
is
None
:
baseptr
=
NULL
else
:
Py_INCREF
(
base
)
# important to do this before decref below!
baseptr
=
<
PyObject
*>
base
Py_XDECREF
(
arr
.
base
)
arr
.
base
=
baseptr
cdef
inline
object
get_array_base
(
ndarray
arr
):
if
arr
.
base
is
NULL
:
return
None
else
:
return
<
object
>
arr
.
base
cdef
inline
object
get_array_base
(
object
arr
):
return
<
object
>
arr
.
base
# Versions of the import_* functions which are more suitable for
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment