feat: converter = None as the sentinel#996
Merged
patrick-kidger merged 2 commits intopatrick-kidger:devfrom Apr 14, 2025
Merged
feat: converter = None as the sentinel#996patrick-kidger merged 2 commits intopatrick-kidger:devfrom
patrick-kidger merged 2 commits intopatrick-kidger:devfrom
Conversation
Owner
|
Looks reasonable to me! Let's get #994 in and then this one. |
nstarman
force-pushed
the
module-faster-convert
branch
from
7569e8f to
20158eb
Compare
Contributor
Author
|
@patrick-kidger. Ready! |
Owner
patrick-kidger
left a comment
patrick-kidger
left a comment
There was a problem hiding this comment.
One comment only, but otherwise LGTM!
equinox/_module.py
Outdated
| for f in dataclasses.fields(cls): | ||
| if f.name not in cls.__init__.__annotations__: | ||
| continue # Odd behaviour, so skip. | ||
|
|
Owner
There was a problem hiding this comment.
Actually, I think I'm noticing a bug in the existing code here -- I think we should only be running all of this if has_dataclass_init? Worth fixing up here, if you agree?
Contributor
Author
There was a problem hiding this comment.
Sure! Then the check becomes if not f.init: continue.
1. Easier for users to access instead of a private sentinel. 2. simplifies later performance-related logic changes. 3. Broadens support to allow `dataclasses.field(metadata=dict(converter=None))`, not just `eqx.field`. Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
nstarman
force-pushed
the
module-faster-convert
branch
from
20158eb to
de28410
Compare
equinox/_module.py
Outdated
Comment on lines
+327
to
+325
| cls.__init__.__annotations__[f.name] = converter_annotation | ||
| cls.__init__.__annotations__[f.name] = converter_annotation |
Owner
There was a problem hiding this comment.
I think this is an unintentional indent? (Or am I maybe misunderstanding the logic here?)
Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
nstarman
force-pushed
the
module-faster-convert
branch
from
de28410 to
7972df3
Compare
Owner
|
Okay, great! All looks good me, so merged. :) Heads-up for other PRs in the near future,I've just spun up a |
patrick-kidger
pushed a commit
that referenced
this pull request
Apr 21, 2025
* feat: converter = None as the sentinel 1. Easier for users to access instead of a private sentinel. 2. simplifies later performance-related logic changes. 3. Broadens support to allow `dataclasses.field(metadata=dict(converter=None))`, not just `eqx.field`. Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> * refactor: only set annotations if datclass init Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> --------- Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
patrick-kidger
pushed a commit
that referenced
this pull request
May 16, 2025
* feat: converter = None as the sentinel 1. Easier for users to access instead of a private sentinel. 2. simplifies later performance-related logic changes. 3. Broadens support to allow `dataclasses.field(metadata=dict(converter=None))`, not just `eqx.field`. Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> * refactor: only set annotations if datclass init Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> --------- Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
patrick-kidger
pushed a commit
that referenced
this pull request
Jun 16, 2025
* feat: converter = None as the sentinel 1. Easier for users to access instead of a private sentinel. 2. simplifies later performance-related logic changes. 3. Broadens support to allow `dataclasses.field(metadata=dict(converter=None))`, not just `eqx.field`. Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> * refactor: only set annotations if datclass init Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> --------- Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
patrick-kidger
pushed a commit
that referenced
this pull request
Jul 7, 2025
* feat: converter = None as the sentinel 1. Easier for users to access instead of a private sentinel. 2. simplifies later performance-related logic changes. 3. Broadens support to allow `dataclasses.field(metadata=dict(converter=None))`, not just `eqx.field`. Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> * refactor: only set annotations if datclass init Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com> --------- Signed-off-by: Nathaniel Starkman <nstarman@users.noreply.github.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
dataclasses.field(metadata=dict(converter=None)), not justeqx.field.Follow up to #994.