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

Improve support for CCOs in cirq.merge_operations #5393

Merged
merged 8 commits into from
May 26, 2022
Merged

Conversation

tanujkhattar
Copy link
Collaborator

Fixes #4977

@tanujkhattar tanujkhattar requested review from a team, vtomole and cduck as code owners May 23, 2022 21:02
@tanujkhattar tanujkhattar requested a review from viathor May 23, 2022 21:02
@CirqBot CirqBot added the size: S 10< lines changed <50 label May 23, 2022
@tanujkhattar
Copy link
Collaborator Author

@95-martin-orion @daxfohl This is ready for a re-review. PTAL

Copy link
Collaborator

@95-martin-orion 95-martin-orion left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All looks good. Docstrings on the helper class might be useful for reference, but since it's a private class I'm fine if you leave them out.

@tanujkhattar tanujkhattar added the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 26, 2022
@CirqBot CirqBot added the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label May 26, 2022
@CirqBot CirqBot merged commit 6273826 into master May 26, 2022
@CirqBot CirqBot removed the automerge Tells CirqBot to sync and merge this PR. (If it's running.) label May 26, 2022
@CirqBot CirqBot deleted the fix_merge_operations branch May 26, 2022 20:24
@CirqBot CirqBot removed the front_of_queue_automerge CirqBot uses this label to indicate (and remember) what's being merged next. label May 26, 2022
augustehirth pushed a commit to augustehirth/Cirq that referenced this pull request May 27, 2022
rht pushed a commit to rht/Cirq that referenced this pull request May 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size: S 10< lines changed <50
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Investigate and fix CCO breakages in merge_operations due to prev_moment_operating_on
4 participants