create setup and remove @nn.compact #1403
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamgayoso
requested changes
Mar 4, 2022
scvi/module/_jaxvae.py
Outdated
| self.dense2 = Dense(self.n_hidden) | ||
| self.dense3 = Dense(self.n_hidden) | ||
| self.dense4 = Dense(self.n_input) | ||
|
|
||
| def __call__(self, z: jnp.ndarray, batch: jnp.ndarray, is_training: bool): | ||
| disp = self.param( | ||
| "disp", lambda rng, shape: jax.random.normal(rng, shape), (self.n_input, 1) | ||
| ) | ||
| is_training = nn.merge_param("is_training", self.is_training, is_training) |
There was a problem hiding this comment.
we can get rid of these lines and move all the layers into setup (including batch norm and dropout).
scvi/module/_jaxvae.py
Outdated
| @@ -104,7 +114,9 @@ class JaxVAE(nn.Module): | |||
| gene_likelihood: str = "nb" | |||
| eps: float = 1e-8 | |||
|
|
|||
| @nn.compact | |||
| def setup(self): | |||
| pass | |||
Codecov Report
@@ Coverage Diff @@
## master #1403 +/- ##
==========================================
+ Coverage 90.99% 91.01% +0.01%
==========================================
Files 111 111
Lines 8614 8633 +19
==========================================
+ Hits 7838 7857 +19
Misses 776 776
Continue to review full report at Codecov.
|
adamgayoso
approved these changes
Mar 7, 2022
meeseeksmachine
pushed a commit
to meeseeksmachine/scvi-tools
that referenced
this pull request
Mar 7, 2022
adamgayoso
pushed a commit
that referenced
this pull request
Mar 7, 2022
Co-authored-by: mjayasur <[email protected]>
nrclaudio
pushed a commit
to nrclaudio/scvi-tools-tune
that referenced
this pull request
Jun 21, 2022
* create setup and remove @nn.compact * Add dummy setup * add to all * fixes * move param * fix * add release note Co-authored-by: adamgayoso <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1402