stimcirq 1.15.dev1743880617__tar.gz → 1.15.dev1743894906__tar.gz

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stimcirq
-Version: 1.15.dev1743880617
+Version: 1.15.dev1743894906
 Summary: Implements a cirq.Sampler backed by stim.
 Home-page: https://github.com/quantumlib/stim
 Author: Craig Gidney

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/setup.py

@@ -17,7 +17,7 @@ from setuptools import setup
 with open('README.md', encoding='UTF-8') as f:
     long_description = f.read()
 
-__version__ = '1.15.dev1743880617'
+__version__ = '1.15.dev1743894906'
 
 setup(
     name='stimcirq',

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.15.dev1743880617'
+__version__ = '1.15.dev1743894906'
 from ._cirq_to_stim import cirq_circuit_to_stim_circuit
 from ._cx_swap_gate import CXSwapGate
 from ._cz_swap_gate import CZSwapGate
@@ -12,6 +12,9 @@ from ._stim_to_cirq import (
 )
 from ._sweep_pauli import SweepPauli
 from ._two_qubit_asymmetric_depolarize import TwoQubitAsymmetricDepolarizingChannel
+from ._i_error_gate import IErrorGate
+from ._ii_error_gate import IIErrorGate
+from ._ii_gate import IIGate
 
 JSON_RESOLVERS_DICT = {
     "CumulativeObservableAnnotation": CumulativeObservableAnnotation,
@@ -22,5 +25,8 @@ JSON_RESOLVERS_DICT = {
     "TwoQubitAsymmetricDepolarizingChannel": TwoQubitAsymmetricDepolarizingChannel,
     "CXSwapGate": CXSwapGate,
     "CZSwapGate": CZSwapGate,
+    "IIGate": IIGate,
+    "IIErrorGate": IIErrorGate,
+    "IErrorGate": IErrorGate,
 }
 JSON_RESOLVER = JSON_RESOLVERS_DICT.get

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/_cirq_to_stim.py

@@ -6,6 +6,8 @@ from typing import Callable, cast, Dict, Iterable, List, Optional, Sequence, Tup
 import cirq
 import stim
 
+from ._i_error_gate import IErrorGate
+from ._ii_error_gate import IIErrorGate
 from ._ii_gate import IIGate
 
 

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/_cirq_to_stim_test.py

@@ -183,7 +183,7 @@ def test_frame_simulator_sampling_noisy_gates_agrees_with_cirq_data(gate: cirq.G
         allowed_variation = 5 * (expected_rate * (1 - expected_rate) / sample_count) ** 0.5
         if not 0 <= expected_rate - allowed_variation <= 1:
             raise ValueError("Not enough samples to bound results away from extremes.")
-        assert abs(expected_rate - actual_rate) < allowed_variation, (
+        assert abs(expected_rate - actual_rate) <= allowed_variation, (
             f"Sample rate {actual_rate} is over 5 standard deviations away from {expected_rate}.\n"
             f"Gate: {gate}\n"
             f"Test circuit:\n{circuit}\n"
@@ -230,7 +230,7 @@ def test_tableau_simulator_sampling_noisy_gates_agrees_with_cirq_data(gate: cirq
         allowed_variation = 5 * (expected_rate * (1 - expected_rate) / sample_count) ** 0.5
         if not 0 <= expected_rate - allowed_variation <= 1:
             raise ValueError("Not enough samples to bound results away from extremes.")
-        assert abs(expected_rate - actual_rate) < allowed_variation, (
+        assert abs(expected_rate - actual_rate) <= allowed_variation, (
             f"Sample rate {actual_rate} is over 5 standard deviations away from {expected_rate}.\n"
             f"Gate: {gate}\n"
             f"Test circuit:\n{circuit}\n"
@@ -336,8 +336,11 @@ def test_on_loop():
             repetitions=3,
         )
     )
-    result = stimcirq.StimSampler().run(c)
-    assert result.measurements.keys() == {'0:a', '0:b', '1:a', '1:b', '2:a', '2:b'}
+    result_normal = cirq.Simulator().run(c)
+    result_stim = stimcirq.StimSampler().run(c)
+    assert result_normal.records.keys() == result_stim.records.keys()
+    for k in result_normal.records.keys():
+        assert result_stim.records[k].shape == result_normal.records[k].shape
 
 
 def test_multi_moment_circuit_operation():

stimcirq-1.15.dev1743894906/stimcirq/_i_error_gate.py

@@ -0,0 +1,41 @@
+from typing import Any, Dict, List, Iterable
+
+import cirq
+import stim
+
+
+
+@cirq.value_equality
+class IErrorGate(cirq.Gate):
+    """Handles explaining stim's I_ERROR gate to cirq."""
+
+    def __init__(self, gate_args: Iterable[float]):
+        self.gate_args = tuple(gate_args)
+
+    def _num_qubits_(self) -> int:
+        return 1
+
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> List[str]:
+        return [f'I_ERROR({self.gate_args})']
+
+    def _value_equality_values_(self):
+        return self.gate_args
+
+    def _decompose_(self, qubits):
+        pass
+
+    def _stim_conversion_(self, edit_circuit: stim.Circuit, targets: List[int], tag: str, **kwargs):
+        edit_circuit.append('I_ERROR', targets, arg=self.gate_args, tag=tag)
+
+    def __str__(self) -> str:
+        return 'I_ERROR(' + ",".join(str(e) for e in self.gate_args) + ')'
+
+    def __repr__(self):
+        return f'stimcirq.IErrorGate({self.gate_args!r})'
+
+    @staticmethod
+    def _json_namespace_() -> str:
+        return ''
+
+    def _json_dict_(self) -> Dict[str, Any]:
+        return {'gate_args': self.gate_args}

stimcirq-1.15.dev1743894906/stimcirq/_i_error_gate_test.py

@@ -0,0 +1,24 @@
+import cirq
+import stimcirq
+
+
+def test_repr():
+    r = stimcirq.IErrorGate([0.25, 0.125])
+    assert eval(repr(r), {'stimcirq': stimcirq}) == r
+    r = stimcirq.IErrorGate([])
+    assert eval(repr(r), {'stimcirq': stimcirq}) == r
+
+
+def test_json_serialization():
+    r = stimcirq.IErrorGate([0.25, 0.125])
+    c = cirq.Circuit(r(cirq.LineQubit(1)))
+    json = cirq.to_json(c)
+    c2 = cirq.read_json(json_text=json, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER])
+    assert c == c2
+
+
+def test_json_backwards_compat_exact():
+    raw = stimcirq.IErrorGate([0.25, 0.125])
+    packed = '{\n  "cirq_type": "IErrorGate",\n  "gate_args": [\n    0.25,\n    0.125\n  ]\n}'
+    assert cirq.read_json(json_text=packed, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER]) == raw
+    assert cirq.to_json(raw) == packed

stimcirq-1.15.dev1743894906/stimcirq/_ii_error_gate.py

@@ -0,0 +1,41 @@
+from typing import Any, Dict, List, Iterable
+
+import cirq
+import stim
+
+
+
+@cirq.value_equality
+class IIErrorGate(cirq.Gate):
+    """Handles explaining stim's II_ERROR gate to cirq."""
+
+    def __init__(self, gate_args: Iterable[float]):
+        self.gate_args = tuple(gate_args)
+
+    def _num_qubits_(self) -> int:
+        return 2
+
+    def _circuit_diagram_info_(self, args: cirq.CircuitDiagramInfoArgs) -> List[str]:
+        return [f'II_ERROR({self.gate_args})', f'II_ERROR({self.gate_args})']
+
+    def _value_equality_values_(self):
+        return self.gate_args
+
+    def _decompose_(self, qubits):
+        pass
+
+    def _stim_conversion_(self, edit_circuit: stim.Circuit, targets: List[int], tag: str, **kwargs):
+        edit_circuit.append('II_ERROR', targets, arg=self.gate_args, tag=tag)
+
+    def __str__(self) -> str:
+        return 'II_ERROR(' + ",".join(str(e) for e in self.gate_args) + ')'
+
+    def __repr__(self):
+        return f'stimcirq.IIErrorGate({self.gate_args!r})'
+
+    @staticmethod
+    def _json_namespace_() -> str:
+        return ''
+
+    def _json_dict_(self) -> Dict[str, Any]:
+        return {'gate_args': self.gate_args}

stimcirq-1.15.dev1743894906/stimcirq/_ii_error_gate_test.py

@@ -0,0 +1,24 @@
+import cirq
+import stimcirq
+
+
+def test_repr():
+    r = stimcirq.IIErrorGate([0.25, 0.125])
+    assert eval(repr(r), {'stimcirq': stimcirq}) == r
+    r = stimcirq.IIErrorGate([])
+    assert eval(repr(r), {'stimcirq': stimcirq}) == r
+
+
+def test_json_serialization():
+    r = stimcirq.IIErrorGate([0.25, 0.125])
+    c = cirq.Circuit(r(cirq.LineQubit(1), cirq.LineQubit(3)))
+    json = cirq.to_json(c)
+    c2 = cirq.read_json(json_text=json, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER])
+    assert c == c2
+
+
+def test_json_backwards_compat_exact():
+    raw = stimcirq.IIErrorGate([0.25, 0.125])
+    packed = '{\n  "cirq_type": "IIErrorGate",\n  "gate_args": [\n    0.25,\n    0.125\n  ]\n}'
+    assert cirq.read_json(json_text=packed, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER]) == raw
+    assert cirq.to_json(raw) == packed

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/_ii_gate.py

@@ -3,7 +3,6 @@ from typing import Any, Dict, List
 import cirq
 import stim
 
-
 @cirq.value_equality
 class IIGate(cirq.Gate):
     """Handles explaining stim's II gate to cirq."""

stimcirq-1.15.dev1743894906/stimcirq/_ii_gate_test.py

@@ -0,0 +1,22 @@
+import cirq
+import stimcirq
+
+
+def test_repr():
+    r = stimcirq.IIGate()
+    assert eval(repr(r), {'stimcirq': stimcirq}) == r
+
+
+def test_json_serialization():
+    r = stimcirq.IIGate()
+    c = cirq.Circuit(r(cirq.LineQubit(1), cirq.LineQubit(3)))
+    json = cirq.to_json(c)
+    c2 = cirq.read_json(json_text=json, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER])
+    assert c == c2
+
+
+def test_json_backwards_compat_exact():
+    raw = stimcirq.IIGate()
+    packed = '{\n  "cirq_type": "IIGate"\n}'
+    assert cirq.read_json(json_text=packed, resolvers=[*cirq.DEFAULT_RESOLVERS, stimcirq.JSON_RESOLVER]) == raw
+    assert cirq.to_json(raw) == packed

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/_stim_to_cirq.py

@@ -18,6 +18,8 @@ import stim
 from ._cx_swap_gate import CXSwapGate
 from ._cz_swap_gate import CZSwapGate
 from ._det_annotation import DetAnnotation
+from ._ii_error_gate import IIErrorGate
+from ._i_error_gate import IErrorGate
 from ._ii_gate import IIGate
 from ._measure_and_or_reset_gate import MeasureAndOrResetGate
 from ._obs_annotation import CumulativeObservableAnnotation
@@ -457,6 +459,17 @@ class CircuitTranslationTracker:
                 self.prob_to_gate(instruction.gate_args_copy()[0]), instruction
             )
 
+    class MultiArgumentGateHandler:
+        def __init__(self, args_to_gate: Callable[[List[float]], cirq.Gate]):
+            self.args_to_gate = args_to_gate
+
+        def __call__(
+            self, tracker: 'CircuitTranslationTracker', instruction: stim.CircuitInstruction
+        ) -> None:
+            tracker.process_gate_instruction(
+                self.args_to_gate(instruction.gate_args_copy()), instruction
+            )
+
     @staticmethod
     @functools.lru_cache(maxsize=1)
     def get_handler_table() -> Dict[
@@ -465,6 +478,7 @@ class CircuitTranslationTracker:
         gate = CircuitTranslationTracker.OneToOneGateHandler
         measure_gate = CircuitTranslationTracker.OneToOneMeasurementHandler
         noise = CircuitTranslationTracker.OneToOneNoisyGateHandler
+        multi_arg = CircuitTranslationTracker.MultiArgumentGateHandler
         sweep_gate = CircuitTranslationTracker.SweepableGateHandler
 
         def not_impl(message) -> Callable[[Any, Any], None]:
@@ -580,8 +594,8 @@ class CircuitTranslationTracker:
             "X_ERROR": noise(cirq.X.with_probability),
             "Y_ERROR": noise(cirq.Y.with_probability),
             "Z_ERROR": noise(cirq.Z.with_probability),
-            "I_ERROR": noise(cirq.I.with_probability),
-            "II_ERROR": noise(IIGate().with_probability),
+            "I_ERROR": multi_arg(IErrorGate),
+            "II_ERROR": multi_arg(IIErrorGate),
             "PAULI_CHANNEL_1": CircuitTranslationTracker.process_pauli_channel_1,
             "PAULI_CHANNEL_2": CircuitTranslationTracker.process_pauli_channel_2,
             "ELSE_CORRELATED_ERROR": not_impl(

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq/_stim_to_cirq_test.py

@@ -1,12 +1,11 @@
-import inspect
 import itertools
-from typing import Any, Callable, cast, Tuple, Union
+from typing import cast
 
 import cirq
 import pytest
 import stim
-import stimcirq
 
+import stimcirq
 from ._stim_to_cirq import CircuitTranslationTracker
 
 
@@ -619,7 +618,7 @@ def test_stim_circuit_to_cirq_circuit_mpad():
     cirq_circuit = stimcirq.stim_circuit_to_cirq_circuit(stim_circuit)
     assert cirq_circuit == cirq.Circuit(
         cirq.PauliMeasurementGate(cirq.DensePauliString(""), key="0").on(),
-        cirq.PauliMeasurementGate(-cirq.DensePauliString(""), key="1").on(),
+        cirq.PauliMeasurementGate(cirq.DensePauliString("", coefficient=-1), key="1").on(),
     )
 
 
@@ -633,8 +632,8 @@ def test_stim_circuit_to_cirq_circuit_mxx_myy_mzz():
     a, b = cirq.LineQubit.range(2)
     assert cirq_circuit == cirq.Circuit(
         cirq.PauliMeasurementGate(cirq.DensePauliString("XX"), key='0').on(a, b),
-        cirq.PauliMeasurementGate(-cirq.DensePauliString("YY"), key='1').on(a, b),
-        cirq.PauliMeasurementGate(-cirq.DensePauliString("ZZ"), key='2').on(a, b),
+        cirq.PauliMeasurementGate(cirq.DensePauliString("YY", coefficient=-1), key='1').on(a, b),
+        cirq.PauliMeasurementGate(cirq.DensePauliString("ZZ", coefficient=-1), key='2').on(a, b),
     )
     assert stimcirq.cirq_circuit_to_stim_circuit(cirq_circuit) == stim.Circuit("""
         MPP X0*X1
@@ -751,3 +750,16 @@ def test_loop_tagging():
     )
     restored_circuit = stimcirq.cirq_circuit_to_stim_circuit(cirq_circuit)
     assert restored_circuit == stim_circuit
+
+
+def test_id_error_round_trip():
+    stim_circuit = stim.Circuit("""
+        I_ERROR 0
+        I_ERROR(0.125, 0.25) 1
+        II_ERROR(0.25, 0.125) 2 3
+        II_ERROR 4 5
+        TICK
+    """)
+    cirq_circuit = stimcirq.stim_circuit_to_cirq_circuit(stim_circuit)
+    restored_circuit = stimcirq.cirq_circuit_to_stim_circuit(cirq_circuit)
+    assert restored_circuit == stim_circuit

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stimcirq
-Version: 1.15.dev1743880617
+Version: 1.15.dev1743894906
 Summary: Implements a cirq.Sampler backed by stim.
 Home-page: https://github.com/quantumlib/stim
 Author: Craig Gidney

{stimcirq-1.15.dev1743880617 → stimcirq-1.15.dev1743894906}/stimcirq.egg-info/SOURCES.txt

@@ -9,7 +9,12 @@ stimcirq/_cz_swap_gate.py
 stimcirq/_cz_swap_test.py
 stimcirq/_det_annotation.py
 stimcirq/_det_annotation_test.py
+stimcirq/_i_error_gate.py
+stimcirq/_i_error_gate_test.py
+stimcirq/_ii_error_gate.py
+stimcirq/_ii_error_gate_test.py
 stimcirq/_ii_gate.py
+stimcirq/_ii_gate_test.py
 stimcirq/_measure_and_or_reset_gate.py
 stimcirq/_measure_and_or_reset_gate_test.py
 stimcirq/_obs_annotation.py