Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Numpy 20 fixes #565

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 23 commits into from
Oct 4, 2024
Merged

Numpy 20 fixes #565

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d4415fe
Numpy ports
matthew-brett Jun 17, 2024
527408e
Finish up Numpy 2.0 port
matthew-brett Jun 17, 2024
b4237d7
Refactor to prevent warnings from test_numpy
matthew-brett Jun 18, 2024
e0bf273
Run style checker
matthew-brett Jun 18, 2024
dcb9769
Update some workflows
matthew-brett Jun 18, 2024
4e10e2f
Adapt to Numpy 2.0 casting rules
matthew-brett Jun 18, 2024
0779a6b
Another couple of np.complex_ examples
matthew-brett Jun 18, 2024
dddec91
Fix a deprecated import
matthew-brett Jun 18, 2024
657ccb1
Add spin gdb, lldb, and install
stefanv Jun 19, 2024
3d0821c
Note return type of import_array as void *
matthew-brett Jun 20, 2024
ad09805
Hack fix for segfaults in multi object
matthew-brett Oct 3, 2024
4815127
Allow for floating point error in affine tests
matthew-brett Oct 3, 2024
3ea60ee
Probably correct fix for multiiter size
matthew-brett Oct 3, 2024
7034758
Fixes to Numpy 2.0 doctesting
matthew-brett Oct 3, 2024
df6926a
Fix unstable import of fromrecords
matthew-brett Oct 3, 2024
39fef66
Another fix for imprecision in coordinate_map
matthew-brett Oct 3, 2024
6915943
Style fix
matthew-brett Oct 3, 2024
934515f
Try fix for random registration seeding
matthew-brett Oct 3, 2024
2de7140
Trying again with int fix for registration
matthew-brett Oct 3, 2024
7eebf47
Drop Python 3.8
matthew-brett Oct 4, 2024
7f9a5d0
Try fixing Numpy datatype
matthew-brett Oct 4, 2024
a419dbc
Revert "Drop Python 3.8"
matthew-brett Oct 4, 2024
d8989ab
Convert all np.int_ to np.intp in graph.py
matthew-brett Oct 4, 2024
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
Hack fix for segfaults in multi object 
See: numpy/numpy#26765 (comment)
  • Loading branch information
@matthew-brett
matthew-brett committed Oct 3, 2024
commit ad0980580c24aa9e7dc84aab6fb45a983b14fe82
8 changes: 7 additions & 1 deletion lib/fff_python_wrapper/fffpy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,13 @@ fffpy_multi_iterator* fffpy_multi_iterator_new(int narr, int axis, ...)

/* Create new instance */
thisone = (fffpy_multi_iterator*)malloc(sizeof(fffpy_multi_iterator));
multi = PyArray_malloc(sizeof(PyArrayMultiIterObject));
/* Size of PyArrayMultiIterObject no longer guaranteed.
*
* Add arbitrary overhead to allow for this.
*
* https://github.com/numpy/numpy/issues/26765#issuecomment-2189047480
*/
multi = PyArray_malloc(sizeof(PyArrayMultiIterObject) * 2);
vector = (fff_vector**)malloc(narr*sizeof(fff_vector*));

/* Initialize the PyArrayMultiIterObject instance from the variadic arguments */
Expand Down