Skip to content
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.

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

Add missing methods to logger collection #2723

Merged
merged 6 commits into from
Jul 29, 2020
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

- Fixed TPU multi-core and Float16 ([#2632](https://github.com/PyTorchLightning/pytorch-lightning/pull/2632))

- Fixed test metrics not being logged with multiple loggers ([#2723](https://github.com/PyTorchLightning/pytorch-lightning/pull/2723))

## [0.8.5] - 2020-07-09

### Added
Expand Down
15 changes: 15 additions & 0 deletions pytorch_lightning/loggers/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,20 @@ def __init__(self, logger_iterable: Iterable[LightningLoggerBase]):
def __getitem__(self, index: int) -> LightningLoggerBase:
return [logger for logger in self._logger_iterable][index]

def update_agg_funcs(
self,
agg_key_funcs: Optional[Mapping[str, Callable[[Sequence[float]], float]]] = None,
agg_default_func: Callable[[Sequence[float]], float] = np.mean
):
[logger.update_agg_funcs(agg_key_funcs, agg_default_func) for logger in self._logger_iterable]

@property
def experiment(self) -> List[Any]:
return [logger.experiment for logger in self._logger_iterable]

def agg_and_log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None):
[logger.agg_and_log_metrics(metrics, step) for logger in self._logger_iterable]

def log_metrics(self, metrics: Dict[str, float], step: Optional[int] = None) -> None:
[logger.log_metrics(metrics, step) for logger in self._logger_iterable]

Expand All @@ -291,6 +301,11 @@ def finalize(self, status: str) -> None:
def close(self) -> None:
[logger.close() for logger in self._logger_iterable]

@property
def save_dir(self) -> Optional[str]:
# Checkpoints should be saved to default / chosen location when using multiple loggers
return None

@property
def name(self) -> str:
return '_'.join([str(logger.name) for logger in self._logger_iterable])
Expand Down
10 changes: 10 additions & 0 deletions tests/loggers/test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ def test_logger_collection():
assert logger.experiment[0] == mock1.experiment
assert logger.experiment[1] == mock2.experiment

assert logger.save_dir is None

logger.update_agg_funcs({'test': np.mean}, np.sum)
mock1.update_agg_funcs.assert_called_once_with({'test': np.mean}, np.sum)
mock2.update_agg_funcs.assert_called_once_with({'test': np.mean}, np.sum)

logger.agg_and_log_metrics({'test': 2.0}, 4)
mock1.agg_and_log_metrics.assert_called_once_with({'test': 2.0}, 4)
mock2.agg_and_log_metrics.assert_called_once_with({'test': 2.0}, 4)

logger.close()
mock1.close.assert_called_once()
mock2.close.assert_called_once()
Expand Down