Skip to content

Commit 0c94810

Browse files
awaelchlilantiga
authored andcommitted
Re-enable LightningCLI test disabled due to bug in jsonargparse (#19683)
1 parent f4cefa0 commit 0c94810

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

requirements/pytorch/extra.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
matplotlib>3.1, <3.9.0
66
omegaconf >=2.0.5, <2.4.0
77
hydra-core >=1.0.5, <1.4.0
8-
jsonargparse[signatures] >=4.26.1, <4.28.0
8+
jsonargparse[signatures] >=4.27.7, <4.28.0
99
rich >=12.3.0, <13.6.0
1010
tensorboardX >=2.2, <2.7.0 # min version is set by torch.onnx missing attribute
1111
bitsandbytes ==0.41.0 # strict

src/lightning/pytorch/cli.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from lightning.pytorch.utilities.model_helpers import is_overridden
3232
from lightning.pytorch.utilities.rank_zero import rank_zero_warn
3333

34-
_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[signatures]>=4.26.1")
34+
_JSONARGPARSE_SIGNATURES_AVAILABLE = RequirementCache("jsonargparse[signatures]>=4.27.7")
3535

3636
if _JSONARGPARSE_SIGNATURES_AVAILABLE:
3737
import docstring_parser

tests/tests_pytorch/test_cli.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
from lightning.pytorch.utilities.exceptions import MisconfigurationException
4848
from lightning.pytorch.utilities.imports import _TORCHVISION_AVAILABLE
4949
from lightning_utilities import compare_version
50-
from lightning_utilities.core.imports import RequirementCache
5150
from lightning_utilities.test.warning import no_warning_call
5251
from tensorboard.backend.event_processing import event_accumulator
5352
from tensorboard.plugins.hparams.plugin_data_pb2 import HParamsPluginData
@@ -1404,12 +1403,6 @@ def __init__(self, activation: torch.nn.Module = lazy_instance(torch.nn.LeakyReL
14041403
assert cli.model.activation is not model.activation
14051404

14061405

1407-
@pytest.mark.xfail(
1408-
# https://github.com/omni-us/jsonargparse/issues/473
1409-
condition=(RequirementCache("jsonargparse>=4.27.6")),
1410-
strict=False,
1411-
reason="Breaking change for `lazy_instance` in jsonargparse",
1412-
)
14131406
def test_ddpstrategy_instantiation_and_find_unused_parameters(mps_count_0):
14141407
strategy_default = lazy_instance(DDPStrategy, find_unused_parameters=True)
14151408
with mock.patch("sys.argv", ["any.py", "--trainer.strategy.process_group_backend=group"]):

0 commit comments

Comments
 (0)