Skip to content

Do not import scipy.signal at torchmetrics import time #3459

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

Open
Kayvan-Zahiri wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −23
Open

Do not import scipy.signal at torchmetrics import time #3459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/torchmetrics/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,6 @@
if not hasattr(PIL, "PILLOW_VERSION"):
PIL.PILLOW_VERSION = PIL.__version__

if package_available("scipy"):
import scipy.signal

# back compatibility patch due to SMRMpy using scipy.signal.hamming
if not hasattr(scipy.signal, "hamming"):
scipy.signal.hamming = scipy.signal.windows.hamming

from torchmetrics import functional # noqa: E402
from torchmetrics.aggregation import ( # noqa: E402
CatMetric,
Expand Down
8 changes: 0 additions & 8 deletions src/torchmetrics/audio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,9 @@
_PESQ_AVAILABLE,
_PYSTOI_AVAILABLE,
_REQUESTS_AVAILABLE,
_SCIPI_AVAILABLE,
_TORCHAUDIO_AVAILABLE,
)

if _SCIPI_AVAILABLE:
import scipy.signal

# back compatibility patch due to SMRMpy using scipy.signal.hamming
if not hasattr(scipy.signal, "hamming"):
scipy.signal.hamming = scipy.signal.windows.hamming

__all__ = [
"ComplexScaleInvariantSignalNoiseRatio",
"PermutationInvariantTraining",
Expand Down
8 changes: 0 additions & 8 deletions src/torchmetrics/functional/audio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,9 @@
_PESQ_AVAILABLE,
_PYSTOI_AVAILABLE,
_REQUESTS_AVAILABLE,
_SCIPI_AVAILABLE,
_TORCHAUDIO_AVAILABLE,
)

if _SCIPI_AVAILABLE:
import scipy.signal

# back compatibility patch due to SMRMpy using scipy.signal.hamming
if not hasattr(scipy.signal, "hamming"):
scipy.signal.hamming = scipy.signal.windows.hamming

__all__ = [
"complex_scale_invariant_signal_noise_ratio",
"permutation_invariant_training",
Expand Down
11 changes: 11 additions & 0 deletions tests/unittests/audio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@

from unittests import _PATH_ALL_TESTS

# SRMRpy calls `scipy.signal.hamming`, which SciPy moved to `scipy.signal.windows.hamming`.
# Only `test_srmr.py` imports SRMRpy, and this package is imported before it, so the shim
# lives here rather than in `torchmetrics`, which never imports SRMRpy at all.
try:
import scipy.signal

if not hasattr(scipy.signal, "hamming"):
scipy.signal.hamming = scipy.signal.windows.hamming
except ImportError:
pass

_SAMPLE_AUDIO_SPEECH = os.path.join(_PATH_ALL_TESTS, "_data", "audio", "audio_speech.wav")
_SAMPLE_AUDIO_SPEECH_BAB_DB = os.path.join(_PATH_ALL_TESTS, "_data", "audio", "audio_speech_bab_0dB.wav")
_SAMPLE_NUMPY_ISSUE_895 = os.path.join(_PATH_ALL_TESTS, "_data", "audio", "issue_895.npz")
Expand Down