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

Remove deprecated merge_single_qubit optimizer #5725

Merged
merged 10 commits into from
Jul 11, 2022
Merged

Remove deprecated merge_single_qubit optimizer #5725

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
64bcc59
Minor updates to development page
dstrain115 Jul 6, 2022
b6dbd1e
t pMerge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 7, 2022
69d4126
Mert push ge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 7, 2022
49818f0
Merge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 8, 2022
91b6125
Merge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 8, 2022
a4dbade
Merge branch 'master' of https://github.com/dstrain115/Cirq-1
dstrain115 Jul 8, 2022
0d7f73e
Merge branch 'master' of https://github.com/quantumlib/Cirq
dstrain115 Jul 11, 2022
2cc2876
Remove deprecated merge_single_qubit optimizer
dstrain115 Jul 11, 2022
597e25f
Merge branch 'master' into deprecate_merge_single_qubit_gates
CirqBot Jul 11, 2022
39f52a7
Merge branch 'master' into deprecate_merge_single_qubit_gates
CirqBot Jul 11, 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
3 changes: 0 additions & 3 deletions cirq-core/cirq/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,11 +338,8 @@
EjectPhasedPaulis,
EjectZ,
ExpandComposite,
merge_single_qubit_gates_into_phased_x_z,
merge_single_qubit_gates_into_phxz,
MergeInteractions,
MergeInteractionsToSqrtIswap,
MergeSingleQubitGates,
SynchronizeTerminalMeasurements,
)

Expand Down
6 changes: 0 additions & 6 deletions cirq-core/cirq/optimizers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,6 @@

from cirq.optimizers.merge_interactions_to_sqrt_iswap import MergeInteractionsToSqrtIswap

from cirq.optimizers.merge_single_qubit_gates import (
merge_single_qubit_gates_into_phased_x_z,
merge_single_qubit_gates_into_phxz,
MergeSingleQubitGates,
)

from cirq.optimizers.synchronize_terminal_measurements import SynchronizeTerminalMeasurements

from cirq.transformers.stratify import stratified_circuit
Expand Down
136 changes: 0 additions & 136 deletions cirq-core/cirq/optimizers/merge_single_qubit_gates.py
View file
Open in desktop

This file was deleted.

186 changes: 0 additions & 186 deletions cirq-core/cirq/optimizers/merge_single_qubit_gates_test.py
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion cirq-core/cirq/protocols/json_test_data/spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
'MEASUREMENT_KEY_SEPARATOR',
'MergeInteractions',
'MergeInteractionsToSqrtIswap',
'MergeSingleQubitGates',
'PointOptimizer',
'SynchronizeTerminalMeasurements',
# Transformers
Expand Down
8 changes: 4 additions & 4 deletions cirq-core/cirq/transformers/merge_single_qubit_gates_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def assert_optimizes(optimized: cirq.AbstractCircuit, expected: cirq.AbstractCir
cirq.testing.assert_same_circuits(optimized, expected)


def test_merge_single_qubit_gates_into_phased_x_z():
def test_merge_single_qubit_gates_to_phased_x_and_z():
a, b = cirq.LineQubit.range(2)
c = cirq.Circuit(
cirq.X(a),
Expand All @@ -54,7 +54,7 @@ def test_merge_single_qubit_gates_into_phased_x_z():
)


def test_merge_single_qubit_gates_into_phased_x_z_deep():
def test_merge_single_qubit_gates_to_phased_x_and_z_deep():
a = cirq.NamedQubit("a")
c_nested = cirq.FrozenCircuit(cirq.H(a), cirq.Z(a), cirq.H(a).with_tags("ignore"))
c_nested_merged = cirq.FrozenCircuit(
Expand Down Expand Up @@ -85,7 +85,7 @@ def _phxz(a: float, x: float, z: float):
return cirq.PhasedXZGate(axis_phase_exponent=a, x_exponent=x, z_exponent=z)


def test_merge_single_qubit_gates_into_phxz():
def test_merge_single_qubit_gates_to_phxz():
a, b = cirq.LineQubit.range(2)
c = cirq.Circuit(
cirq.X(a),
Expand All @@ -109,7 +109,7 @@ def test_merge_single_qubit_gates_into_phxz():
)


def test_merge_single_qubit_gates_into_phxz_deep():
def test_merge_single_qubit_gates_to_phxz_deep():
a = cirq.NamedQubit("a")
c_nested = cirq.FrozenCircuit(cirq.H(a), cirq.Z(a), cirq.H(a).with_tags("ignore"))
c_nested_merged = cirq.FrozenCircuit(_phxz(-0.5, 0.5, 0).on(a), cirq.H(a).with_tags("ignore"))
Expand Down