API: Allow zero length strings to result in zero length dtypes #16825
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
558e671 to
dd7b901
Compare
|
Errors exceeded log size :) The following was in an infinite loop... |
|
Ah, had not realized this. This one probably requires gh-16817 in that case. |
dd7b901 to
57abaab
Compare
The dtype is of zero length strings is no preserved when creating an array from a scalar in more cases. This also simplifies the `PyArray_FromScalar` code so that the (mainly unused) casting branch reuses `PyArray_Pack` to avoid implementing similar logic multiple times.
57abaab to
7930b89
Compare
seberg
commented
Jul 13, 2020
|
gh-16817 has been merged. @eric-wieser do you still want to review? |
|
This is ready to merge, correct? |
eric-wieser
reviewed
Aug 13, 2020
eric-wieser
reviewed
Aug 13, 2020
eric-wieser
reviewed
Aug 13, 2020
numpy/core/src/multiarray/ctors.c
Outdated
Comment on lines
1482
to
1486
| PyErr_Format(PyExc_RuntimeError, | ||
| "dtype changed while creating an array from a python object. " | ||
| "This should not be possible. Please notify the NumPy " | ||
| "developers you see this message.", | ||
| PyArray_DESCR(ret), dtype, PyArray_DESCR(ret)); |
There was a problem hiding this comment.
This error format string is missing placeholders.
eric-wieser
reviewed
Aug 13, 2020
| &PyArray_Type, dtype, ndim, dims, NULL, NULL, | ||
| flags&NPY_ARRAY_F_CONTIGUOUS, NULL); | ||
| flags&NPY_ARRAY_F_CONTIGUOUS, NULL, NULL, 0, 1); |
There was a problem hiding this comment.
As a refresher, what is this 1 argument?
There was a problem hiding this comment.
PyArray_NewFromDescr_int(
PyTypeObject *subtype, PyArray_Descr *descr, int nd,
npy_intp const *dims, npy_intp const *strides, void *data,
int flags, PyObject *obj, PyObject *base, int zeroed,
int allow_emptystring)
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
seberg
commented
Aug 13, 2020
seberg
commented
Aug 13, 2020
|
@seberg is this meant to be part of the dtype reworking for 1.20 or do we let it slide to a future release? |
|
Its OK to let this slide, it doesn't really matter when we do this. |
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
|
@seberg Needs rebase. |
|
@seberg needs rebase, then please ping reviewers |
|
@seberg this needs a rebase |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The dtype is of zero length strings is no preserved when creating
an array from a scalar in more cases.
This also simplifies the
PyArray_FromScalarcode so that the(mainly unused) casting branch reuses
PyArray_Packto avoidimplementing similar logic multiple times.