-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Bug fix in ElidePermutations #13186
Merged
mtreinish
merged 2 commits into
Qiskit:main
from
alexanderivrii:elide-pemutation-bugfix
Sep 19, 2024
Merged
Bug fix in ElidePermutations #13186
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
5 changes: 5 additions & 0 deletions
5
releasenotes/notes/fix-elide-permutations-1b9e1d10c3abb2a4.yaml
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
fixes: | ||
- | | ||
Fixed a bug in the transpiler pass :class:`~.ElidePermutations` where the | ||
qubit mapping was not updated correctly in the presence of :class:`.PermutationGate`\s. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,6 +207,37 @@ def test_permutation_in_middle(self): | |
res = self.swap_pass(qc) | ||
self.assertEqual(res, expected) | ||
|
||
def test_partial_permutation_in_middle(self): | ||
"""Test with a permutation gate in the middle of a circuit, | ||
with the permutation gate defined only on a subset of qubits. | ||
""" | ||
qc = QuantumCircuit(5) | ||
qc.cx(0, 1) | ||
qc.append(PermutationGate([1, 2, 0]), [0, 2, 4]) | ||
qc.cx(2, 3) | ||
|
||
# The permutation corresponding to the permutation gate maps | ||
# 2 -> 0, 4 -> 2, 0 -> 4, and 1 -> 1, 3 -> 3. | ||
# Instead of the permutation gate, we can relabel the qubits | ||
# 0 -> 2, 1 -> 1, 2 -> 4, 3 -> 3, 4 -> 2. | ||
# Hence cx(2, 3) becomes cx(4, 3). | ||
expected = QuantumCircuit(5) | ||
expected.cx(0, 1) | ||
expected.cx(4, 3) | ||
|
||
pass_ = ElidePermutations() | ||
res = pass_(qc) | ||
|
||
# Make sure that the pass removes the permutation gate and remaps | ||
# the following gate | ||
self.assertEqual(res, expected) | ||
|
||
# Make sure that the transpiled circuit *with* the final permutation | ||
# is equivalent to the original circuit | ||
perm = pass_.property_set["virtual_permutation_layout"].to_permutation(qc.qubits) | ||
res.append(PermutationGate(perm), [0, 1, 2, 3, 4]) | ||
self.assertEqual(Operator(res), Operator(qc)) | ||
Comment on lines
+237
to
+239
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. TBH, I'm surprised you didn't just use |
||
|
||
def test_permutation_at_beginning(self): | ||
"""Test permutation in beginning of bell is elided.""" | ||
qc = QuantumCircuit(3, 3) | ||
|
Oops, something went wrong.
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.
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.
Should we add some assertions on the permutation tracking too to make sure it's correct and reverses to the original circuit?
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.
This is a good idea. I have extended the test in 6791002. Do you think it's a good idea to add more "random circuits" tests, with swaps and permutations?
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.
Adding more tests wouldn't hurt. I think the one you added here provides sufficient coverage to prevent a regression here. But if you wanted to add more that would give us more coverage against potential future issues.