Skip to content

Fix qpy custom ControlledGate with overloaded _define() (backport #8927)#8937

Merged
mergify[bot] merged 2 commits into
stable/0.22from
mergify/bp/stable/0.22/pr-8927
Oct 18, 2022
Merged

Fix qpy custom ControlledGate with overloaded _define() (backport #8927)#8937
mergify[bot] merged 2 commits into
stable/0.22from
mergify/bp/stable/0.22/pr-8927

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 18, 2022

This is an automatic backport of pull request #8927 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 a bug in the QPY serialization of ControlledGate
subclasses that defined custom _define() methods. The _define() method
is the typical way to provide a custom definition in Gate classes. While
ControlledGate class provides an alternative interface that handles
custom control states at initialization, but the _define() interface is
still valid even if it doesn't account for this. In #8571 we updated the
QPY serialization code to use the _definition() method directly to
correctly handle the open control case. But this fix neglected the case
where people were providing definitions via the mechanism from Gate.
This commit fixes this assumption by ensuring we load the definition
that comes from _define() which will fix the serialization of these
custom subclasses.

Fixes #8794

Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 3fb8939)
@mergify mergify Bot requested a review from a team as a code owner October 18, 2022 00:01
@qiskit-bot
Copy link
Copy Markdown
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:

@jakelishman jakelishman added Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog. automerge labels Oct 18, 2022
@jakelishman jakelishman added this to the 0.22.1 milestone Oct 18, 2022
@mergify mergify Bot merged commit 6c4a3b6 into stable/0.22 Oct 18, 2022
@mergify mergify Bot deleted the mergify/bp/stable/0.22/pr-8927 branch October 18, 2022 10:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants