Conflict-resolved resolution-invariant-readout (review before updating #719)#7
Closed
JoshBeacom wants to merge 1 commit into
Closed
Conflict-resolved resolution-invariant-readout (review before updating #719)#7JoshBeacom wants to merge 1 commit into
JoshBeacom wants to merge 1 commit into
Conversation
- ResolutionInvariantReadout maps field outputs to scalar QoIs via spatial reduction (mean/integral) and a linear/MLP projection head - Integrated as optional readout parameter on FNO with in_channels validation; OTNO guards against readout use due to incompatible output shape - Two gallery examples: Darcy scalar QoI and 3-D Poisson-Boltzmann screened energy demonstrating resolution invariance
JoshBeacom
force-pushed
the
resolution-invariant-readout-merged
branch
from
55c4815 to
a0e643f
Compare
Owner
Author
|
Closing — the conflict-resolved commit has been published to upstream neuraloperator#719. This draft was only a private review surface. |
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
1 participant
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.
Review-only draft — please don't merge this PR. It exists so you can review the final commit privately before it updates the public upstream PR.
The conflict-resolved
resolution-invariant-readoutfeature, as a single clean commit authored by you, ready to update upstream PRneuraloperator/neuraloperator#719once you approve.State of neuraloperator#719 right now
Restored to its pre-fix commit
1ff94b0— it again shows the original conflict the maintainer flagged (CONFLICTING). Nothing from this resolution is on neuraloperator#719.What this is
One commit on top of current
main, containing the feature with the merge conflict resolved.neuralop/models/tests/test_otno.py— bothmainand the feature appended a new top-level test aftertest_otno_output_shape. Resolved by keeping both (independent tests):test_otno_rejects_readout(feature) — OTNO raisesValueErroron areadoutargtest_otno_group_norm(main) — OTNO honors a customnorm_groupsneuralop/models/fno.pyandneuralop/models/otno.pyintegrate cleanly — main'snorm_groups/conv_bias_kerneland the feature'sreadoutparameter/validation/forward path occupy disjoint regions and all survive intact.Verification (CPU, torch 2.11)
test_otno.py+test_fno_readout.py+test_fno.py→ 409 passedNext step — only after you approve
To publish to neuraloperator#719, this single commit is force-pushed to its branch, updating neuraloperator#719 to the mergeable state. I'll run it only on your go-ahead.