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

Modularize AE & VAE #196

Merged
merged 14 commits into from Sep 11, 2020
Merged

Conversation

nateraw
Copy link
Contributor

@nateraw nateraw commented Sep 10, 2020

AE only working on dms with one channel. Also the use of datamodule is confusing, so tryin to clear it up. WIP for now, pls ignore the sketchiness until I mark this as ready 😄

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 to update the docs?
  • Did you write any new necessary tests?

What does this PR do?

Fixes # (issue).

PR review

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 🙃

@pep8speaks
Copy link

pep8speaks commented Sep 10, 2020

Hello @nateraw! Thanks for updating this PR.

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2020-09-10 23:13:07 UTC

@mergify mergify bot requested a review from Borda September 10, 2020 19:59
Copy link
Contributor Author

@nateraw nateraw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My notes

@Borda Borda added fix fixing issues... enhancement New feature or request labels Sep 10, 2020
@codecov
Copy link

codecov bot commented Sep 10, 2020

Codecov Report

Merging #196 into master will decrease coverage by 0.42%.
The diff coverage is 80.59%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #196      +/-   ##
==========================================
- Coverage   89.98%   89.55%   -0.43%     
==========================================
  Files          74       74              
  Lines        3284     3284              
==========================================
- Hits         2955     2941      -14     
- Misses        329      343      +14     
Flag Coverage Δ
#unittests 89.55% <80.59%> (-0.43%) ⬇️

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

Impacted Files Coverage Δ
...ts/models/autoencoders/basic_ae/basic_ae_module.py 86.76% <75.86%> (-13.24%) ⬇️
.../models/autoencoders/basic_vae/basic_vae_module.py 91.89% <79.31%> (-0.61%) ⬇️
pl_bolts/models/__init__.py 100.00% <100.00%> (ø)
...l_bolts/models/autoencoders/basic_ae/components.py 100.00% <100.00%> (ø)
pl_bolts/models/self_supervised/cpc/cpc_module.py 74.61% <0.00%> (-3.08%) ⬇️
pl_bolts/models/self_supervised/cpc/networks.py 93.91% <0.00%> (-0.87%) ⬇️

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 1913629...7fb2efe. Read the comment docs.

@nateraw nateraw marked this pull request as ready for review September 10, 2020 21:59
decoder = Decoder(hidden_dim, latent_dim, w, h, c)
# c, h, w = self.img_dim
decoder = Decoder(
hidden_dim, latent_dim, self.hparams.input_width, self.hparams.input_height, self.hparams.input_channels
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep this order if it is everywhere else

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be c, h, w right? I started switching over to that from 'c, w, h', which is wrong, if I'm not mistaken? (that's what I kept seeing in this file, but I believe its mixed up)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just see that the order is different in several places...

pl_bolts/models/autoencoders/basic_ae/basic_ae_module.py Outdated Show resolved Hide resolved
dm_cls = STL10DataModule
elif script_args.dataset == "imagenet":
dm_cls = ImagenetDataModule

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's add else and raise an error?

Co-authored-by: Jirka Borovec <Borda@users.noreply.github.com>
@williamFalcon williamFalcon merged commit 752c433 into Lightning-Universe:master Sep 11, 2020
@nateraw nateraw added the datamodule Anything related to datamodules label Sep 11, 2020
@Borda Borda added this to Done in AE & GANs Nov 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
datamodule Anything related to datamodules enhancement New feature or request fix fixing issues...
Projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants