Skip to content
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

Fix handling of controlflow ops when control flow is in basis (backport #8879) #8887

Merged
merged 2 commits into from
Oct 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 12, 2022

This is an automatic backport of pull request #8879 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

This commit fixes the handling of ControlFlowOps in the Unroll3QOrMore
transpiler pass when the the control flow ops are in the basis set.
Previously, the check for whether the operation was native to the target
was done before recursing into the control flow block. This effectively
skipped the conversion that should have happened in the block. To fix
this the control flow operation handling is moved before the basis
check. Later passes (mainly basis translation) will fail if the control
flow operations aren't available on the target and we should always
recursively unroll gates in this pass.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 985b005)
@mergify mergify bot requested a review from a team as a code owner October 12, 2022 20:03
@qiskit-bot
Copy link
Collaborator

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

  • @Qiskit/terra-core

@jakelishman jakelishman added the Changelog: None Do not include in changelog label Oct 12, 2022
@mtreinish mtreinish added this to the 0.22 milestone Oct 12, 2022
@jakelishman jakelishman mentioned this pull request Oct 12, 2022
5 tasks
@mergify mergify bot merged commit a04df33 into stable/0.22 Oct 12, 2022
@mergify mergify bot deleted the mergify/bp/stable/0.22/pr-8879 branch October 12, 2022 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: None Do not include in changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants