Skip to content

Commit

Permalink
Merge branch 'master' into ci/torch-2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda authored Mar 27, 2024
2 parents 30d7d0c + 82e6abe commit c21f7b9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions requirements/_tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

coverage ==7.4.4
pytest ==8.1.1
pytest-cov ==4.1.0
pytest-cov ==5.0.0
pytest-doctestplus ==1.2.1
pytest-rerunfailures ==14.0
pytest-timeout ==2.3.1
pytest-xdist ==3.5.0
phmdoctest ==1.4.0

psutil <5.10.0
pyGithub ==2.2.0
pyGithub ==2.3.0
fire <=0.6.0

cloudpickle >1.3, <=3.0.0
Expand Down
4 changes: 4 additions & 0 deletions tests/unittests/utilities/test_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
WordInfoPreserved,
)
from torchmetrics.utilities.imports import (
_TORCH_GREATER_EQUAL_1_12,
_TORCHAUDIO_GREATER_EQUAL_0_10,
)
from torchmetrics.utilities.plot import _get_col_row_split
Expand Down Expand Up @@ -341,6 +342,9 @@
_panoptic_input,
_panoptic_input,
id="panoptic quality",
marks=pytest.mark.skipif(
not _TORCH_GREATER_EQUAL_1_12, reason="Panoptic Quality metric requires PyTorch 1.12 or later"
),
),
pytest.param(BinaryAveragePrecision, _rand_input, _binary_randint_input, id="binary average precision"),
pytest.param(
Expand Down

0 comments on commit c21f7b9

Please sign in to comment.