Skip to content

Commit 9893681

Browse files
Bordaauthmanawaelchli
authored
fix changelog (Lightning-AI#1864)
* fix chlog * test for Lightning-AI#1729 * hist * update * Document use case of passing test dataloaders to Trainer.test() (Lightning-AI#1992) * Issue 1990 Doc patch. * Codeblock directive. * Update to reflect current state of pytorch-lightning * Final grammar cleaning. I hope these commits are squashed. * Apply suggestions from code review * Apply suggestions from code review Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com> Co-authored-by: authman <uapatira@gmail.com> Co-authored-by: Adrian Wälchli <aedu.waelchli@gmail.com>
1 parent d8dc0a7 commit 9893681

File tree

4 files changed

+41
-16
lines changed

4 files changed

+41
-16
lines changed

CHANGELOG.md

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
2626

2727
- Allow passing model hyperparameters as complete kwarg list ([#1896](https://github.com/PyTorchLightning/pytorch-lightning/pull/1896))
2828

29+
- Re-Enable Logger's `ImportError`s ([#1938](https://github.com/PyTorchLightning/pytorch-lightning/pull/1938))
30+
2931
### Deprecated
3032

3133
- Dropped official support/testing for older PyTorch versions <1.3 ([#1917](https://github.com/PyTorchLightning/pytorch-lightning/pull/1917))
@@ -34,6 +36,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
3436

3537
- Removed unintended Trainer argument `progress_bar_callback`, the callback should be passed in by `Trainer(callbacks=[...])` instead ([#1855](https://github.com/PyTorchLightning/pytorch-lightning/pull/1855))
3638

39+
- Remove obsolete `self._device` in Trainer ([#1849](https://github.com/PyTorchLightning/pytorch-lightning/pull/1849))
40+
3741
### Fixed
3842

3943
- Run graceful training teardown on interpreter exit ([#1631](https://github.com/PyTorchLightning/pytorch-lightning/pull/1631))
@@ -50,6 +54,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
5054

5155
- Fixed `LearningRateLogger` in multi-scheduler setting ([#1944](https://github.com/PyTorchLightning/pytorch-lightning/pull/1944))
5256

57+
- Fixed test configuration check and testing ([#1804](https://github.com/PyTorchLightning/pytorch-lightning/pull/1804))
58+
59+
- Fixed an issue with Trainer constructor silently ignoring unknown/misspelled arguments ([#1820](https://github.com/PyTorchLightning/pytorch-lightning/pull/1820))
60+
61+
- Fixed `save_weights_only` in ModelCheckpoint ([#1780](https://github.com/PyTorchLightning/pytorch-lightning/pull/1780))
62+
5363
## [0.7.6] - 2020-05-16
5464

5565
### Added
@@ -102,11 +112,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
102112
- Fixed native amp + ddp ([#1788](https://github.com/PyTorchLightning/pytorch-lightning/pull/1788))
103113
- Fixed `hparam` logging with metrics ([#1647](https://github.com/PyTorchLightning/pytorch-lightning/pull/1647))
104114

105-
106-
- Fixed an issue with Trainer constructor silently ignoring unkown/misspelled arguments ([#1820](https://github.com/PyTorchLightning/pytorch-lightning/pull/1820))
107-
108-
- Fixed `save_weights_only` in ModelCheckpoint ([#1780](https://github.com/PyTorchLightning/pytorch-lightning/pull/1780))
109-
110115
## [0.7.5] - 2020-04-27
111116

112117
### Changed
@@ -649,16 +654,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
649654

650655
- Fixed a bug where `Experiment` object was not process safe, potentially causing logs to be overwritten
651656

652-
## [0.3.5] - 2019-MM-DD
657+
## [0.3.5] - 2019-07-25
653658

654-
## [0.3.4] - 2019-MM-DD
659+
## [0.3.4] - 2019-07-22
655660

656-
## [0.3.3] - 2019-MM-DD
661+
## [0.3.3] - 2019-07-22
657662

658-
## [0.3.2] - 2019-MM-DD
663+
## [0.3.2] - 2019-07-21
659664

660-
## [0.3.1] - 2019-MM-DD
665+
## [0.3.1] - 2019-07-21
661666

662-
## [0.2.x] - YYYY-MM-DD
667+
## [0.2.x] - 2019-07-09
663668

664-
## [0.1.x] - YYYY-MM-DD
669+
## [0.1.x] - 2019-06-DD

docs/source/test_set.rst

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Test set
22
========
3-
Lightning forces the user to run the test set separately to make sure it isn't evaluated by mistake
3+
Lightning forces the user to run the test set separately to make sure it isn't evaluated by mistake.
44

55

66
Test after fit
@@ -15,6 +15,7 @@ To run the test set after training completes, use this method
1515
# run test set
1616
trainer.test()
1717
18+
1819
Test pre-trained model
1920
----------------------
2021
To run the test set on a pre-trained model, use this method.
@@ -34,4 +35,22 @@ To run the test set on a pre-trained model, use this method.
3435
trainer.test(model)
3536
3637
In this case, the options you pass to trainer will be used when
37-
running the test set (ie: 16-bit, dp, ddp, etc...)
38+
running the test set (ie: 16-bit, dp, ddp, etc...)
39+
40+
41+
Test with additional data loaders
42+
---------------------------------
43+
You can still run inference on a test set even if the `test_dataloader` method hasn't been
44+
defined within your :class:`~pytorch_lightning.core.LightningModule` instance. This would be the case when your test data
45+
is not available at the time your model was declared.
46+
47+
.. code-block:: python
48+
49+
# setup your data loader
50+
test = DataLoader(...)
51+
52+
# test (pass in the loader)
53+
trainer.test(test_dataloaders=test)
54+
55+
You can either pass in a single dataloader or a list of them. This optional named
56+
parameter can be used in conjunction with any of the above use cases.

pytorch_lightning/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Root package info."""
22

3-
__version__ = '0.7.7-dev'
3+
__version__ = '0.8.0-dev'
44
__author__ = 'William Falcon et al.'
55
__author_email__ = 'waf2107@columbia.edu'
66
__license__ = 'Apache-2.0'

tests/test_deprecated.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ def test_tbd_remove_in_v0_9_0_trainer():
9797
assert getattr(trainer, 'show_progress_bar')
9898

9999
with pytest.deprecated_call(match='v0.9.0'):
100-
_ = Trainer(num_tpu_cores=8)
100+
trainer = Trainer(num_tpu_cores=8)
101+
assert trainer.tpu_cores == 8
101102

102103

103104
def test_tbd_remove_in_v0_9_0_module_imports():

0 commit comments

Comments
 (0)