Merge branch 'master' into no-new-browser-tab-from-tests

Author: tanujkhattar

.github/workflows/ci-daily.yml

@@ -58,10 +58,9 @@ jobs:
       - name: Install requirements
         run: |
           pip install --pre cirq &&
-          pip install \
-            -r dev_tools/requirements/deps/format.txt \
-            -r dev_tools/requirements/deps/pylint.txt \
-            -r dev_tools/requirements/deps/pytest.txt
+            pip install -r dev_tools/requirements/deps/format.txt &&
+            pip install -r dev_tools/requirements/deps/pylint.txt &&
+            pip install -r dev_tools/requirements/deps/pytest.txt
       - name: Pytest Windows
         run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --enable-slow-tests
         shell: bash

.github/workflows/ci.yml

@@ -168,7 +168,7 @@ jobs:
       - name: Run Quil dependencies
         run: docker-compose -f cirq-rigetti/docker-compose.test.yaml up -d
       - name: Pytest check
-        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib --rigetti-integration
+        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib --rigetti-integration
       - name: Stop Quil dependencies
         run: docker-compose -f cirq-rigetti/docker-compose.test.yaml down
   pip-compile:
@@ -265,7 +265,7 @@ jobs:
       - name: Pytest Windows
         run: |
           source dev_tools/pypath
-          check/pytest -n auto --ignore=cirq-core/cirq/contrib
+          check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
         shell: bash
   macos:
     name: Pytest MacOS
@@ -288,7 +288,7 @@ jobs:
           pip install wheel
           pip install --upgrade --upgrade-strategy eager -r dev_tools/requirements/no-contrib.env.txt
       - name: Pytest check
-        run: check/pytest -n auto --ignore=cirq-core/cirq/contrib
+        run: check/pytest -n auto --durations=20 --ignore=cirq-core/cirq/contrib
   notebooks-stable:
     name: Changed Notebooks Isolated Test against Cirq stable
     env:

cirq-core/cirq/protocols/has_stabilizer_effect_protocol.py

@@ -15,8 +15,18 @@
 from typing import Any, Optional
 
 from cirq.ops.clifford_gate import SingleQubitCliffordGate
+from cirq.ops.dense_pauli_string import DensePauliString
+from cirq._import import LazyLoader
+import cirq.protocols.unitary_protocol as unitary_protocol
+import cirq.protocols.has_unitary_protocol as has_unitary_protocol
+import cirq.protocols.qid_shape_protocol as qid_shape_protocol
+import cirq.protocols.decompose_protocol as decompose_protocol
 
-from cirq import protocols
+pauli_string_decomposition = LazyLoader(
+    "pauli_string_decomposition",
+    globals(),
+    "cirq.transformers.analytical_decompositions.pauli_string_decomposition",
+)
 
 
 def has_stabilizer_effect(val: Any) -> bool:
@@ -29,6 +39,7 @@ def has_stabilizer_effect(val: Any) -> bool:
         _strat_has_stabilizer_effect_from_has_stabilizer_effect,
         _strat_has_stabilizer_effect_from_gate,
         _strat_has_stabilizer_effect_from_unitary,
+        _strat_has_stabilizer_effect_from_decompose,
     ]
     for strat in strats:
         result = strat(val)
@@ -62,9 +73,44 @@ def _strat_has_stabilizer_effect_from_unitary(val: Any) -> Optional[bool]:
     2x2 unitaries.
     """
     # Do not try this strategy if there is no unitary or if the number of
-    # qubits is not 1 since that would be expensive.
-    qid_shape = protocols.qid_shape(val, default=None)
-    if qid_shape is None or len(qid_shape) != 1 or not protocols.has_unitary(val):
+    # qubits is greater than 3 since that would be expensive.
+    qid_shape = qid_shape_protocol.qid_shape(val, default=None)
+    if (
+        qid_shape is None
+        or len(qid_shape) > 3
+        or qid_shape != (2,) * len(qid_shape)
+        or not has_unitary_protocol.has_unitary(val)
+    ):
         return None
-    unitary = protocols.unitary(val)
-    return SingleQubitCliffordGate.from_unitary(unitary) is not None
+    unitary = unitary_protocol.unitary(val)
+    if len(qid_shape) == 1:
+        return SingleQubitCliffordGate.from_unitary(unitary) is not None
+
+    # Check if the action of the unitary on each single qubit pauli string leads to a pauli product.
+    # Source: https://quantumcomputing.stackexchange.com/a/13158
+    for q_idx in range(len(qid_shape)):
+        for g in 'XZ':
+            pauli_string = ['I'] * len(qid_shape)
+            pauli_string[q_idx] = g
+            ps = DensePauliString(pauli_string)
+            p = ps._unitary_()
+            if not pauli_string_decomposition.unitary_to_pauli_string(
+                (unitary @ p @ unitary.T.conj())
+            ):
+                return False
+    return True
+
+
+def _strat_has_stabilizer_effect_from_decompose(val: Any) -> Optional[bool]:
+    qid_shape = qid_shape_protocol.qid_shape(val, default=None)
+    if qid_shape is None or len(qid_shape) <= 3:
+        return None
+
+    decomposition = decompose_protocol.decompose_once(val, default=None)
+    if decomposition is None:
+        return None
+    for op in decomposition:
+        res = has_stabilizer_effect(op)
+        if not res:
+            return res
+    return True

cirq-core/cirq/protocols/has_stabilizer_effect_protocol_test.py

@@ -92,6 +92,10 @@ def __init__(self, unitary):
     def _unitary_(self):
         return self.unitary
 
+    @property
+    def qubits(self):
+        return cirq.LineQubit.range(self.unitary.shape[0].bit_length() - 1)
+
 
 def test_inconclusive():
     assert not cirq.has_stabilizer_effect(object())
@@ -125,9 +129,20 @@ def test_via_unitary():
     op3 = OpWithUnitary(np.array([[1, 0], [0, np.sqrt(1j)]]))
     assert not cirq.has_stabilizer_effect(op3)
 
+    # 2+ qubit cliffords
+    assert cirq.has_stabilizer_effect(cirq.CNOT)
+    assert cirq.has_stabilizer_effect(cirq.XX)
+    assert cirq.has_stabilizer_effect(cirq.ZZ)
+
+    # Non Cliffords
+    assert not cirq.has_stabilizer_effect(cirq.T)
+    assert not cirq.has_stabilizer_effect(cirq.CCNOT)
+    assert not cirq.has_stabilizer_effect(cirq.CCZ)
+
 
-def test_via_unitary_not_supported():
-    # Unitaries larger than 2x2 are not yet supported.
-    op = OpWithUnitary(cirq.unitary(cirq.CNOT))
-    assert not cirq.has_stabilizer_effect(op)
-    assert not cirq.has_stabilizer_effect(op)
+def test_via_decompose():
+    assert cirq.has_stabilizer_effect(cirq.Circuit(cirq.H.on_each(cirq.LineQubit.range(4))))
+    assert not cirq.has_stabilizer_effect(cirq.Circuit(cirq.T.on_each(cirq.LineQubit.range(4))))
+    assert not cirq.has_stabilizer_effect(
+        OpWithUnitary(cirq.unitary(cirq.Circuit(cirq.T.on_each(cirq.LineQubit.range(4)))))
+    )

cirq-ft/cirq_ft/algos/and_gate_test.py

@@ -14,6 +14,7 @@
 
 import itertools
 import random
+import sys
 from typing import List, Tuple
 
 import cirq
@@ -203,6 +204,7 @@ def test_and_gate_adjoint(cv: Tuple[int, int]):
         cirq_ft.testing.assert_circuit_inp_out_cirqsim(circuit, [c1, c2, t], inp, out)
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('and_gate')
 

cirq-ft/cirq_ft/algos/apply_gate_to_lth_target_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import pytest
@@ -101,5 +103,6 @@ def test_apply_gate_to_lth_qubit_make_on():
     assert op.gate.control_regs == op2.gate.control_regs
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('apply_gate_to_lth_target')

cirq-ft/cirq_ft/algos/generic_select_test.py

@@ -11,6 +11,8 @@
 # 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 sys
 from typing import List, Sequence
 
 import cirq
@@ -276,5 +278,6 @@ def test_generic_select_consistent_protocols_and_controlled():
         _ = gate.controlled(num_controls=2)
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('generic_select')

cirq-ft/cirq_ft/algos/hubbard_model_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import pytest
@@ -72,5 +74,6 @@ def test_hubbard_model_consistent_protocols():
     assert cirq.circuit_diagram_info(select_gate).wire_symbols == tuple(expected_symbols)
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('hubbard_model')

cirq-ft/cirq_ft/algos/qrom_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import itertools
+import sys
 
 import cirq
 import cirq_ft
@@ -114,6 +115,7 @@ def test_qrom_repr():
     cirq.testing.assert_equivalent_repr(qrom, setup_code="import cirq_ft\nimport numpy as np")
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('qrom')
 

cirq-ft/cirq_ft/algos/qubitization_walk_operator_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import numpy as np
@@ -240,6 +242,7 @@ def test_qubitization_walk_operator_consistent_protocols_and_controlled():
         _ = gate.controlled(num_controls=2)
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('qubitization_walk_operator')
     execute_notebook('phase_estimation_of_quantum_walk')

cirq-ft/cirq_ft/algos/state_preparation_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import numpy as np
@@ -93,5 +95,6 @@ def test_state_preparation_via_coherent_alias_sampling_diagram():
     )
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('state_preparation')

cirq-ft/cirq_ft/algos/swap_network_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import random
+import sys
 
 import cirq
 import cirq_ft
@@ -146,6 +147,7 @@ def test_multi_target_cswap_make_on():
     assert cswap1 == cswap2
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('swap_network')
 

cirq-ft/cirq_ft/algos/unary_iteration_gate_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import itertools
+import sys
 from typing import Sequence, Tuple
 
 import cirq
@@ -198,5 +199,6 @@ def test_unary_iteration_loop_empty_range():
     assert list(cirq_ft.unary_iteration(4, 3, [], [], [cirq.q('s')], qm)) == []
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('unary_iteration')

cirq-ft/cirq_ft/infra/gate_with_registers_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import numpy as np
@@ -169,5 +171,6 @@ def test_gate_with_registers():
     assert op1 == op2
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('gate_with_registers')

cirq-ft/cirq_ft/infra/t_complexity_protocol.py

@@ -81,7 +81,7 @@ def _is_clifford_or_t(stc: Any, fail_quietly: bool) -> Optional[TComplexity]:
     if isinstance(stc, cirq.ClassicallyControlledOperation):
         stc = stc.without_classical_controls()
 
-    if cirq.has_stabilizer_effect(stc):
+    if cirq.num_qubits(stc) <= 2 and cirq.has_stabilizer_effect(stc):
         # Clifford operation.
         return TComplexity(clifford=1)
 

cirq-ft/cirq_ft/infra/t_complexity_protocol_test.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import cirq
 import cirq_ft
 import pytest
@@ -207,5 +209,6 @@ def gate(self):
     cirq_ft.t_complexity.cache_clear()
 
 
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 def test_notebook():
     execute_notebook('t_complexity')

dev_tools/notebooks/notebook_test.py

@@ -21,6 +21,7 @@
 
 import importlib.metadata
 import os
+import sys
 import tempfile
 
 import pytest
@@ -86,6 +87,7 @@ def env_with_temporary_pip_target():
 
 
 @pytest.mark.slow
+@pytest.mark.skipif(sys.platform != "linux", reason="Linux-only test")
 @pytest.mark.parametrize("notebook_path", filter_notebooks(list_all_notebooks(), SKIP_NOTEBOOKS))
 def test_notebooks_against_cirq_head(
     notebook_path, require_packages_not_changed, env_with_temporary_pip_target

dev_tools/packaging/isolated_packages_test.py

@@ -21,10 +21,12 @@
 
 from dev_tools import shell_tools
 from dev_tools.modules import list_modules
+from dev_tools.test_utils import only_on_posix
 
 PACKAGES = ["-r", "dev_tools/requirements/isolated-base.env.txt"]
 
 
+@only_on_posix
 @pytest.mark.slow
 # ensure that no cirq packages are on the PYTHONPATH, this is important, otherwise
 # the "isolation" fails and for example cirq-core would be on the PATH