-
Notifications
You must be signed in to change notification settings - Fork 795
implement functional init/apply and bind. #1078
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -290,7 +290,14 @@ def invalidate(self): | |
| """Invalidates the Scope.""" | ||
| self._invalid = True | ||
|
|
||
| def variables(self) -> Collection: | ||
| def mutable_variables(self) -> VariableDict: | ||
| """Returns an immutable copy of the mutable variables belonging to this Scope.""" | ||
| self._populate_collections() | ||
| xs = {k: v for k, v in self._variables.items() | ||
| if in_filter(self.mutable, k)} | ||
| return freeze(xs) | ||
|
|
||
| def variables(self) -> VariableDict: | ||
| """Returns an immutable copy of the variables belonging to this Scope.""" | ||
| self._populate_collections() | ||
| return freeze(self._variables) | ||
|
|
@@ -576,6 +583,29 @@ def _unfreeze_variables(variables, mutable): | |
| return new_variables | ||
|
|
||
|
|
||
| def bind(variables: VariableDict, | ||
| rngs: Optional[RNGSequences] = None, | ||
| mutable: CollectionFilter = False): | ||
| """Bind variables and rngs to a new ``Scope``. | ||
|
|
||
| bind provides a ``Scope`` instance without transforming a function | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: ''bind'' (i.e. backticks) |
||
| with ``apply``. This is particulary useful for debugging and | ||
| interactive use cases like notebooks where a function would limit | ||
| the ability split up code into different cells. | ||
|
|
||
| a ``Scope`` instance is a stateful object. Note that idiomatic JAX is functional | ||
| and therefore a ``Scope` does not mix well well with vanilla JAX APIs. Therefore, | ||
| we recommend using ``apply`` when code should be reusable and compatible | ||
| across the JAX software ecosystem. | ||
| """ | ||
| if not _is_valid_variables(variables): | ||
| raise errors.ApplyScopeInvalidVariablesError() | ||
| if rngs is not None and not _is_valid_rngs(rngs): | ||
| raise errors.ApplyScopeInvalidRngsError() | ||
| new_variables = _unfreeze_variables(variables, mutable) | ||
| return Scope(new_variables, rngs=rngs, mutable=mutable) | ||
|
|
||
|
|
||
| def apply(fn: Callable[..., Any], | ||
| mutable: CollectionFilter = False) -> Callable[..., Any]: | ||
| """Functionalize a `Scope` function. | ||
|
|
@@ -593,19 +623,10 @@ def wrapper(variables: VariableDict, | |
| *args, | ||
| rngs: Optional[RNGSequences] = None, | ||
| **kwargs) -> Union[Any, Tuple[Any, VariableDict]]: | ||
|
|
||
| if not _is_valid_variables(variables): | ||
| raise errors.ApplyScopeInvalidVariablesError() | ||
| if rngs is not None and not _is_valid_rngs(rngs): | ||
| raise errors.ApplyScopeInvalidRngsError() | ||
| new_variables = _unfreeze_variables(variables, mutable) | ||
| with Scope(new_variables, rngs=rngs, mutable=mutable).temporary() as root: | ||
| with bind(variables, rngs=rngs, mutable=mutable).temporary() as root: | ||
| y = fn(root, *args, **kwargs) | ||
| if mutable is not False: | ||
| mutated_variables = {k: v | ||
| for k, v in new_variables.items() | ||
| if in_filter(mutable, k)} | ||
| return y, freeze(mutated_variables) | ||
| return y, root.mutable_variables() | ||
| else: | ||
| return y | ||
|
|
||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious why you ported this example to use
nn.apply?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not essential but I think it's nice to have at least one usage in the examples. Here we avoid passing custom methods and a double apply
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yes I now fully agree that this is a good idea. I always disliked the
methodargument toapply... (And if we really want to we /could/ get rid of it now... But not sure)