Merge branch 'main' into ci-daily-add-python-3.12

Author: pavoljuhas

.github/ISSUE_TEMPLATE/feature_request.md

@@ -27,4 +27,4 @@ P1 - I need this no later than the next release (end of quarter)
 P2 - we should do it in the next couple of quarters 
 P3 - I'm not really blocked by it, it is an idea I'd like to discuss / suggestion based on principle 
 
-<!-- [optional] additional comment / context -->
+<!-- [optional] additional comment / context -->

.github/ISSUE_TEMPLATE/task.md

@@ -1,6 +1,6 @@
 ---
 name: Project task
-about: Task to track larger efforts 
+about: Task to track larger efforts
 title: ''
 labels: 'kind/task'
 assignees: ''
@@ -16,4 +16,4 @@ assignees: ''
 <!-- optional, feel free to remove this section -->
 **Related**
 
-Related issues: #abc, #xyz, ... 
+Related issues: #abc, #xyz, ...

.github/workflows/ci.yml

@@ -107,7 +107,7 @@ jobs:
       - name: Install requirements
         run: pip install -r dev_tools/requirements/dev.env.txt
       - name: RST check
-        run: find . -type f -name "*.rst" | xargs rstcheck --report warning --ignore-directives autoclass,automodule
+        run: find . -type f -name "*.rst" | xargs rstcheck
       - name: Doc check
         run: check/doctest -q
   nbformat:

CODE_OF_CONDUCT.md

@@ -89,4 +89,4 @@ harassment or threats to anyone's safety, we may take action without notice.
 
 This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
 available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

benchmarks/README.md

@@ -19,4 +19,4 @@ You can also pass arguments to the script, which would be forwarded to the `asv
 Please refer [Running Benchmarks guide by ASV](https://asv.readthedocs.io/en/stable/using.html#running-benchmarks) for more information. 
 
 ## Results Database
-TODO([#3838](https://github.com/quantumlib/Cirq/issues/3838)): Add details regarding GCP setup.
+TODO([#3838](https://github.com/quantumlib/Cirq/issues/3838)): Add details regarding GCP setup.

check/all

@@ -38,20 +38,20 @@ cd "${topdir}" || exit $?
 errors=()
 
 # Parse arguments.
-apply_arg=""
+apply_arg=( )
 only_changed=0
-rev=""
+rev=( )
 for arg in "$@"; do
     if [[ "${arg}" == "--only-changed-files" ]]; then
         only_changed=1
     elif [[ "${arg}" == "--apply-format-changes" ]]; then
-        apply_arg="--apply"
-    elif [ -z "${rev}" ]; then
+        apply_arg=( "--apply" )
+    elif [[ "${#rev[@]}" == 0 ]]; then
         if [ "$(git cat-file -t "${arg}" 2> /dev/null)" != "commit" ]; then
             echo -e "\033[31mNo revision '${arg}'.\033[0m" >&2
             exit 1
         fi
-        rev="${arg}"
+        rev=( "${arg}" )
     else
         echo -e "\033[31mInvalid arguments. Expected [BASE_REVISION] [--only-changed-files] [--apply-format].\033[0m" >&2
         exit 1
@@ -73,15 +73,16 @@ echo "Running mypy"
 check/mypy || errors+=( "check/mypy failed" )
 
 echo "Running incremental format"
-check/format-incremental "${rev}" "${apply_arg}" || errors+=( "check/format-incremental failed" )
+check/format-incremental "${rev[@]}" "${apply_arg[@]}" ||
+    errors+=( "check/format-incremental failed" )
 
 if [ ${only_changed} -ne 0 ]; then
     echo "Running pytest and incremental coverage on changed files"
-    check/pytest-changed-files-and-incremental-coverage "${rev}" ||
+    check/pytest-changed-files-and-incremental-coverage "${rev[@]}" ||
          errors+=( "check/pytest-changed-files-and-incremental-coverage failed" )
 else
     echo "Running pytest and incremental coverage"
-    check/pytest-and-incremental-coverage "${rev}" ||
+    check/pytest-and-incremental-coverage "${rev[@]}" ||
          errors+=( "check/pytest-and-incremental-coverage failed" )
 fi
 

check/build-changed-protos

@@ -32,7 +32,7 @@ cd "${topdir}" || exit $?
 
 # Figure out which revision to compare against.
 if [ -n "$1" ] && [[ $1 != -* ]]; then
-    if [ "$(git cat-file -t "$1" 2> /dev/null)" != "commit" ]; then
+    if ! git rev-parse --verify --quiet --no-revs "$1^{commit}"; then
         echo -e "\033[31mNo revision '$1'.\033[0m" >&2
         exit 1
     fi
@@ -62,7 +62,7 @@ dev_tools/build-protos.sh
 
 # Filenames with spaces will be ugly (each part will be listed separately)
 # but the error logic will still work.
-uncommitted=$(git status --porcelain 2>/dev/null | grep -E "^?? cirq-google" | cut -d " " -f 3)
+uncommitted=$(git status --porcelain 2>/dev/null | grep -E "^[?][?] cirq-google" | cut -d " " -f 3)
 
 if [[ -n "$uncommitted" ]]; then
     echo -e "\033[31mERROR: Uncommitted generated files found! Please generate and commit these files using dev_tools/build-protos.sh:\033[0m"

check/format-incremental

@@ -46,7 +46,7 @@ for arg in "$@"; do
     elif [[ "${arg}" == "--all" ]]; then
         only_changed=0
     elif [ -z "${rev}" ]; then
-        if [ "$(git cat-file -t "${arg}" 2> /dev/null)" != "commit" ]; then
+        if ! git rev-parse --verify --quiet --no-revs "${arg}^{commit}"; then
             echo -e "\033[31mNo revision '${arg}'.\033[0m" >&2
             exit 1
         fi

check/pylint-changed-files

@@ -31,7 +31,7 @@ cd "${topdir}" || exit $?
 
 # Figure out which revision to compare against.
 if [ -n "$1" ] && [[ $1 != -* ]]; then
-    if [ "$(git cat-file -t "$1" 2> /dev/null)" != "commit" ]; then
+    if ! git rev-parse --verify --quiet --no-revs "$1^{commit}"; then
         echo -e "\033[31mNo revision '$1'.\033[0m" >&2
         exit 1
     fi

check/pytest-and-incremental-coverage

@@ -45,7 +45,7 @@ done
 
 # Figure out which revision to compare against.
 if [ -n "${BASEREV}" ]; then
-    if [ "$(git cat-file -t "${BASEREV}" 2> /dev/null)" != "commit" ]; then
+    if ! git rev-parse --verify --quiet --no-revs "${BASEREV}^{commit}"; then
         echo -e "\033[31mNo revision '${BASEREV}'.\033[0m" >&2
         exit 1
     fi

check/pytest-changed-files

@@ -35,7 +35,7 @@ cd "${topdir}" || exit $?
 # Figure out which branch to compare against.
 rest=( "$@" )
 if [ -n "$1" ] && [[ $1 != -* ]]; then
-    if [ "$(git cat-file -t "$1" 2> /dev/null)" != "commit" ]; then
+    if ! git rev-parse --verify --quiet --no-revs "$1^{commit}"; then
         echo -e "\033[31mNo revision '$1'.\033[0m" >&2
         exit 1
     fi

check/pytest-changed-files-and-incremental-coverage

@@ -34,7 +34,7 @@ cd "$(git rev-parse --show-toplevel)" || exit 1
 
 # Figure out which revision to compare against.
 if [ -n "$1" ] && [[ $1 != -* ]]; then
-    if [ "$(git cat-file -t "$1" 2> /dev/null)" != "commit" ]; then
+    if ! git rev-parse --verify --quiet --no-revs "$1^{commit}"; then
         echo -e "\033[31mNo revision '$1'.\033[0m" >&2
         exit 1
     fi

cirq-aqt/cirq_aqt/_version.py

@@ -14,4 +14,4 @@
 
 """Define version number here, read it from setup.py automatically"""
 
-__version__ = "1.4.0.dev"
+__version__ = "1.5.0.dev"

cirq-aqt/cirq_aqt/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq_aqt.__version__ == "1.4.0.dev"
+    assert cirq_aqt.__version__ == "1.5.0.dev"

cirq-aqt/requirements.txt

@@ -1 +1 @@
-requests~=2.18
+requests~=2.18

cirq-core/cirq/__init__.py

@@ -332,6 +332,7 @@
     ZPowGate,
     ZZ,
     ZZPowGate,
+    UniformSuperpositionGate,
 )
 
 from cirq.transformers import (

cirq-core/cirq/_version.py

@@ -28,4 +28,4 @@
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.4.0.dev"
+__version__ = "1.5.0.dev"

cirq-core/cirq/_version_test.py

@@ -3,4 +3,4 @@
 
 
 def test_version():
-    assert cirq.__version__ == "1.4.0.dev"
+    assert cirq.__version__ == "1.5.0.dev"

cirq-core/cirq/circuits/circuit.py

@@ -145,29 +145,31 @@ class AbstractCircuit(abc.ABC):
     """
 
     @classmethod
-    def from_moments(cls: Type[CIRCUIT_TYPE], *moments: 'cirq.OP_TREE') -> CIRCUIT_TYPE:
+    def from_moments(cls: Type[CIRCUIT_TYPE], *moments: Optional['cirq.OP_TREE']) -> CIRCUIT_TYPE:
         """Create a circuit from moment op trees.
 
         Args:
-            *moments: Op tree for each moment. If an op tree is a moment, it
-                will be included directly in the new circuit. If an op tree is
-                a circuit, it will be frozen, wrapped in a CircuitOperation, and
-                included in its own moment in the new circuit. Otherwise, the
-                op tree will be passed to `cirq.Moment` to create a new moment
-                which is then included in the new circuit. Note that in the
-                latter case we have the normal restriction that operations in a
-                moment must be applied to disjoint sets of qubits.
+            *moments: Op trees for each moment, which can be one of the following:
+                - Moment: will be included directly in the new circuit.
+                - AbstractCircuit: will be frozen, wrapped in a CircuitOperation,
+                    and included in its own moment in the new circuit.
+                - None: will be skipped and omitted from the circuit. This can be
+                    used to include or skip a moment based on a conditional, for example.
+                - Other OP_TREE: will be passed to `cirq.Moment` to create a new moment
+                    which is then included in the new circuit. Note that in this
+                    case we have the normal restriction that operations in a
+                    moment must be applied to disjoint sets of qubits.
         """
         return cls._from_moments(cls._make_moments(moments))
 
     @staticmethod
-    def _make_moments(moments: Iterable['cirq.OP_TREE']) -> Iterator['cirq.Moment']:
+    def _make_moments(moments: Iterable[Optional['cirq.OP_TREE']]) -> Iterator['cirq.Moment']:
         for m in moments:
             if isinstance(m, Moment):
                 yield m
             elif isinstance(m, AbstractCircuit):
                 yield Moment(m.freeze().to_op())
-            else:
+            elif m is not None:
                 yield Moment(m)
 
     @classmethod

cirq-core/cirq/circuits/circuit_test.py

@@ -80,6 +80,7 @@ def test_from_moments():
         [cirq.X(c)],
         [],
         cirq.Z(d),
+        None,
         [cirq.measure(a, b, key='ab'), cirq.measure(c, d, key='cd')],
     )
     assert circuit == cirq.Circuit(

cirq-core/cirq/contrib/svg/svg_test.py

@@ -1,5 +1,5 @@
 # pylint: disable=wrong-or-nonexistent-copyright-notice
-import IPython.display  # type: ignore
+import IPython.display
 import numpy as np
 import pytest
 

cirq-core/cirq/experiments/xeb_sampling.py

@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Estimation of fidelity associated with experimental circuit executions."""
-import concurrent
 import os
 import time
 import uuid
-from concurrent.futures.thread import ThreadPoolExecutor
 from dataclasses import dataclass
 from typing import (
     Callable,
@@ -276,18 +274,16 @@ def _execute_sample_2q_xeb_tasks_in_batches(
     run_batch = _SampleInBatches(
         sampler=sampler, repetitions=repetitions, combinations_by_layer=combinations_by_layer
     )
-    with ThreadPoolExecutor(max_workers=2) as pool:
-        futures = [pool.submit(run_batch, task_batch) for task_batch in batched_tasks]
 
-        records = []
-        with progress_bar(total=len(batched_tasks) * batch_size) as progress:
-            for future in concurrent.futures.as_completed(futures):
-                new_records = future.result()
-                if dataset_directory is not None:
-                    os.makedirs(f'{dataset_directory}', exist_ok=True)
-                    protocols.to_json(new_records, f'{dataset_directory}/xeb.{uuid.uuid4()}.json')
-                records.extend(new_records)
-                progress.update(batch_size)
+    records = []
+    with progress_bar(total=len(batched_tasks) * batch_size) as progress:
+        for task in batched_tasks:
+            new_records = run_batch(task)
+            if dataset_directory is not None:
+                os.makedirs(f'{dataset_directory}', exist_ok=True)
+                protocols.to_json(new_records, f'{dataset_directory}/xeb.{uuid.uuid4()}.json')
+            records.extend(new_records)
+            progress.update(batch_size)
     return records
 
 

cirq-core/cirq/json_resolver_cache.py

@@ -247,6 +247,7 @@ def _symmetricalqidpair(qids):
         'ZipLongest': cirq.ZipLongest,
         'ZPowGate': cirq.ZPowGate,
         'ZZPowGate': cirq.ZZPowGate,
+        'UniformSuperpositionGate': cirq.UniformSuperpositionGate,
         # Old types, only supported for backwards-compatibility
         'BooleanHamiltonian': _boolean_hamiltonian_gate_op,  # Removed in v0.15
         'CrossEntropyResult': _cross_entropy_result,  # Removed in v0.16

cirq-core/cirq/ops/__init__.py

@@ -217,3 +217,5 @@
 from cirq.ops.state_preparation_channel import StatePreparationChannel
 
 from cirq.ops.control_values import AbstractControlValues, ProductOfSums, SumOfProducts
+
+from cirq.ops.uniform_superposition_gate import UniformSuperpositionGate

cirq-core/cirq/ops/pauli_string.py

@@ -1120,6 +1120,23 @@ def _validate_qubit_mapping(
         )
 
 
+def _try_interpret_as_pauli_string(op: Any):
+    """Return a reprepresentation of an operation as a pauli string, if it is possible."""
+    if isinstance(op, gate_operation.GateOperation):
+        gates = {
+            common_gates.XPowGate: pauli_gates.X,
+            common_gates.YPowGate: pauli_gates.Y,
+            common_gates.ZPowGate: pauli_gates.Z,
+        }
+        if (pauli := gates.get(type(op.gate), None)) is not None:
+            exponent = op.gate.exponent  # type: ignore
+            if exponent % 2 == 0:
+                return cirq.PauliString()
+            if exponent % 2 == 1:
+                return pauli.on(op.qubits[0])
+    return None
+
+
 # Ignoring type because mypy believes `with_qubits` methods are incompatible.
 class SingleQubitPauliStringGateOperation(  # type: ignore
     gate_operation.GateOperation, PauliString
@@ -1159,11 +1176,15 @@ def __mul__(self, other):
             return self._as_pauli_string() * other._as_pauli_string()
         if isinstance(other, (PauliString, complex, float, int)):
             return self._as_pauli_string() * other
+        if (as_pauli_string := _try_interpret_as_pauli_string(other)) is not None:
+            return self * as_pauli_string
         return NotImplemented
 
     def __rmul__(self, other):
         if isinstance(other, (PauliString, complex, float, int)):
             return other * self._as_pauli_string()
+        if (as_pauli_string := _try_interpret_as_pauli_string(other)) is not None:
+            return as_pauli_string * self
         return NotImplemented
 
     def __neg__(self):

cirq-core/cirq/ops/pauli_string_test.py

@@ -211,6 +211,29 @@ def test_list_op_constructor_matches_mapping(pauli):
     assert cirq.PauliString([op]) == cirq.PauliString({q0: pauli})
 
 
+@pytest.mark.parametrize('pauli1', (cirq.X, cirq.Y, cirq.Z))
+@pytest.mark.parametrize('pauli2', (cirq.X, cirq.Y, cirq.Z))
+def test_exponent_mul_consistency(pauli1, pauli2):
+    a, b = cirq.LineQubit.range(2)
+    op_a, op_b = pauli1(a), pauli2(b)
+
+    assert op_a * op_a * op_a == op_a
+    assert op_a * op_a**2 == op_a
+    assert op_a**2 * op_a == op_a
+    assert op_b * op_a * op_a == op_b
+    assert op_b * op_a**2 == op_b
+    assert op_a**2 * op_b == op_b
+    assert op_a * op_a * op_a * op_a == cirq.PauliString()
+    assert op_a * op_a**3 == cirq.PauliString()
+    assert op_b * op_a * op_a * op_a == op_b * op_a
+    assert op_b * op_a**3 == op_b * op_a
+
+    op_a, op_b = pauli1(a), pauli2(a)
+
+    assert op_a * op_b**3 == op_a * op_b * op_b * op_b
+    assert op_b**3 * op_a == op_b * op_b * op_b * op_a
+
+
 def test_constructor_flexibility():
     a, b = cirq.LineQubit.range(2)
     with pytest.raises(TypeError, match='cirq.PAULI_STRING_LIKE'):

cirq-core/cirq/ops/phased_x_gate.py

@@ -28,7 +28,7 @@
 
 @value.value_equality(manual_cls=True, approximate=True)
 class PhasedXPowGate(raw_types.Gate):
-    r"""A gate equivalent to $Z^{p} X^t Z^{-p}$.
+    r"""A gate equivalent to $Z^{-p} X^t Z^{p}$ (in time order).
 
     The unitary matrix of `cirq.PhasedXPowGate(exponent=t, phase_exponent=p)` is:
     $$