Remove unnecessary np.{,as}array / astype calls. #24295
Merged
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
QuLogic
reviewed
Oct 29, 2022
| @@ -696,7 +696,7 @@ def test_pathcollection_legend_elements(): | |||
|
|
|||
| h, l = sc.legend_elements(fmt="{x:g}") | |||
| assert len(h) == 5 | |||
| assert_array_equal(np.array(l).astype(float), np.arange(5)) | |||
| assert_array_equal(l, ["0", "1", "2", "3", "4"]) | |||
There was a problem hiding this comment.
Is this a list of str? Can it be a regular assert?
There was a problem hiding this comment.
Indeed; switched more places to use plain asserts.
| @@ -727,7 +727,7 @@ def test_pathcollection_legend_elements(): | |||
|
|
|||
| levels = [-1, 0, 55.4, 260] | |||
| h6, lab6 = sc.legend_elements(num=levels, prop="sizes", fmt="{x:g}") | |||
| assert_array_equal(np.array(lab6).astype(float), levels[2:]) | |||
| assert_array_equal(np.asarray(lab6, float), levels[2:]) | |||
There was a problem hiding this comment.
How come this one became np.asarray when the above one remained np.array?
There was a problem hiding this comment.
Switched to a plain assert, as above.
timhoffm
reviewed
Oct 29, 2022
lib/matplotlib/tests/test_sankey.py
Outdated
| @@ -67,7 +67,7 @@ def test_sankey2(): | |||
| s = Sankey(flows=[0.25, -0.25, 0.5, -0.5], labels=['Foo'], | |||
| orientations=[-1], unit='Bar') | |||
| sf = s.finish() | |||
| assert np.all(np.equal(np.array((0.25, -0.25, 0.5, -0.5)), sf[0].flows)) | |||
| assert np.array_equal(sf[0].flows, [0.25, -0.25, 0.5, -0.5]) | |||
There was a problem hiding this comment.
Better to use numpy.testing.assert_array_equal() because that gives better error messages. I wouldn’t bother to go through all tests and change it, but if you rewrite something, that’s the way to go.
tacaswell
reviewed
Oct 29, 2022
lib/matplotlib/backend_bases.py
Outdated
| @@ -1464,7 +1464,7 @@ def on_pick(event): | |||
| line = event.artist | |||
| xdata, ydata = line.get_data() | |||
| ind = event.ind | |||
| print('on pick line:', np.array([xdata[ind], ydata[ind]]).T) | |||
| print('on pick line:', xdata[ind], ydata[ind]) | |||
There was a problem hiding this comment.
I bet this array call was here to get reasonably truncated repr:
Suggested change
| print('on pick line:', xdata[ind], ydata[ind]) | |
| print(f'on pick line: {ind}: ({xdata[ind]:.3f}, {ydata[ind]:.3f})') |
There was a problem hiding this comment.
fair enough, fixed.
tacaswell
approved these changes
Oct 29, 2022
timhoffm
approved these changes
Oct 29, 2022
Quite often numpy will call asarray for us, saving us the need to call asarray explicitly. When we do call asarray (or array) ourselves, a dtype can directly be passed in, rather than immediately calling astype immediately after. Passing the dtype makes it unnecessary for asarray to infer the dtype of the passed-in container, and can also save an extra array allocation if asarray first has to allocate an array of a type and astype immediately has to allocate an array of another type.
|
Done. |
|
Can self-merge on green. |
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.
Quite often numpy will call asarray for us, saving us the need to call asarray explicitly.
When we do call asarray (or array) ourselves, a dtype can directly be passed in, rather than immediately calling astype immediately after. Passing the dtype makes it unnecessary for asarray to infer the dtype of the passed-in container, and can also save an extra array allocation if asarray first has to allocate an array of a type and astype immediately has to allocate an array of another type.
PR Summary
PR Checklist
Tests and Styling
pytestpasses).flake8-docstringsand runflake8 --docstring-convention=all).Documentation
Release Notes
.. versionadded::directive in the docstring and documented indoc/users/next_whats_new/.. versionchanged::directive in the docstring and documented indoc/api/next_api_changes/next_whats_new/README.rstornext_api_changes/README.rst