AbstractCircuit.freeze should not reallocate moments
#5878
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
maffoo
reviewed
Sep 19, 2022
cirq-core/cirq/circuits/circuit.py
Outdated
| @@ -1820,7 +1820,11 @@ def _load_contents_with_earliest_strategy(self, contents: 'cirq.OP_TREE'): | |||
| # each index. | |||
| for i in range(length): | |||
| if i in moments_by_index: | |||
| self._moments.append(moments_by_index[i].with_operations(op_lists_by_index[i])) | |||
| if op_lists_by_index[i]: | |||
| self._moments.append(moments_by_index[i].with_operations(op_lists_by_index[i])) | |||
There was a problem hiding this comment.
Perhaps we could modify Moment.with_operations instead, so that we can get this optimization in more scenarios, e.g.
def with_operations(self, *contents: 'cirq.OP_TREE') -> 'cirq.Moment':
...
flattened_contents = tuple(op_tree.flatten_to_ops(contents))
if not flattened_contents:
return self
...There was a problem hiding this comment.
Will revert this diff in the next commit,
maffoo
previously approved these changes
Sep 19, 2022
| @@ -192,6 +192,9 @@ def with_operations(self, *contents: 'cirq.OP_TREE') -> 'cirq.Moment': | |||
| """ | |||
| flattened_contents = tuple(op_tree.flatten_to_ops(contents)) | |||
|
|
|||
| if not flattened_contents: | |||
| return self | |||
There was a problem hiding this comment.
Please add a unit test of this behavior of Moment.with_operations
|
@maffoo Created a big diff compared to the one which was approved. Needs another look. |
maffoo
approved these changes
Sep 19, 2022
CirqBot
pushed a commit
that referenced
this pull request
Sep 20, 2022
These removals don't seem to affect the tests in any way. Don't merge until after #5878
rht
pushed a commit
to rht/Cirq
that referenced
this pull request
May 1, 2023
rht
pushed a commit
to rht/Cirq
that referenced
this pull request
May 1, 2023
These removals don't seem to affect the tests in any way. Don't merge until after quantumlib#5878
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.
Fixes: #5816