Skip to content

Fail gracefully on bad SabreDAG construction (backport #10724) #10769

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Sep 5, 2023
Merged

Fail gracefully on bad SabreDAG construction (backport #10724) #10769

merged 1 commit into from
Sep 5, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 4, 2023

This is an automatic backport of pull request #10724 done by Mergify.
Cherry-pick of 1606ca3 has failed:

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

You are currently cherry-picking commit 1606ca354.
  (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:   .azure/test-linux.yml
	modified:   crates/accelerate/Cargo.toml
	modified:   crates/qasm2/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml
	both modified:   crates/accelerate/src/sabre_layout.rs
	both modified:   crates/accelerate/src/sabre_swap/sabre_dag.rs

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

@mergify mergify bot requested a review from a team as a code owner September 4, 2023 16:26
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Sep 4, 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:

@jakelishman
Fail gracefully on bad SabreDAG construction (#10724)
bde0f28 
* Fail gracefully on bad `SabreDAG` construction

This is a private, internal Rust type, but it doesn't cost us anything
(meaningful) to bounds-check the accessors and ensure we fail gracefully
rather than panicking if we ever make a mistake in Python space. This
more faithfully fulfills the return value of `SabreDAG::new`, which
previously was an effectively infallible `Result`.

* Run `cargo fmt`

(cherry picked from commit 1606ca3)
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.25/pr-10724 branch from 5cbacd9 to bde0f28 Compare September 5, 2023 10:00
@jakelishman jakelishman added Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository and removed conflicts used by mergify when there are conflicts in a port labels Sep 5, 2023
@jakelishman jakelishman added this to the 0.25.2 milestone Sep 5, 2023
@jakelishman jakelishman added this pull request to the merge queue Sep 5, 2023
Merged via the queue into stable/0.25 with commit c9a41d0 Sep 5, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.25/pr-10724 branch September 5, 2023 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakelishman jakelishman jakelishman approved these changes

Assignees
No one assigned
Labels
Changelog: None Do not include in changelog Rust This PR or issue is related to Rust code in the repository
Projects
None yet
Milestone
0.25.2
Development

Successfully merging this pull request may close these issues.
2 participants
@qiskit-bot @jakelishman