Merge branch 'quantumlib:main' into master

.dockerignore

@@ -19,10 +19,6 @@ __pycache__
 # packaging
 *.egg-info/
 
-# Sphinx
-_build
-rtd_docs/generated
-
 # swap files
 *.swp
 

.github/workflows/ci.yml

@@ -185,20 +185,6 @@ jobs:
       - name: Test dependencies with pip-compile
         run: |
           pip-compile --resolver=backtracking dev_tools/requirements/deps/cirq-all.txt -o-
-  build_docs:
-    name: Build docs
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.9'
-          architecture: 'x64'
-      - name: Install requirements
-        run: |
-          pip install -r rtd_docs/requirements.txt
-      - name: Build docs
-        run: dev_tools/docs/build-rtd-docs.sh
   build_protos:
     name: Build protos
     runs-on: ubuntu-20.04

.gitignore

@@ -20,10 +20,6 @@ __pycache__
 *.egg-info/
 build/
 
-# Sphinx
-_build
-rtd_docs/generated
-
 # API docs
 docs/api_docs
 

README.rst

@@ -16,10 +16,6 @@ circuits and running them against quantum computers and simulators.
 .. image:: https://badge.fury.io/py/cirq.svg
   :target: https://badge.fury.io/py/cirq
 
-.. image:: https://readthedocs.org/projects/cirq/badge/?version=latest
-  :target: https://readthedocs.org/projects/cirq/versions/
-  :alt: Documentation Status
-
 
 Installation and Documentation
 ------------------------------

cirq-core/cirq/experiments/qubit_characterizations.py

@@ -693,7 +693,9 @@ def _create_parallel_rb_circuit(
     num_moments = max(len(sequence) for sequence in sequences_to_zip)
     for q, sequence in zip(qubits, sequences_to_zip):
         if (n := len(sequence)) < num_moments:
-            sequence.extend([ops.SingleQubitCliffordGate.I(q)] * (num_moments - n))
+            sequence.extend(
+                [ops.SingleQubitCliffordGate.I.to_phased_xz_gate()(q)] * (num_moments - n)
+            )
     moments = zip(*sequences_to_zip)
     return circuits.Circuit.from_moments(*moments, ops.measure_each(*qubits))
 
@@ -739,13 +741,15 @@ def _two_qubit_clifford_matrices(
 
 
 def _random_single_q_clifford(
-    qubit: 'cirq.Qid', num_cfds: int, cfds: Sequence[Sequence['cirq.Gate']]
+    qubit: 'cirq.Qid', num_cfds: int, cfds: Sequence[Sequence['cirq.ops.SingleQubitCliffordGate']]
 ) -> List['cirq.Operation']:
     clifford_group_size = 24
-    operations = [[gate(qubit) for gate in gates] for gates in cfds]
+    operations = [[gate.to_phased_xz_gate()(qubit) for gate in gates] for gates in cfds]
     gate_ids = list(np.random.choice(clifford_group_size, num_cfds))
     adjoint = _reduce_gate_seq([gate for gate_id in gate_ids for gate in cfds[gate_id]]) ** -1
-    return [op for gate_id in gate_ids for op in operations[gate_id]] + [adjoint(qubit)]
+    return [op for gate_id in gate_ids for op in operations[gate_id]] + [
+        adjoint.to_phased_xz_gate()(qubit)
+    ]
 
 
 def _random_two_q_clifford(

cirq-core/cirq/experiments/qubit_characterizations_test.py

@@ -227,3 +227,15 @@ def test_tomography_plot_raises_for_incorrect_number_of_axes():
     with pytest.raises(ValueError):
         _, axes = plt.subplots(1, 3)
         result.plot(axes)
+
+
+def test_single_qubit_cliffords_gateset():
+    qubits = [GridQubit(0, i) for i in range(4)]
+    clifford_group = cirq.experiments.qubit_characterizations._single_qubit_cliffords()
+    c = cirq.experiments.qubit_characterizations._create_parallel_rb_circuit(
+        qubits, 5, clifford_group.c1_in_xy
+    )
+    device = cirq.testing.ValidatingTestDevice(
+        qubits=qubits, allowed_gates=(cirq.ops.PhasedXZGate, cirq.MeasurementGate)
+    )
+    device.validate_circuit(c)

cirq-google/cirq_google/serialization/circuit_serializer.py

@@ -175,7 +175,9 @@ def _serialize_gate_op(
                 out=msg.phasedxpowgate.exponent,
                 arg_function_language=arg_function_language,
             )
-        elif isinstance(gate, cirq.PhasedXZGate):
+        elif isinstance(gate, (cirq.PhasedXZGate, cirq.ops.SingleQubitCliffordGate)):
+            if isinstance(gate, cirq.ops.SingleQubitCliffordGate):
+                gate = gate.to_phased_xz_gate()
             arg_func_langs.float_arg_to_proto(
                 gate.x_exponent,
                 out=msg.phasedxzgate.x_exponent,

cirq-google/cirq_google/serialization/circuit_serializer_test.py

@@ -668,3 +668,16 @@ def test_measurement_gate_deserialize() -> None:
     msg = cg.CIRCUIT_SERIALIZER.serialize(circuit)
 
     assert cg.CIRCUIT_SERIALIZER.deserialize(msg) == circuit
+
+
+def test_circuit_with_cliffords():
+    q = cirq.NamedQubit('q')
+    circuit = cirq.Circuit(
+        g(q) for g in cirq.ops.SingleQubitCliffordGate.all_single_qubit_cliffords
+    )
+    want = cirq.Circuit(
+        g.to_phased_xz_gate()(q)
+        for g in cirq.ops.SingleQubitCliffordGate.all_single_qubit_cliffords
+    )
+    msg = cg.CIRCUIT_SERIALIZER.serialize(circuit)
+    assert cg.CIRCUIT_SERIALIZER.deserialize(msg) == want

dev_tools/incremental_coverage.py

@@ -21,7 +21,6 @@
 
 IGNORED_FILE_PATTERNS = [
     r'^dev_tools/.+',  # Environment-heavy code.
-    r'^rtd_docs/.+',  # Environment-heavy code.
     r'^.+_pb2(_grpc)?\.py$',  # Auto-generated protobuf code.
     r'^(.+/)?setup\.py$',  # Installation code.
     r'^(.+/)?_version\.py$',  # Installation code.