Make Zimtohrli python version easier to jit. #128
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
Changes: * Make the `Cam` class static from the point of view of jax. To allow jitting, the _hz_freqs array should not be a jax array, because depending on the values of the hyperparameters, the array shape should be different, making it impossible to jit. When attempting to jit the previous version of the code, creating that array under a jit context would fail. -> This requires adjusting the test tolerance from 1e-7 to 1e-5. The equivalent test in c++ uses 1e-2. * For `Channels` and `Signals` class, mark which fields are data_fields vs. meta_fields (that can be used for JIT cache) * Remove default arguments that are jnp.array by np.array * Make the `Masking` class static and remove the `jit` over `non_masked_energy` `self` being the first argument makes it unsuitable for jitting. * Added a test to check that: - Jitting works - Results are the same with/without jitting.
|
Great, thank you! I enabled merge-as-soon-as-tests-pass. |
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.
Changes:
Make the
Camclass static from the point of view of jax. To allow jitting, the _hz_freqs array should not be a jax array, because depending on the values of the hyperparameters, the array shape should be different, making it impossible to jit. When attempting to jit the previous version of the code, creating that array under a jit context would fail. -> This requires adjusting the test tolerance from 1e-7 to 1e-5. The equivalent test in c++ uses 1e-2.For
ChannelsandSignalsclass, mark which fields are data_fields vs. meta_fields (that can be used for JIT cache)Remove default arguments that are jnp.array by np.array
Make the
Maskingclass static and remove thejitovernon_masked_energyselfbeing the first argument makes it unsuitable for jitting.Added a test to check that: