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.

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

Add support for deep=True to cirq.eject_z transformer #5115

Merged
merged 3 commits into from
Mar 22, 2022
Merged

Add support for deep=True to cirq.eject_z transformer #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d89aa5
Add support for deep=True to cirq.eject_z transformer
tanujkhattar Mar 21, 2022
da8c654
Fix pylint errors
tanujkhattar Mar 21, 2022
a5487a0
Merge branch 'master' into eject_z_deep
CirqBot Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cirq-core/cirq/transformers/eject_z.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def _is_swaplike(gate: 'cirq.Gate'):
return False


@transformer_api.transformer
@transformer_api.transformer(add_deep_support=True)
def eject_z(
circuit: 'cirq.AbstractCircuit',
*,
Expand Down Expand Up @@ -96,7 +96,7 @@ def map_func(op: 'cirq.Operation', moment_index: int) -> 'cirq.OP_TREE':
gate = op.gate
# Return if circuit operation.
if gate is None:
return op
return [dump_tracked_phase(op.qubits), op]

# Swap phases if `op` is a swap operation.
if _is_swaplike(gate):
Expand Down
30 changes: 30 additions & 0 deletions cirq-core/cirq/transformers/eject_z_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import dataclasses

import pytest
import numpy as np
import sympy
Expand Down Expand Up @@ -39,6 +42,33 @@ def assert_optimizes(
circuit = cirq.eject_z(before, eject_parameterized=eject_parameterized, context=context)
cirq.testing.assert_same_circuits(circuit, expected)

# Nested sub-circuits should also get optimized.
q = before.all_qubits()
c_nested = cirq.Circuit(
[(cirq.Z ** 0.5).on_each(*q), (cirq.Y ** 0.25).on_each(*q)],
cirq.Moment(cirq.CircuitOperation(before.freeze()).repeat(2).with_tags("ignore")),
[(cirq.Z ** 0.5).on_each(*q), (cirq.Y ** 0.25).on_each(*q)],
cirq.Moment(cirq.CircuitOperation(before.freeze()).repeat(3).with_tags("preserve_tag")),
)
c_expected = cirq.Circuit(
cirq.PhasedXPowGate(phase_exponent=0, exponent=0.25).on_each(*q),
(cirq.Z ** 0.5).on_each(*q),
cirq.Moment(cirq.CircuitOperation(before.freeze()).repeat(2).with_tags("ignore")),
cirq.PhasedXPowGate(phase_exponent=0, exponent=0.25).on_each(*q),
(cirq.Z ** 0.5).on_each(*q),
cirq.Moment(cirq.CircuitOperation(expected.freeze()).repeat(3).with_tags("preserve_tag")),
)
if context is None:
context = cirq.TransformerContext(tags_to_ignore=("ignore",), deep=True)
else:
context = dataclasses.replace(
context, tags_to_ignore=context.tags_to_ignore + ("ignore",), deep=True
)
c_nested = cirq.eject_z(c_nested, context=context, eject_parameterized=eject_parameterized)
cirq.testing.assert_same_circuits(c_nested, c_expected)
c_nested = cirq.eject_z(c_nested, context=context, eject_parameterized=eject_parameterized)
cirq.testing.assert_same_circuits(c_nested, c_expected)
MichaelBroughton marked this conversation as resolved.
Show resolved Hide resolved


def assert_removes_all_z_gates(circuit: cirq.Circuit, eject_parameterized: bool = True):
optimized = cirq.eject_z(circuit, eject_parameterized=eject_parameterized)
Expand Down