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
Merge alias sampling / QROM state prep (#621) into the SOSSA branch
Brings feature/cyr/sossa up to yingrongchen-alias-sampling-qrom-state-prep
at 3e6053e, so #539 can be retargeted onto #621 and reviewed as the
incremental SOSSA diff rather than as SOSSA plus all of alias sampling.
The previous merge (ca88541) captured 4ab6221; the alias branch has
moved 42 commits since, including two merges of main.
Two conflicts, both add/add registration lists, both resolved as unions:
- controlled_circuit_mapper/__init__.py: each side added a different mapper
import and its __all__ entries. Kept both; __all__ is exactly the nine
imported names.
- registry.py: each side registered a different mapper. Kept both, preserving
each side's relative order, since registration order is load-bearing here
(DensePureStatePreparation must precede SparseIsometryStatePreparation).
Two further breakages had NO conflict markers and would have shipped silently
had the merge been trusted at face value:
- PhaseGradient.qs: #621 deleted MakePhaseGradientAncillaPrep in ef8f189
under a "Dead code" heading. It is dead on that branch but live on this one:
sossa_mapper.get_ancilla_prep_op calls it, and SOSSAWalk.qs imports it. Git
took the deletion cleanly because this side never touched that region.
Restored verbatim, with a note recording why it must stay.
- PrepSelPrep.qs: #621 changed PrepSelPrep's 4th parameter from
ancillaRegister to prepareRegister and added numSelectQubits, because an
alias-sampling PREPARE register is wider than the select index. PSPWalk on
this side still called it with four arguments. PSPWalk keeps its own arity,
since MakeControlledPSPWalkOp and TestPSPWalkOnBasisState both depend on it;
only its two internal calls pass the new argument, as
Length(ancillaRegister), which is what merge-base computed as
numAncillaQubits and so preserves the previous semantics exactly.
Verified: Q# project compiles; all 57 distinct QSHARP_UTILS.<ns>.<name>
references from Python resolve against the compiled context, with the checker
calibrated in both directions; ruff check and ruff format clean over 326 files.
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copy file name to clipboardExpand all lines: INSTALL.md
+25Lines changed: 25 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -130,6 +130,31 @@ Alternatively, click the green button in the bottom-left corner of VS Code and s
130
130
131
131
After the initial build, restart VS Code and reopen in the container to ensure the Python virtual environment is properly loaded.
132
132
133
+
### Step 4: Develop
134
+
135
+
The dev container installs the Python package in editable mode, so changes to pure Python files are available immediately. After changing pybind11 sources, rebuild the Python package:
0 commit comments