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 input normalisation of transpile(initial_layout=...) (backport #11031) #11058

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

This is an automatic backport of pull request #11031 done by Mergify.
Cherry-pick of 6148f90 has failed:

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

You are currently cherry-picking commit 6148f903d.
  (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/compiler/transpiler.py
	new file:   releasenotes/notes/fix-input-normalization-of-transpile-initial-layout.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/python/transpiler/test_transpile_layout.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/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.com

* Fixed issue10554 by modifying _parse_initial_layout in transpile to normalize input of range to a list

* Added test and bugfix note

* Handle consumable iterables

* Fix release-note cross references

---------

Co-authored-by: Jake Lishman <jake.lishman@ibm.com>
(cherry picked from commit 6148f90)

# Conflicts:
#	test/python/transpiler/test_transpile_layout.py
@mergify mergify bot requested a review from a team as a code owner October 19, 2023 19:57
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Oct 19, 2023
@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

@github-actions github-actions bot added Changelog: Bugfix Include in the "Fixed" section of the changelog mod: transpiler Issues and PRs related to Transpiler labels Oct 19, 2023
@github-actions github-actions bot added this to the 0.25.3 milestone Oct 19, 2023
The backport of this commit from main failed because the test for this
bug fix was added to an existing file on the main branch but that didn't
exist on the stable/0.25 branch. To fix this the test is moved to a
separate standalone file. Arguably, this should be done on main and
stable/0.45 too as the file the test was added to was for a different
component.
@mtreinish mtreinish removed the conflicts used by mergify when there are conflicts in a port label Oct 24, 2023
@coveralls
Copy link

Pull Request Test Coverage Report for Build 6631987071

  • 2 of 2 (100.0%) changed or added relevant lines in 1 file are covered.
  • 7 unchanged lines in 3 files lost coverage.
  • Overall coverage decreased (-0.001%) to 87.255%

Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 93.76%
qiskit/extensions/quantum_initializer/squ.py 2 80.0%
crates/qasm2/src/lex.rs 4 91.16%
Totals Coverage Status
Change from base Build 6576579516: -0.001%
Covered Lines: 74155
Relevant Lines: 84987

💛 - Coveralls

@mtreinish mtreinish added this pull request to the merge queue Oct 24, 2023
Merged via the queue into stable/0.25 with commit 7080a22 Oct 25, 2023
15 checks passed
@mergify mergify bot deleted the mergify/bp/stable/0.25/pr-11031 branch October 25, 2023 02:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog mod: transpiler Issues and PRs related to Transpiler
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants