You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Reconcile main's arena-allocator migration (#247, "remove global_allocator
in zk-alloc") with the WHIR split-eq refactor on this branch.
Conflicts resolved:
- quotient_gkr/layers.rs: materialise_in_full keeps the branch's pub(super)
visibility and adopts main's ArenaVec return type.
- whir/utils.rs: keep the split-eq LSB-cols FFT-prep layout but write into an
ArenaVec via par_fill (main's allocator) instead of par_map_collect's Vec;
drop the now-unused log2_strict_usize import.
- whir/open.rs: keep the branch's final_round / open_merkle_tree_at_challenges
refactor and SVO sumcheck; drop main's combine_statement (deleted on this
branch). Propagate main's ArenaVec migration through the new SVO helpers
(SumcheckSingle.weights, lsb_fold, fold_by_tensor, build_post_svo_weights)
to avoid Vec<->ArenaVec copies in the prover hot path.
Auto-merges verified coherent: eq_mle.rs composes the branch's
compute_eval_eq_base_batched rename/unpacked-output with main's ArenaVec
buffers; commit.rs changes are in disjoint methods.
cargo fmt / clippy clean; cargo testall (release) green.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
0 commit comments