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

Fix memory leak in get_dft_array #577

Merged
merged 4 commits into from
Oct 23, 2018
Merged

Fix memory leak in get_dft_array #577

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f22dab
Fix memory leak in get_dft_array
ChristopherHogan Oct 22, 2018
a5e4969
Copy dft array so numpy can free it
ChristopherHogan Oct 22, 2018
d5d8da7
Let numpy allocate via PyArray_SimpleNew
ChristopherHogan Oct 22, 2018
c8d335f
OWNDATA flag is already true with PyArray_SimpleNew
ChristopherHogan Oct 23, 2018
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
1 change: 1 addition & 0 deletions python/meep.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ PyObject *_get_dft_array(meep::fields *f, dft_type dft, meep::component c, int n
}

PyObject *py_arr = PyArray_SimpleNewFromData(rank, arr_dims, NPY_CDOUBLE, dft_arr);
PyArray_ENABLEFLAGS((PyArrayObject*)py_arr, NPY_ARRAY_OWNDATA);
Copy link
Collaborator

@stevengj stevengj Oct 22, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

This will eventually cause NumPy to call free, so it is not safe to set this flag for an array allocated with new like in get_dft_array.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It would be nice to be able to get the array size and allocate a numpy array from Python like we do in Simulation.get_array, but I don't see a way to get the dft array size, so I'm copying the dft data to my own malloced array.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I don't think you need to set the NPY_ARRAY_OWNDATA flag if you are using PyArray_SimpleNew

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. Fixed.

delete[] arr_dims;

return py_arr;
Expand Down