Resolve the merge conflict in #14351 #14357
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
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 following people are relevant to this code:
|
alexanderivrii
approved these changes
May 13, 2025
4f436a2
into
Qiskit:mergify/bp/stable/2.0/pr-14345
14 checks passed
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 13, 2025
* Fix UnitarySynthesis to respect synth_gates (#14345) * Fix UnitarySynthesis to respect synth_gates This commit fixes UnitarySynthesis. It has a parameter `synth_gates`, which is meant to be a list of gates that are synthesized. However, the previous implementation did not respect this parameter, and only synthesized the gates named `unitary`. This commit fixes this issue by checking if gate's name is in `synth_gates`. * Add tests for UnitarySynthesis' synth_gates * Fix the default Rust impl of UnitarySynthesis * Add the release note for #14345 (cherry picked from commit 0c2ce64) # Conflicts: # crates/accelerate/src/unitary_synthesis.rs * Resolve the merge conflict (#14357) --------- Co-authored-by: Shuhei M. Yoshida <17794644+yoshum@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR resolves the merge conflict in #14351, which is the backport PR of #14345. I opened this PR, as per the comment, because I didn't have permission to push to the PR.
Details and comments
In the main branch, from which the commit in the backport PR was cherry-picked,
py_run_main_loophas been renamed torun_unitary_synthesisand made public during the process of reorganizing the crates. This change seems irrelevant tostable/2.0, so I have undone the name change.