Skip to content

More efficient C3X implementation (bp #5668)#5669

Merged
mergify[bot] merged 5 commits into
stable/0.16from
mergify/bp/stable/0.16/pr-5668
Jan 25, 2021
Merged

More efficient C3X implementation (bp #5668)#5669
mergify[bot] merged 5 commits into
stable/0.16from
mergify/bp/stable/0.16/pr-5668

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 21, 2021

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

Cherry-pick of b9c943b has failed:

On branch mergify/bp/stable/0.16/pr-5668
Your branch is up to date with 'origin/stable/0.16'.

You are currently cherry-picking commit b9c943b17.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   qiskit/circuit/library/__init__.py
	modified:   qiskit/circuit/library/standard_gates/__init__.py
	modified:   qiskit/qasm/libs/qelib1.inc
	new file:   releasenotes/notes/improved-c3x-decomposition-aa812a0bc8280c7a.yaml
	modified:   test/python/circuit/test_controlled_gate.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   qiskit/circuit/library/standard_gates/x.py

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


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.io/

* update c3x decomp

* fix call with "angle" argument

* rename to C3SX and fix tests

* fix typo

* add reno

(cherry picked from commit b9c943b)

# Conflicts:
#	qiskit/circuit/library/standard_gates/x.py
@mergify mergify Bot requested a review from a team as a code owner January 21, 2021 16:48
@mergify mergify Bot added the conflicts used by mergify when there are conflicts in a port label Jan 21, 2021
@mtreinish mtreinish added Changelog: Fixed Add a "Fixed" entry in the GitHub Release changelog. and removed conflicts used by mergify when there are conflicts in a port labels Jan 21, 2021
@mtreinish mtreinish mentioned this pull request Jan 22, 2021
6 tasks
@mergify mergify Bot merged commit 009dc72 into stable/0.16 Jan 25, 2021
@mergify mergify Bot deleted the mergify/bp/stable/0.16/pr-5668 branch January 25, 2021 18:18
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.

2 participants