Skip to content

Commit 7841f40

Browse files
committed
log hyperparams if there is something to log
1 parent cec2d79 commit 7841f40

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

pytorch_lightning/core/mixins/hparams_mixin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class HyperparametersMixin:
2828

2929
def __init__(self) -> None:
3030
super().__init__()
31-
self._log_hyperparams = True
31+
self._log_hyperparams = False
3232

3333
def save_hyperparameters(
3434
self,

tests/loggers/test_all.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,8 @@ def log_metrics(self, metrics, step):
146146
log_metric_names = [(s, sorted(m.keys())) for s, m in logger.history]
147147
if logger_class == TensorBoardLogger:
148148
expected = [
149-
(0, ["hp_metric"]),
150149
(0, ["epoch", "train_some_val"]),
151150
(0, ["early_stop_on", "epoch", "val_loss"]),
152-
(0, ["hp_metric"]),
153151
(1, ["epoch", "test_loss"]),
154152
]
155153
assert log_metric_names == expected

tests/loggers/test_base.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ def training_step(self, batch, batch_idx):
111111
trainer = Trainer(max_steps=2, log_every_n_steps=1, logger=logger, default_root_dir=tmpdir)
112112
trainer.fit(model)
113113
assert trainer.state.finished, f"Training failed with {trainer.state}"
114-
assert logger.hparams_logged == model.hparams
115114
assert logger.metrics_logged != {}
116115
assert logger.after_save_checkpoint_called
117116
assert logger.finalized_status == "success"
@@ -133,11 +132,11 @@ def training_step(self, batch, batch_idx):
133132
trainer.fit(model)
134133
assert trainer.state.finished, f"Training failed with {trainer.state}"
135134

136-
assert logger1.hparams_logged == model.hparams
135+
assert logger1.hparams_logged is None
137136
assert logger1.metrics_logged != {}
138137
assert logger1.finalized_status == "success"
139138

140-
assert logger2.hparams_logged == model.hparams
139+
assert logger2.hparams_logged is None
141140
assert logger2.metrics_logged != {}
142141
assert logger2.finalized_status == "success"
143142

tests/models/test_hparams.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,10 @@ def test_adding_datamodule_hparams(tmpdir, model, data):
764764
# Merged hparams were logged
765765
merged_hparams = copy.deepcopy(org_model_hparams)
766766
merged_hparams.update(org_data_hparams)
767-
mock_logger.log_hyperparams.assert_called_with(merged_hparams)
767+
if merged_hparams:
768+
mock_logger.log_hyperparams.assert_called_with(merged_hparams)
769+
else:
770+
mock_logger.log_hyperparams.assert_not_called()
768771

769772

770773
def test_no_datamodule_for_hparams(tmpdir):

0 commit comments

Comments
 (0)