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.

Sign up for GitHub

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

Jump to bottom

allow regression metrics to import #2225

Merged
merged 4 commits into from
Jun 17, 2020
Merged

allow regression metrics to import #2225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5a1d9d0
allow regression metrics to import
williamFalcon Jun 17, 2020
3b07b5e
allow regression metrics to import
williamFalcon Jun 17, 2020
86f485e
docs
Borda Jun 17, 2020
9b7d326
Apply suggestions from code review
Borda Jun 17, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
* Sklearn metrics classes ([#1327](https://github.com/PyTorchLightning/pytorch-lightning/pull/1327))
* Native torch metrics ([#1488](https://github.com/PyTorchLightning/pytorch-lightning/pull/1488))
* docs for all Metrics ([#2184](https://github.com/PyTorchLightning/pytorch-lightning/pull/2184), [#2209](https://github.com/PyTorchLightning/pytorch-lightning/pull/2209))
* Regression metrics ([#2221](https://github.com/PyTorchLightning/pytorch-lightning/pull/2221))
- Added type hints in `Trainer.fit()` and `Trainer.test()` to reflect that also a list of dataloaders can be passed in ([#1723](https://github.com/PyTorchLightning/pytorch-lightning/pull/1723))
- Allow dataloaders without sampler field present ([#1907](https://github.com/PyTorchLightning/pytorch-lightning/pull/1907))
- Added option `save_last` to save the model at the end of every epoch in `ModelCheckpoint` [(#1908)](https://github.com/PyTorchLightning/pytorch-lightning/pull/1908)
Expand Down
16 changes: 14 additions & 2 deletions pytorch_lightning/metrics/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
from pytorch_lightning.metrics.converters import numpy_metric, tensor_metric
from pytorch_lightning.metrics.metric import Metric, TensorMetric, NumpyMetric
from pytorch_lightning.metrics.regression import (
MSE,
RMSE,
MAE,
RMSLE,
)
from pytorch_lightning.metrics.classification import (
Accuracy,
AveragePrecision,
Expand All @@ -21,7 +27,7 @@
SklearnMetric,
)

__all__ = [
__classification_metrics = [
'AUC',
'AUROC',
'Accuracy',
Expand All @@ -37,5 +43,11 @@
'PrecisionRecallCurve',
'ROC',
'Recall',
'SklearnMetric',
]
__regression_metrics = [
'MSE',
'RMSE',
'MAE',
'RMSLE'
]
__all__ = __regression_metrics + __classification_metrics + ['SklearnMetric']