Skip to content

Commit 9816536

Browse files
awaelchlilantiga
authored andcommitted
Update CLI tests to no longer require 3rd party logger dependencies (#18899)
(cherry picked from commit 31b8777)
1 parent 2c63468 commit 9816536

File tree

2 files changed

+9
-26
lines changed

2 files changed

+9
-26
lines changed

src/lightning/pytorch/trainer/trainer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ def __init__(
300300
301301
MisconfigurationException:
302302
If ``gradient_clip_algorithm`` is invalid.
303-
If ``track_grad_norm`` is not a positive number or inf.
304303
305304
"""
306305
super().__init__()

tests/tests_pytorch/test_cli.py

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
)
4343
from lightning.pytorch.demos.boring_classes import BoringDataModule, BoringModel
4444
from lightning.pytorch.loggers import CSVLogger, TensorBoardLogger
45-
from lightning.pytorch.loggers.comet import _COMET_AVAILABLE
46-
from lightning.pytorch.loggers.neptune import _NEPTUNE_AVAILABLE
47-
from lightning.pytorch.loggers.wandb import _WANDB_AVAILABLE
4845
from lightning.pytorch.strategies import DDPStrategy
4946
from lightning.pytorch.trainer.states import TrainerFn
5047
from lightning.pytorch.utilities.exceptions import MisconfigurationException
@@ -1433,7 +1430,7 @@ def test_cli_logger_shorthand():
14331430
assert cli.trainer.logger is None
14341431

14351432

1436-
def _test_logger_init_args(logger_name, init, unresolved={}):
1433+
def _test_logger_init_args(logger_name, init, unresolved=None):
14371434
cli_args = [f"--trainer.logger={logger_name}"]
14381435
cli_args += [f"--trainer.logger.{k}={v}" for k, v in init.items()]
14391436
cli_args += [f"--trainer.logger.dict_kwargs.{k}={v}" for k, v in unresolved.items()]
@@ -1449,50 +1446,37 @@ def _test_logger_init_args(logger_name, init, unresolved={}):
14491446
assert data["dict_kwargs"] == unresolved
14501447

14511448

1452-
@pytest.mark.skipif(not _COMET_AVAILABLE, reason="comet-ml is required")
14531449
def test_comet_logger_init_args():
14541450
_test_logger_init_args(
14551451
"CometLogger",
1456-
{
1457-
"save_dir": "comet", # Resolve from CometLogger.__init__
1458-
"workspace": "comet", # Resolve from Comet{,Existing,Offline}Experiment.__init__
1459-
},
1452+
init={"save_dir": "comet"}, # Resolve from CometLogger.__init__
1453+
unresolved={"workspace": "comet"}, # Resolve from Comet{,Existing,Offline}Experiment.__init__
14601454
)
14611455

14621456

1463-
@pytest.mark.skipif(not _NEPTUNE_AVAILABLE, reason="neptune is required")
14641457
def test_neptune_logger_init_args():
14651458
_test_logger_init_args(
14661459
"NeptuneLogger",
1467-
{
1468-
"name": "neptune", # Resolve from NeptuneLogger.__init__
1469-
},
1470-
{
1471-
"description": "neptune", # Unsupported resolving from neptune.internal.init.run.init_run
1472-
},
1460+
init={"name": "neptune"}, # Resolve from NeptuneLogger.__init__
1461+
unresolved={"description": "neptune"}, # Unsupported resolving from neptune.internal.init.run.init_run
14731462
)
14741463

14751464

14761465
def test_tensorboard_logger_init_args():
14771466
_test_logger_init_args(
14781467
"TensorBoardLogger",
1479-
{
1468+
init={
14801469
"save_dir": "tb", # Resolve from TensorBoardLogger.__init__
14811470
},
1482-
{
1483-
"comment": "tb", # Unsupported resolving from local imports
1484-
},
1471+
unresolved={},
14851472
)
14861473

14871474

1488-
@pytest.mark.skipif(not _WANDB_AVAILABLE, reason="wandb is required")
14891475
def test_wandb_logger_init_args():
14901476
_test_logger_init_args(
14911477
"WandbLogger",
1492-
{
1493-
"save_dir": "wandb", # Resolve from WandbLogger.__init__
1494-
"notes": "wandb", # Resolve from wandb.sdk.wandb_init.init
1495-
},
1478+
init={"save_dir": "wandb"}, # Resolve from WandbLogger.__init__
1479+
unresolved={"notes": "wandb"}, # Resolve from wandb.sdk.wandb_init.init
14961480
)
14971481

14981482

0 commit comments

Comments
 (0)