MAINT: Update fft.helper import
#19426
Merged
Conversation
This file contains 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
This was referenced Oct 23, 2023
h-vetinari
approved these changes
Oct 23, 2023
scipy/_lib/array_api_compat
Outdated
There was a problem hiding this comment.
I checked the submodule update, and the one relevant change w.r.t. this PR is:
-from numpy.core.numeric import normalize_axis_tuple
+import numpy as np
+if np.__version__[0] == "2":
+ from numpy.lib.array_utils import normalize_axis_tuple
+else:
+ from numpy.core.numeric import normalize_axis_tupleThere was a problem hiding this comment.
This one was introduced for SciPy specifically: data-apis/array-api-compat#63.
There was a problem hiding this comment.
See gh-19406. This change needs to make its way into SciPy at some point, but I don't know whether it should come in a separate PR.
scipy/fftpack/_helper.py
Outdated
Comment on lines
2
to
4
| from numpy.fft.helper import fftshift, ifftshift, fftfreq | ||
|
|
||
| import scipy.fft._pocketfft.helper as _helper | ||
| from scipy.fft._helper import fftshift, ifftshift, fftfreq |
peterbell10
reviewed
Oct 23, 2023
Co-authored-by: peterbell10 <peterbell10@live.co.uk>
mtsokol
force-pushed
the
update-fft-helper-import
branch
from
16bda78
to
9e2b873
Compare
|
Agreed with Peter that we should avoid going through |
tylerjereddy
approved these changes
Oct 23, 2023
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.
Hi!
numpy.fft.helpersubmodule was deprecated and accessing it raises a warning (it was renamed to a private namenumpy.fft._helper).Here I update the import statement in
fftpack- it usesfftshift,ifftshiftandfftfreqfunctions defined inscipy.fft._helpersubmodule. Internally they import the correct (non-deprecated) function from NumPy.