Fix issues with ControlFlowOp displays #10842
Merged
Conversation
This file contains 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
…rra into fix_flow_cregbundle
jakelishman
reviewed
Sep 22, 2023
|
1859210 fixes a bug in the I think tracking this down into that code is beyond the scope of this PR. |
|
is this |
|
Luciano: it is as of the resolution of #10842 (comment) - originally it had some extra bits in it. I can work through to merge this today if you'll accept it for 0.25.2 on Monday - I've heard from a couple of people that the bug being fixed here would be important for them. |
jakelishman
approved these changes
Sep 29, 2023
jakelishman
added
the
stable backport potential
mergify bot
pushed a commit
that referenced
this pull request
Sep 29, 2023
* Fix override bug and testing * Preliminary changes * First attempts * Work on x_index * Early testing * Cleanup getattr * Complete adding exprs * First fix for cregbundle control flow * Finish basic cregbundle mods * Finish all cregbundle except wire_map bug * Move carg check to circuit_vis and change text tests to circuit_drawer * Move mpl tests to use circuit_drawer and update images for cregbundle changes * Change mpl tests to circuit_drawer * Fix flow_wire_map and tranpile bug * Final cleanup * Missing outputs on mpl tests * Fix output * Restore tests and move carg check to text and mpl and make circuit * Prepare final cregbundle fix * Update ref images * Fixing refs * Update refs again * Final mods * Incorporate mtreinish changes * Add reno * Fix if_else_op test * Lint * Fix target == expr bug in text * Review fixes and outer_circuit, wire_map fixes * Remove png * Minor changes * Fix for_loop measure placement bug --------- Co-authored-by: Jake Lishman <jake.lishman@ibm.com> (cherry picked from commit 404df43) # Conflicts: # qiskit/visualization/circuit/text.py # test/python/visualization/test_circuit_text_drawer.py # test/visual/mpl/circuit/test_circuit_matplotlib_drawer.py
jakelishman
added a commit
that referenced
this pull request
Sep 29, 2023
Cherry-picked version of only the MPL-drawer changes from the given commit, since the text-drawer support for dynamic circuits is not in the old version. (cherry picked from commit 404df43) Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
jakelishman
added a commit
that referenced
this pull request
Sep 29, 2023
Cherry-picked version of only the MPL-drawer changes from the given commit, since the text-drawer support for dynamic circuits is not in the old version. (cherry picked from commit 404df43) Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Sep 29, 2023
Cherry-picked version of only the MPL-drawer changes from the given commit, since the text-drawer support for dynamic circuits is not in the old version. (cherry picked from commit 404df43) Co-authored-by: Edwin Navarro <enavarro@comcast.net> Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
rupeshknn
pushed a commit
to rupeshknn/qiskit
that referenced
this pull request
Oct 9, 2023
* Fix override bug and testing * Preliminary changes * First attempts * Work on x_index * Early testing * Cleanup getattr * Complete adding exprs * First fix for cregbundle control flow * Finish basic cregbundle mods * Finish all cregbundle except wire_map bug * Move carg check to circuit_vis and change text tests to circuit_drawer * Move mpl tests to use circuit_drawer and update images for cregbundle changes * Change mpl tests to circuit_drawer * Fix flow_wire_map and tranpile bug * Final cleanup * Missing outputs on mpl tests * Fix output * Restore tests and move carg check to text and mpl and make circuit * Prepare final cregbundle fix * Update ref images * Fixing refs * Update refs again * Final mods * Incorporate mtreinish changes * Add reno * Fix if_else_op test * Lint * Fix target == expr bug in text * Review fixes and outer_circuit, wire_map fixes * Remove png * Minor changes * Fix for_loop measure placement bug --------- Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
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.
Summary
Fixes issues with use of
cregbundleoption when displayingControlFlowOpsand fixes #10601Details and comments
This PR addresses the following issues with display of
ControlFlowOpswith thecregbundleoptionControlFlowOpwas part of a circuit being displayed in themplandtextcircuit drawers, thecregbundleoption was always being set to False, no matter what the user entered.Clbit's normally force thecregbundleoption to False, but if the gate was inside aControlFlowOp, thecregbundleoption was not changing.Per discussions with @jakelishman, this PR also incorporates the fixes to #10601, previously done by @mtreinish in #10602.
In doing testing, it was also noted that the
encodingoption that is used by thetextdrawer, cannot be entered in thecircuit_drawerfunction or inQuantumCircuit.drawmeaning users would generally not have access to that option.There were several other cleanup and efficiency changes.
Fix #10601
Close #10602 (obsolete)