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

Jump to bottom

Fix global phase in OneQubitEulerDecomposer using PSX and ZSX basis and in Diagonal gate #5474

Merged
merged 12 commits into from
Jan 19, 2021
Merged

Fix global phase in OneQubitEulerDecomposer using PSX and ZSX basis and in Diagonal gate #5474

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4feb3f5
fix global phase in OneQubitEulerDecomposer using PSX and ZSX basis
georgios-ts Dec 7, 2020
bb541fa
minor fixes
georgios-ts Dec 7, 2020
cd7525c
update tests
georgios-ts Dec 10, 2020
fa8b8a9
update randomized test
georgios-ts Dec 11, 2020
a4ac340
set global_phase=True
georgios-ts Dec 11, 2020
31f6dd1
track global phase in diagonal gate
georgios-ts Dec 14, 2020
5b91870
fix dimension
georgios-ts Dec 14, 2020
4654948
Merge branch 'master' into global_phase
ewinston Jan 14, 2021
620a824
add test for special cases of zsx psx decomposition.
ewinston Jan 15, 2021
48986c2
linting
ewinston Jan 15, 2021
d7cd118
Merge branch 'master' into global_phase
kdk Jan 19, 2021
0b1b69b
Merge branch 'master' into global_phase
kdk Jan 19, 2021
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
16 changes: 14 additions & 2 deletions qiskit/quantum_info/synthesis/one_qubit_decompose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,12 +338,13 @@ def _circuit_psx(theta,
# Phase(phi+pi).SX.Phase(theta+pi).SX.Phase(lam)
theta = _mod2pi(theta + np.pi)
phi = _mod2pi(phi + np.pi)
circuit = QuantumCircuit(1, global_phase=phase)
circuit = QuantumCircuit(1, global_phase=phase - np.pi / 2)
# Check for decomposition into minimimal number required SX gates
if simplify and np.isclose(abs(theta), np.pi, atol=atol):
if not np.isclose(_mod2pi(abs(lam + phi + theta)),
[0., 2*np.pi], atol=atol).any():
circuit.append(PhaseGate(_mod2pi(lam + phi + theta)), [0])
circuit.global_phase += np.pi / 2
elif simplify and np.isclose(abs(theta),
[np.pi/2, 3*np.pi/2], atol=atol).any():
if not np.isclose(_mod2pi(abs(lam + theta)),
Expand All @@ -353,6 +354,8 @@ def _circuit_psx(theta,
if not np.isclose(_mod2pi(abs(phi + theta)),
[0., 2*np.pi], atol=atol).any():
circuit.append(PhaseGate(_mod2pi(phi + theta)), [0])
if np.isclose(theta, [-np.pi / 2, 3 * np.pi / 2], atol=atol).any():
circuit.global_phase += np.pi / 2
else:
if not np.isclose(abs(lam), [0., 2*np.pi], atol=atol).any():
circuit.append(PhaseGate(lam), [0])
Expand All @@ -375,30 +378,39 @@ def _circuit_zsx(theta,
# RZ(phi+pi).SX.RZ(theta+pi).SX.RZ(lam)
theta = _mod2pi(theta + np.pi)
phi = _mod2pi(phi + np.pi)
circuit = QuantumCircuit(1, global_phase=phase)
circuit = QuantumCircuit(1, global_phase=phase - np.pi / 2)
# Check for decomposition into minimimal number required SX gates
if simplify and np.isclose(abs(theta), np.pi, atol=atol):
if not np.isclose(_mod2pi(abs(lam + phi + theta)),
[0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(_mod2pi(lam + phi + theta)), [0])
circuit.global_phase += 0.5 * _mod2pi(lam + phi + theta)
circuit.global_phase += np.pi / 2
elif simplify and np.isclose(abs(theta),
[np.pi/2, 3*np.pi/2], atol=atol).any():
if not np.isclose(_mod2pi(abs(lam + theta)),
[0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(_mod2pi(lam + theta)), [0])
circuit.global_phase += 0.5 * _mod2pi(lam + theta)
circuit.append(SXGate(), [0])
if not np.isclose(_mod2pi(abs(phi + theta)),
[0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(_mod2pi(phi + theta)), [0])
circuit.global_phase += 0.5 * _mod2pi(phi + theta)
if np.isclose(theta, [-np.pi / 2, 3 * np.pi / 2], atol=atol).any():
circuit.global_phase += np.pi / 2
else:
if not np.isclose(abs(lam), [0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(lam), [0])
circuit.global_phase += 0.5 * lam
circuit.append(SXGate(), [0])
if not np.isclose(abs(theta), [0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(theta), [0])
circuit.global_phase += 0.5 * theta
circuit.append(SXGate(), [0])
if not np.isclose(abs(phi), [0., 2*np.pi], atol=atol).any():
circuit.append(RZGate(phi), [0])
circuit.global_phase += 0.5 * phi
return circuit

@staticmethod
Expand Down
9 changes: 9 additions & 0 deletions test/python/quantum_info/test_synthesis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,15 @@ def test_one_qubit_random_all_basis(self, basis, seed):
unitary = random_unitary(2, seed=seed)
self.check_one_qubit_euler_angles(unitary, basis)

@combine(basis=['U', 'PSX', 'ZSX', 'U3', 'U1X', 'ZYZ', 'ZXZ', 'XYX', 'RR'], seed=range(50),
name='test_one_qubit_global_phase_{basis}_basis_{seed}')
def test_one_qubit_global_phase_all_basis(self, basis, seed):
"""Verify for {basis} basis and random_unitary (seed={seed})."""
unitary = random_unitary(2, seed=seed)
decomposer = OneQubitEulerDecomposer(basis)
decomp_unitary = Operator(decomposer(unitary))
self.assertTrue(np.allclose(unitary.data, decomp_unitary.data))
kdk marked this conversation as resolved.
Show resolved Hide resolved


# FIXME: streamline the set of test cases
class TestTwoQubitWeylDecomposition(CheckDecompositions):
Expand Down