[nnx] Rng Variable tags #3807
Merged
[nnx] Rng Variable tags #3807
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
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
cgarciae
changed the title
cgarciae
force-pushed
the
nnx-rng-tags
branch
6 times, most recently
from
3a66387
to
9869b79
Compare
cgarciae
force-pushed
the
nnx-graph-non-str-keys
branch
from
f08c285
to
25c0e68
Compare
cgarciae
force-pushed
the
nnx-graph-non-str-keys
branch
from
25c0e68
to
1d5f718
Compare
superbobry
reviewed
Apr 2, 2024
|
|
||
| def __call__(self, path: PathParts, x: tp.Any): | ||
| return self.str_key in path | ||
| return isinstance(x, _HasTag) and x.tag == self.tag |
There was a problem hiding this comment.
I think you can simply use hasattr() here?
| class AtPath: | ||
| str_key: str | ||
| class WithTag: | ||
| tag: str | ||
|
|
||
| def __call__(self, path: PathParts, x: tp.Any): |
There was a problem hiding this comment.
mypy will not type check this unless you add -> bool IIRC.
|
|
||
| def __contains__(self, name: tp.Any) -> bool: | ||
| return name in self._rngs | ||
| return name in vars(self) |
There was a problem hiding this comment.
Do you want to special-case "_graph_node__state" here for consistency with other methods?
|
|
||
| def __len__(self) -> int: | ||
| return len(self._rngs) | ||
| return len(vars(self)) - 1 |
There was a problem hiding this comment.
Is "_graph_node__state" always present? If not, you should probably do - ('_graph_node__state' in vars(self)).
|
|
||
| def replace(self, **kwargs: tp.Union[int, jax.Array, RngStream]) -> 'Rngs': | ||
| rngs: dict[str, tp.Any] = self._rngs.copy() | ||
| rngs: dict[str, tp.Any] = vars(self).copy() | ||
| del rngs['_graph_node__state'] |
There was a problem hiding this comment.
It's unfortunate that the implementation detail of GraphNode leaks into the subclasses. Can we do better?
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.
What does this PR do?
This PR adds the necessary changes so we can filter
RngStateVariables based on the stream name usingFilters, this allows you to manage RNG state a regular graph state but using the previous name-based filter convention.Changes
RngKeyandRngCountVariable types that inherit fromRngState.RngKeyis expected to have atag: strmetadata attribute.RngStream.keyis now aRngKeyandRngStream.countis now aRngCount.RngssetsRngKey.tagas the stream's name.strfilters now create aWithTagfilter that selects Variables with atagattribute that matches that string.Rngs._rngs,RngStreamsare now stored as attributes ofRngs.RngStream.make_rngto__call__.Rngs.__getattr__andRngs.__getitem__now returns aRngStream.