8000 Forwardport2797 by certik · Pull Request #2853 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Forwardport2797 #2853

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

Merged
merged 6 commits into from
Dec 26, 2012
Merged

Forwardport2797 #2853

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86dbd45
Fix invalid typestring size
jayvius Dec 7, 2012
4237c6e
Refactor to cover more cases; modify unit tests
jayvius Dec 11, 2012
18e73ab
Modify unit tests for 32 bit support
jayvius Dec 14, 2012
83de7cd
Refactor unit tests and add DECREF
jayvius Dec 17, 2012
0f5afde
Add debug logging to figure out why unit test fails on Travis
jayvius Dec 21, 2012
1f1537e
Add fix to unit test; remove debug logging
jayvius Dec 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add debug logging to figure out why unit test fails on Travis
  • Loading branch information
@jayvius @certik
jayvius authored and certik committed Dec 26, 2012
commit 0f5afde4b719d622f4530c707d9577eea6c131fd
10 changes: 10 additions & 0 deletions numpy/core/src/multiarray/conversion_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,9 +1116,19 @@ PyArray_TypestrConvert(int itemsize, int gentype)
* This should eventually be changed to an error in
* future NumPy versions.
*/

if (newtype == NPY_NOTYPE)
{
printf("XXX: gentype=%c\n", gentype);
}
if (newtype == NPY_NOTYPE) {
temp = PyArray_DescrFromType(gentype);

if (gentype == 'g')
printf("XXX: temp=%x\n", temp);
if (temp != NULL) {
if (gentype == 'g')
printf("XXX: elsize=%d itemsize=%d\n", temp->elsize, itemsize);
if (temp->elsize != itemsize) {
if (DEPRECATE(msg) < 0) {
Py_DECREF(temp);
Expand Down
0