Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: Distinguish exact vs. equivalent dtype for C type aliases. #21995

Merged
merged 11 commits into from Sep 7, 2022
+107 −3
Merged

BUG: Distinguish exact vs. equivalent dtype for C type aliases. #21995

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
45357de
BUG: Distinguish exact vs. equivalent dtype for C type aliases.
eirrgang Jul 16, 2022
a3eedb0
Use the correct pointer type.
eirrgang Jul 16, 2022
78cd6b0
Coerce the returned pointer type.
eirrgang Jul 16, 2022
45281b8
Get the base object.
eirrgang Jul 16, 2022
81b9760
Add unit testing.
eirrgang Jul 16, 2022
871a1f9
Don't regenerate the descriptor unnecessarily.
eirrgang Jul 16, 2022
5651445
Update comment and obey formatting requirements.
eirrgang Jul 16, 2022
e286f46
Expand test_asarray.py.
eirrgang Jul 17, 2022
01438a8
Lint.
eirrgang Jul 17, 2022
b1a8ff8
Add release note and further clarify tests.
eirrgang Jul 17, 2022
235b75e
DOC: Take a stab at shortening the release note
seberg Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions numpy/core/src/multiarray/multiarraymodule.c
View file
Open in desktop
Expand Up @@ -1627,12 +1627,30 @@ _array_fromobject_generic(
goto finish;
}
}
/* One more chance */
/* One more chance for faster exit if user specified the dtype. */
eirrgang marked this conversation as resolved.
Show resolved Hide resolved
oldtype = PyArray_DESCR(oparr);
if (PyArray_EquivTypes(oldtype, type)) {
if (copy != NPY_COPY_ALWAYS && STRIDING_OK(oparr, order)) {
Py_INCREF(op);
ret = oparr;
if (oldtype == type) {
eirrgang marked this conversation as resolved.
Show resolved Hide resolved
ret = oparr;
}
else {
/* Create a new PyArrayObject from the caller's
* PyArray_Descr. Use the reference `op` as the base
* object. */
Py_INCREF(type);
ret = PyArray_NewFromDescr(
Py_TYPE(op),
type,
PyArray_NDIM(oparr),
PyArray_DIMS(oparr),
PyArray_STRIDES(oparr),
PyArray_DATA(oparr),
PyArray_FLAGS(oparr),
eirrgang marked this conversation as resolved.
Show resolved Hide resolved
oparr
);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, either I just didn't think of it, or expected that this steals a reference to op for the base. We are missing a DECREF, I will make a PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think I originally tried PyArray_NewFromDescr with op for *data and nullptr for *obj, and PyArray_SetBaseObject or something that steals the reference for the base. Anyway, I guess we were sloppy when switching to PyArray_NewFromDescrAndBase. Thanks for the quick catch!

}
goto finish;
}
else {
Expand Down