Repository navigation
Reconcile parallel inference with main for the optimization stack - #150
Merged
Merged
Conversation
This was referenced Oct 26, 2026
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
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.
Daniel's parallel-inference branch and the optimization PR stack diverged from main, leaving a tracer import conflict and no reviewable base PR to bring that work into main. This PR supplies that shared base; it includes Daniel's existing parallel inference/checking implementation and the already-reviewed deterministic sampling change from #139.
Merge current main
ed54c7dinto Daniel's tip122e769on a separate branch. Preserve both sides' module-path/device initialization behavior and Daniel's interpreter-shutdown guard. The conflict resolution changes only tracer import ordering and formatting required by the configured hooks; no new inference algorithm or behavior is introduced. Daniel's original branch is unchanged.Dependencies and review order:
After a parent PR lands in main, retarget its direct children to main before merging them; repeat through the stack. The existing PRs retain their feature boundaries and signed history. #140 is moved off the already-merged #139 branch. Merge commits are preferable for this stack because they preserve ancestry; squash/rebase merging a parent requires refreshing its descendants again.
Validation on 2026-10-26:
ed54c7d; all stack composition merges are clean.config.py,proxy_wrapper/hash.py, andproxy_wrapper/subclass.py. No checks were disabled.This is integration/correctness work, not a new performance measurement. Earlier PR performance numbers retain their original revisions and limitations. Reproduction logs and exact composed revisions are retained in
outputs/conflict-resolution-20261026/in the experiment checkout; no traces or machine-specific artifacts are committed.