-
Notifications
You must be signed in to change notification settings - Fork 118
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Track classical register indices for measurements #1006
feat: Track classical register indices for measurements #1006
Conversation
… the instruction level instead of only if add_measure is called.
def test_from_ir_round_trip_transformation_with_targeted_measurements(): | ||
circuit = ( | ||
Circuit() | ||
.h(0) | ||
.cnot(0, 1) | ||
.add_instruction(Instruction(Measure(index=2), 1)) | ||
.add_instruction(Instruction(Measure(index=1), 2)) | ||
.add_instruction(Instruction(Measure(index=0), 0)) | ||
) | ||
ir = OpenQasmProgram( | ||
source="\n".join( | ||
[ | ||
"OPENQASM 3.0;", | ||
"bit[3] b;", | ||
"qubit[3] q;", | ||
"h q[0];", | ||
"cnot q[0], q[1];", | ||
"b[2] = measure q[1];", | ||
"b[1] = measure q[2];", | ||
"b[0] = measure q[0];", | ||
] | ||
), | ||
inputs={}, | ||
) | ||
|
||
assert Circuit.from_ir(ir) == Circuit.from_ir(circuit.to_ir("OPENQASM")) | ||
assert circuit.to_ir("OPENQASM") == Circuit.from_ir(ir).to_ir("OPENQASM") | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How to get around breaking dependencies:
- Remove this test from this PR and revert the versions in
setup.py
andtox.ini
- Merge this PR
- Merge feat: Track classical register indices for measurements amazon-braket-default-simulator-python#266
- Create and merge new PR that reintroduces this test and bumps the default simulator version in
setup.py
to latest release
def test_from_ir_round_trip_transformation_with_targeted_measurements(): | |
circuit = ( | |
Circuit() | |
.h(0) | |
.cnot(0, 1) | |
.add_instruction(Instruction(Measure(index=2), 1)) | |
.add_instruction(Instruction(Measure(index=1), 2)) | |
.add_instruction(Instruction(Measure(index=0), 0)) | |
) | |
ir = OpenQasmProgram( | |
source="\n".join( | |
[ | |
"OPENQASM 3.0;", | |
"bit[3] b;", | |
"qubit[3] q;", | |
"h q[0];", | |
"cnot q[0], q[1];", | |
"b[2] = measure q[1];", | |
"b[1] = measure q[2];", | |
"b[0] = measure q[0];", | |
] | |
), | |
inputs={}, | |
) | |
assert Circuit.from_ir(ir) == Circuit.from_ir(circuit.to_ir("OPENQASM")) | |
assert circuit.to_ir("OPENQASM") == Circuit.from_ir(ir).to_ir("OPENQASM") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've removed the test and reverted the targets for the default simulator version in the setup.py and tox.ini files in the following commit: 7b3ebf3 !
Issue #, if available:
#1004
Description of changes:
Update the BraketProgramContext to extend the changes introduced in amazon-braket/amazon-braket-default-simulator-python#266, which provide a classical register index to the BraketProgramContext
add_measure
method when a measurement assignment is used in an OpenQASM program (e.g.b[1] = measure q[1];
). This allows translations to and from Braket BDK Circuits and OpenQASM to be consistent with regards to classical register indices used in measurement assignments as currently, these indices are discarded entirely.Additionally, updating the
_measure_targets
array in theCircuit
object was moved to theadd_instruction
method from the_add_measure
method. This is because users of the Circuit class are able to add measurement instructions via theadd_instruction
method, but_measure_targets
will not be updated to reflect qubits used in the measurement. This results in incorrect behavior when usingto_ir
to take a circuit with measurements added viaadd_instruction
method calls to OpenQASM asto_ir
will check the_measure_targets
variable to see if any qubits are measured, see that the list is empty, and apply a measurement to all the qubits in the circuit, including those already measured via the originaladd_instruction
method calls.Testing done:
A round trip test was added to verify that classical register assignments are persisted when going from BDK Circuit to OpenQASM and back to BDK Circuit via the
to_ir
andfrom_ir
methods; this is similarly checked when going from OpenQASM to BDK Circuit back to OpenQASM.Merge Checklist
Put an
x
in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your pull request.General
Tests
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.