Add DCGAN module #403

chris-clem · 2020-11-24T18:52:59Z

What does this PR do?

As proposed in #401, this PR adds a DCGAN implementation closely following the one in PyTorch's examples (https://github.com/pytorch/examples/blob/master/dcgan/main.py).

Fixes #401

Before submitting

Was this discussed/approved via a Github issue? (no need for typos and docs improvements)
Did you read the contributor guideline, Pull Request section?
Did you make sure your PR does only one thing, instead of bundling different changes together? Otherwise, we ask you to create a separate PR for every change.
Did you make sure to update the documentation with your changes?
Did you write any new necessary tests?
Did you verify new and existing tests pass locally with your changes?
If you made a notable change (that affects users), did you update the CHANGELOG?

PR review

Is this pull request ready for review? (if not, please submit in draft mode)

Anyone in the community is free to review the PR once the tests have passed.
If we didn't discuss your PR in Github issues there's a high chance it will not be merged.

Did you have fun?

Make sure you had fun coding 🙃

codecov · 2020-11-24T18:54:48Z

Codecov Report

Merging #403 (01fea8a) into master (413b9df) will decrease coverage by 0.03%.
The diff coverage is 97.77%.

@@            Coverage Diff             @@
##           master     #403      +/-   ##
==========================================
- Coverage   79.49%   79.46%   -0.04%     
==========================================
  Files         102      104       +2     
  Lines        5912     6047     +135     
==========================================
+ Hits         4700     4805     +105     
- Misses       1212     1242      +30

Flag	Coverage Δ
cpu	`25.86% <29.85%> (+0.09%)`	⬆️
pytest	`25.86% <29.85%> (+0.09%)`	⬆️
unittests	`78.98% <97.77%> (-0.03%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pl_bolts/callbacks/vision/image_generation.py	`91.30% <ø> (ø)`
pl_bolts/models/gans/dcgan/dcgan_module.py	`97.22% <97.22%> (ø)`
pl_bolts/models/gans/__init__.py	`100.00% <100.00%> (ø)`
pl_bolts/models/gans/dcgan/components.py	`100.00% <100.00%> (ø)`
pl_bolts/datasets/cifar10_dataset.py	`71.73% <0.00%> (-26.09%)`	⬇️
pl_bolts/datasets/base_dataset.py	`81.81% <0.00%> (-13.64%)`	⬇️
...l_bolts/models/rl/vanilla_policy_gradient_model.py	`96.36% <0.00%> (+2.72%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 413b9df...e2f6f46. Read the comment docs.

pl_bolts/models/gans/dcgan/components.py

chris-clem · 2020-11-27T08:42:42Z

The tests fail because CIFAR10 fails to download. Is it possible to cache it? Also: is it possible to deactivate some of the tests in the beginning? It feels quite resource-draining.

And why does codefactor check a file that I haven't changed (docs\source\conf.py)?

akihironitta · 2020-11-27T09:15:57Z

@chris-clem Thank you for your contribution!

The tests fail because CIFAR10 fails to download. Is it possible to cache it?

Actually, we've recently enabled dataset caching in #315, but it seems it is not working properly as you point out...
Just re-ran the ci, let's see how it goes... https://github.com/PyTorchLightning/pytorch-lightning-bolts/runs/1462875014

akihironitta

Also please make sure to add the summary of your change to CHANGELOG.md :]

pl_bolts/models/gans/dcgan/dcgan_module.py

tests/models/test_gans.py

* Upgrade DQN to use .log * remove unused * pep8 * fixed other dqn

* Decouple dms from CPCV2 * Update tests

akihironitta

LGTM. Thank you for your swift action!

chris-clem · 2020-11-27T11:02:10Z

Was it wrong to rebase?

LGTM. Thank you for your swift action!

Thanks, happy to contribute!

akihironitta · 2020-11-27T17:21:34Z

@chris-clem

Was it wrong to rebase?

I believe it's fine. Let me know if there is something that concerns you :]

akihironitta

@chris-clem Could you also add DCGAN to the docs like GAN? https://github.com/PyTorchLightning/pytorch-lightning-bolts/blob/master/docs/source/gans.rst

chris-clem · 2020-12-09T15:00:48Z

@chris-clem Could you also add DCGAN to the docs like GAN? https://github.com/PyTorchLightning/pytorch-lightning-bolts/blob/master/docs/source/gans.rst

Sorry for the delay. I get access to a GPU server in a couple of days and will train a model there.

@akihironitta

…verse#344) * bugfix: batch_size for DataModules remaining * Update sklearn datamodule tests * Fix default_transforms. Keep internal for every data module * fix typo on binary_mnist_datamodule thanks @akihironitta Co-authored-by: Akihiro Nitta <nitta@akihironitta.com> Co-authored-by: Akihiro Nitta <nitta@akihironitta.com>

chris-clem · 2021-01-04T12:36:24Z

@akihironitta Here also the ubuntu and mac python 3.6 tests fail.

ananyahjha93 · 2021-01-04T12:41:50Z

@chris-clem same cause #471. Taking a look.

akihironitta · 2021-01-05T08:55:01Z

@akihironitta Here also the ubuntu and mac python 3.6 tests fail.

@chris-clem Thank you for quickly applying the suggestion. As @ananyahjha93 mentioned, the other failures in the tests have been reported in #471.

ananyahjha93 · 2021-01-07T10:19:53Z

@chris-clem rebase and resolve conflicts, good to go!

tests/models/test_scripts.py

akihironitta

lgtm

akihironitta · 2021-01-17T10:54:59Z

@chris-clem Would you mind resolving the conflict and applying yapf to pass the tests in CI? The other failing tests seem irrelevant to the changes in this PR, so I think we can land this once the formatting is resolved.

chris-clem · 2021-01-17T13:15:27Z

@chris-clem Would you mind resolving the conflict and applying yapf to pass the tests in CI? The other failing tests seem irrelevant to the changes in this PR, so I think we can land this once the formatting is resolved.

@akihironitta Done :)!

akihironitta

@chris-clem Thank you for your swift action!

Borda · 2021-01-18T08:02:12Z

@chris-clem @akihironitta can you pls resolve conflicts (rebase) so we can get it land...
seems that yapf is missing in this PR

chris-clem · 2021-01-18T08:09:53Z

@chris-clem @akihironitta can you pls resolve conflicts (rebase) so we can get it land...
seems that yapf is missing in this PR

@Borda I don't see any conflicts at the moment and I added yapf yesterday. The yapf tests passes. Am I missing something else?

Borda · 2021-01-18T09:06:35Z

@chris-clem the conflicts appeared when I tried to rebase it so we test it out with newly added py 3.8
But let's see, it shall be fine =)

CHANGELOG.md

chris-clem added 2 commits November 24, 2020 19:42

Add DCGAN module

3a483ca

Undo black on conf.py

2bb60eb

Add tests for DCGAN

dac758b

chris-clem changed the title ~~WIP: Add DCGAN module~~ Add DCGAN module Nov 25, 2020

chris-clem marked this pull request as ready for review November 25, 2020 16:36

Fix flake8 and codefactor

1582816

akihironitta added the model label Nov 25, 2020

akihironitta added this to In progress in AE & GANs via automation Nov 25, 2020

Borda added the enhancement New feature or request label Nov 26, 2020

Borda approved these changes Nov 26, 2020

View reviewed changes

pl_bolts/models/gans/dcgan/components.py Outdated Show resolved Hide resolved

chris-clem added 2 commits November 27, 2020 09:17

Add types and small refactoring

0df4de5

Make image sampler callback work

6b1e11a

akihironitta suggested changes Nov 27, 2020

View reviewed changes

pl_bolts/models/gans/dcgan/dcgan_module.py Show resolved Hide resolved

tests/models/test_gans.py Outdated Show resolved Hide resolved

AE & GANs automation moved this from In progress to in Review Nov 27, 2020

teddykoker and others added 4 commits November 27, 2020 11:42

Upgrade DQN to use .log (Lightning-Universe#404)

ec90342

* Upgrade DQN to use .log * remove unused * pep8 * fixed other dqn

fix loss test case for batch size variation (Lightning-Universe#402)

6d3aaaa

Decouple DataModules from Models - CPCV2 (Lightning-Universe#386)

ac56e5a

* Decouple dms from CPCV2 * Update tests

Add docstrings, fix import, and update changelog

4fca092

chris-clem requested a review from akihironitta November 27, 2020 10:48

akihironitta approved these changes Nov 27, 2020

View reviewed changes

akihironitta suggested changes Dec 5, 2020

View reviewed changes

chris-clem and others added 3 commits December 15, 2020 17:10

Update transforms

4bc4d63

Fix a typo/copy paste error (Lightning-Universe#415)

07315ae

chris-clem requested a review from akihironitta January 4, 2021 12:35

akihironitta reviewed Jan 7, 2021

View reviewed changes

tests/models/test_scripts.py Outdated Show resolved Hide resolved

Apply suggestions from code review

cecb452

akihironitta self-requested a review January 7, 2021 10:44

akihironitta approved these changes Jan 7, 2021

View reviewed changes

chris-clem and others added 3 commits January 7, 2021 16:03

Merge branch 'master' into feature/401_dcgan

e460f09

Fix test_dcgan

0a238c1

Merge branch 'master' into feature/401_dcgan

9058db1

Borda force-pushed the master branch from 8ea02ab to c4dbbfd Compare January 15, 2021 22:44

akihironitta self-assigned this Jan 17, 2021

chris-clem and others added 2 commits January 17, 2021 13:48

Merge branch 'master' into feature/401_dcgan

2c0d4d0

Apply yapf

01fea8a

akihironitta approved these changes Jan 18, 2021

View reviewed changes

akihironitta added the ready label Jan 18, 2021

Borda reviewed Jan 18, 2021

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

Apply suggestions from code review

e2f6f46

Borda merged commit 056f836 into Lightning-Universe:master Jan 18, 2021

AE & GANs automation moved this from in Review to Done Jan 18, 2021

Borda added this to the v0.3 milestone Jan 18, 2021

This was referenced Mar 13, 2021

[tune](deps): Bump pytorch-lightning-bolts from 0.2.5 to 0.3.0 in /python/requirements suquark/ray#8

Closed

[tune](deps): Bump pytorch-lightning-bolts from 0.2.5 to 0.3.0 in /python/requirements sven1977/ray#8

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add DCGAN module #403

Add DCGAN module #403

chris-clem commented Nov 24, 2020 •

edited

Loading

codecov bot commented Nov 24, 2020 •

edited

Loading

chris-clem commented Nov 27, 2020

akihironitta commented Nov 27, 2020

akihironitta left a comment

akihironitta left a comment

chris-clem commented Nov 27, 2020

akihironitta commented Nov 27, 2020 •

edited

Loading

akihironitta left a comment

chris-clem commented Dec 9, 2020

chris-clem commented Jan 4, 2021

ananyahjha93 commented Jan 4, 2021

akihironitta commented Jan 5, 2021

ananyahjha93 commented Jan 7, 2021

akihironitta left a comment

akihironitta commented Jan 17, 2021

chris-clem commented Jan 17, 2021

akihironitta left a comment

Borda commented Jan 18, 2021

chris-clem commented Jan 18, 2021

Borda commented Jan 18, 2021

Add DCGAN module #403

Add DCGAN module #403

Conversation

chris-clem commented Nov 24, 2020 • edited Loading

What does this PR do?

Before submitting

PR review

Did you have fun?

codecov bot commented Nov 24, 2020 • edited Loading

Codecov Report

chris-clem commented Nov 27, 2020

akihironitta commented Nov 27, 2020

akihironitta left a comment

Choose a reason for hiding this comment

akihironitta left a comment

Choose a reason for hiding this comment

chris-clem commented Nov 27, 2020

akihironitta commented Nov 27, 2020 • edited Loading

akihironitta left a comment

Choose a reason for hiding this comment

chris-clem commented Dec 9, 2020

chris-clem commented Jan 4, 2021

ananyahjha93 commented Jan 4, 2021

akihironitta commented Jan 5, 2021

ananyahjha93 commented Jan 7, 2021

akihironitta left a comment

Choose a reason for hiding this comment

akihironitta commented Jan 17, 2021

chris-clem commented Jan 17, 2021

akihironitta left a comment

Choose a reason for hiding this comment

Borda commented Jan 18, 2021

chris-clem commented Jan 18, 2021

Borda commented Jan 18, 2021

chris-clem commented Nov 24, 2020 •

edited

Loading

codecov bot commented Nov 24, 2020 •

edited

Loading

akihironitta commented Nov 27, 2020 •

edited

Loading