Replace _get_op_circuit with op.untagged #3893
Merged
Conversation
This file contains 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
balopat
reviewed
Mar 9, 2021
maffoo
reviewed
Mar 9, 2021
cirq/circuits/circuit.py
Outdated
| @@ -776,13 +776,13 @@ def are_all_matches_terminal(self, predicate: Callable[['cirq.Operation'], bool] | |||
| if not all( | |||
| self.next_moment_operating_on(op.qubits, i + 1) is None | |||
| for (i, op) in self.findall_operations(predicate) | |||
| if _get_op_circuit(op) is None | |||
| if getattr(op.untagged, 'circuit', None) is None | |||
There was a problem hiding this comment.
I think it would more clearly convey intent here to check the type instead
Suggested change
| if getattr(op.untagged, 'circuit', None) is None | |
| if not isinstance(op.untagged, CircuitOperation) |
Would have to import CircuitOperation in are_all_matches_terminal and are_any_matches_terminal, but that should be fine. WDYT?
There was a problem hiding this comment.
That seems reasonable to me. Change applied (+ imports)
95-martin-orion
added
the
automerge
CirqBot
added
the
front_of_queue_automerge
CirqBot
removed
automerge
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.
Since
Operationprovides a canonical way to get the untagged version of itself, we should use it instead of writing a new method to do the same thing.Using
op.untaggedin #3634 removes any residual blocking effects from #3678, although I'm still in favor of finding a proper resolution to #3678.