cirq-core 1.5.0.dev20241122173038__py3-none-any.whl → 1.5.0.dev20241202190033__py3-none-any.whl

cirq/_version.py

@@ -28,4 +28,4 @@ if sys.version_info < (3, 10, 0):  # pragma: no cover
         'of cirq (e.g. "python -m pip install cirq==1.1.*")'
     )
 
-__version__ = "1.5.0.dev20241122173038"
+__version__ = "1.5.0.dev20241202190033"

cirq/_version_test.py

@@ -3,4 +3,4 @@ import cirq
 
 
 def test_version():
-    assert cirq.__version__ == "1.5.0.dev20241122173038"
+    assert cirq.__version__ == "1.5.0.dev20241202190033"

cirq/contrib/qasm_import/_lexer.py

@@ -32,6 +32,7 @@ class QasmLexer:
         'bit': 'BIT',
         'creg': 'CREG',
         'measure': 'MEASURE',
+        'reset': 'RESET',
         'if': 'IF',
         '->': 'ARROW',
         '==': 'EQ',
@@ -115,6 +116,10 @@ class QasmLexer:
         r"""measure"""
         return t
 
+    def t_RESET(self, t):
+        r"""reset"""
+        return t
+
     def t_IF(self, t):
         r"""if"""
         return t

cirq/contrib/qasm_import/_parser.py

@@ -300,6 +300,7 @@ class QasmParser:
     # circuit : new_reg circuit
     #         | gate_op circuit
     #         | measurement circuit
+    #         | reset circuit
     #         | if circuit
     #         | empty
 
@@ -310,6 +311,7 @@ class QasmParser:
     def p_circuit_gate_or_measurement_or_if(self, p):
         """circuit :  circuit gate_op
         |  circuit measurement
+        |  circuit reset
         |  circuit if"""
         self.circuit.append(p[2])
         p[0] = self.circuit
@@ -526,6 +528,15 @@ class QasmParser:
             ops.MeasurementGate(num_qubits=1, key=creg[i]).on(qreg[i]) for i in range(len(qreg))
         ]
 
+    # reset operations
+    # reset : RESET qarg
+
+    def p_reset(self, p):
+        """reset : RESET qarg ';'"""
+        qreg = p[2]
+
+        p[0] = [ops.ResetChannel().on(qreg[i]) for i in range(len(qreg))]
+
     # if operations
     # if : IF '(' carg EQ NATURAL_NUMBER ')' ID qargs
 

cirq/contrib/qasm_import/_parser_test.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import textwrap
 from typing import Callable
 
 import numpy as np
@@ -706,6 +707,35 @@ def test_measurement_bounds():
         parser.parse(qasm)
 
 
+def test_reset():
+    qasm = textwrap.dedent(
+        """\
+        OPENQASM 2.0;
+        include "qelib1.inc";
+        qreg q[1];
+        creg c[1];
+        x q[0];
+        reset q[0];
+        measure q[0] -> c[0];
+        """
+    )
+
+    parser = QasmParser()
+
+    q_0 = cirq.NamedQubit('q_0')
+
+    expected_circuit = Circuit([cirq.X(q_0), cirq.reset(q_0), cirq.measure(q_0, key='c_0')])
+
+    parsed_qasm = parser.parse(qasm)
+
+    assert parsed_qasm.supportedFormat
+    assert parsed_qasm.qelib1Include
+
+    ct.assert_same_circuits(parsed_qasm.circuit, expected_circuit)
+    assert parsed_qasm.qregs == {'q': 1}
+    assert parsed_qasm.cregs == {'c': 1}
+
+
 def test_u1_gate():
     qasm = """
      OPENQASM 2.0;
@@ -1068,12 +1098,13 @@ def test_openqasm_3_0_qubits():
      x q[0];
 
      b[0] = measure q[0];
+     reset q[0];
     """
     parser = QasmParser()
 
     q0 = cirq.NamedQubit('q_0')
 
-    expected_circuit = Circuit([cirq.X.on(q0), cirq.measure(q0, key='b_0')])
+    expected_circuit = Circuit([cirq.X.on(q0), cirq.measure(q0, key='b_0'), cirq.reset(q0)])
 
     parsed_qasm = parser.parse(qasm)
 
@@ -1092,12 +1123,13 @@ def test_openqasm_3_0_scalar_qubit():
      x q;
 
      b = measure q;
+     reset q;
     """
     parser = QasmParser()
 
     q0 = cirq.NamedQubit('q_0')
 
-    expected_circuit = Circuit([cirq.X.on(q0), cirq.measure(q0, key='b_0')])
+    expected_circuit = Circuit([cirq.X.on(q0), cirq.measure(q0, key='b_0'), cirq.reset(q0)])
 
     parsed_qasm = parser.parse(qasm)
 

cirq/experiments/readout_confusion_matrix.py

@@ -26,20 +26,6 @@ if TYPE_CHECKING:
     import cirq
 
 
-def _mitigate_single_bitstring(z_rinv_all: list[np.ndarray], bitstring: np.ndarray) -> float:
-    """Return the mitigated Pauli expectation value for a single observed bitstring.
-
-    Args:
-        z_rinv_all: A list of single-qubit pauli-Z (as a vector) contracted with the single-qubit
-            inverse response matrix, for each qubit.
-        bitstring: The measured bitstring.
-
-    Returns:
-        The corrected expectation value of ZZZZZ... given the single measured bitstring.
-    """
-    return np.prod([z_rinv[bit] for z_rinv, bit in zip(z_rinv_all, bitstring)])
-
-
 class TensoredConfusionMatrices:
     """Store and use confusion matrices for readout error mitigation on sets of qubits.
 
@@ -348,7 +334,10 @@ class TensoredConfusionMatrices:
                                  confusion matrices for all of `qubits`.
         """
 
-        # first, get all of the confusion matrices
+        # in case given as an array of bools, convert to an array of ints:
+        measured_bitstrings = measured_bitstrings.astype(int)
+
+        # get all of the confusion matrices
         cm_all = []
         for qubit in qubits:
             try:
@@ -365,15 +354,10 @@ class TensoredConfusionMatrices:
 
         # next, contract them with the single-qubit Pauli operators:
         z = np.array([1, -1])
-        z_cminv_all = [z @ cminv for cminv in cminv_all]
+        z_cminv_all = np.array([z @ cminv for cminv in cminv_all])
 
         # finally, mitigate each bitstring:
-        z_mit_all_shots = np.array(
-            [
-                _mitigate_single_bitstring(z_cminv_all, bitstring)
-                for bitstring in measured_bitstrings
-            ]
-        )
+        z_mit_all_shots = np.prod(np.einsum("iji->ij", z_cminv_all[:, measured_bitstrings]), axis=0)
 
         # return mean and statistical uncertainty:
         return np.mean(z_mit_all_shots), np.std(z_mit_all_shots) / np.sqrt(len(measured_bitstrings))

{cirq_core-1.5.0.dev20241122173038.dist-info → cirq_core-1.5.0.dev20241202190033.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cirq-core
-Version: 1.5.0.dev20241122173038
+Version: 1.5.0.dev20241202190033
 Summary: A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits.
 Home-page: http://github.com/quantumlib/cirq
 Author: The Cirq Developers

{cirq_core-1.5.0.dev20241122173038.dist-info → cirq_core-1.5.0.dev20241202190033.dist-info}/RECORD

@@ -4,8 +4,8 @@ cirq/_compat_test.py,sha256=Qq3ZcfgD-Nb81cEppQdJqhAyrVqXKtfXZYGXT0p-Wh0,34718
 cirq/_doc.py,sha256=yDyWUD_2JDS0gShfGRb-rdqRt9-WeL7DhkqX7np0Nko,2879
 cirq/_import.py,sha256=p9gMHJscbtDDkfHOaulvd3Aer0pwUF5AXpL89XR8dNw,8402
 cirq/_import_test.py,sha256=6K_v0riZJXOXUphHNkGA8MY-JcmGlezFaGmvrNhm3OQ,1015
-cirq/_version.py,sha256=cXnObSc4jh25fDMNoaPWQ5f9EWNeQlSkrnE-8h_58Fc,1206
-cirq/_version_test.py,sha256=1NNSquOuZBon7uf5AJWxpzksetacHdW9i7_g3kdIqS8,147
+cirq/_version.py,sha256=v0e_6TCcugpK-r2nscoBL-iteaqlJZt1goTisE6ShaU,1206
+cirq/_version_test.py,sha256=2cwhv7SmKdX3SE5QdUGho3LEhv43iYvSao5mZXB-Ddc,147
 cirq/conftest.py,sha256=X7yLFL8GLhg2CjPw0hp5e_dGASfvHx1-QT03aUbhKJw,1168
 cirq/json_resolver_cache.py,sha256=ytePZtNZgKjOF2NiVpUTuotB-JKZmQNOFIFdvXqsxHw,13271
 cirq/py.typed,sha256=VFSlmh_lNwnaXzwY-ZuW-C2Ws5PkuDoVgBdNCs0jXJE,63
@@ -103,10 +103,10 @@ cirq/contrib/paulistring/recombine_test.py,sha256=hJ083nR67JsIs38TfmCjmBLnhqyG0r
 cirq/contrib/paulistring/separate.py,sha256=2g4l78mXYJDR6xkv51VExZDb-rm5JEvhYrpMPgWa0Us,3961
 cirq/contrib/paulistring/separate_test.py,sha256=FzR78MSHDhNJxizbXreK6u3BeYhT7xn7W1QyHfEZ34E,1267
 cirq/contrib/qasm_import/__init__.py,sha256=RKX0vGDC2Pe5rH5rM4ClXdvtrAU16ePFImQpiJtJVNo,744
-cirq/contrib/qasm_import/_lexer.py,sha256=1BGtCS2RetdiYPNOe_ZnMeoEl-AVBvvee_7y-h8tYcE,3275
+cirq/contrib/qasm_import/_lexer.py,sha256=J0ExK_6VGMoql0ha0hrxHzbFuqFYazHSSruhgznI66Y,3366
 cirq/contrib/qasm_import/_lexer_test.py,sha256=iiz-cmIt5hnhHBc4ub4btqHnbi4EPaO7BE7bsJKPet8,4142
-cirq/contrib/qasm_import/_parser.py,sha256=e9ztG69dYm8dewM6efizbMT-Mf1n88hffg4ToBu0pig,20153
-cirq/contrib/qasm_import/_parser_test.py,sha256=2XEfhoiHWDpnGh3yYrenekGTIYapDtf52AMzYulajRY,28374
+cirq/contrib/qasm_import/_parser.py,sha256=3hTbb7ZzEIS8OoGPo2efemzDQT_dTUS9Yjxt3IP6A4s,20416
+cirq/contrib/qasm_import/_parser_test.py,sha256=XwQ6KrrKCgQwXK4u6-I3suFWGdtScNZdTdQT_ykCcuQ,29108
 cirq/contrib/qasm_import/exception.py,sha256=Wm6cwUPIkNMPjkv-ELpQ-zSoXaiLOddOQ4iYybwuS6I,695
 cirq/contrib/qasm_import/qasm.py,sha256=CP444IWCw4zlDNA7HxsTJ2xIak4mZhQv62ZiLlUc2zo,914
 cirq/contrib/qasm_import/qasm_test.py,sha256=e5b7LVn_6FIFZ6kINqMzJFIjzgtTgutVhgXgX_DcTc0,1861
@@ -187,7 +187,7 @@ cirq/experiments/qubit_characterizations.py,sha256=-a-krc7Pw68VjsVvQmeZ92oXrpeME
 cirq/experiments/qubit_characterizations_test.py,sha256=b_ONqxyW6s01Ts8T65BEdb4e8Xy24Qp4zTGXWesL0ic,9733
 cirq/experiments/random_quantum_circuit_generation.py,sha256=GIA4qdrgECcZlvGOiWtKL0hGyuNJbRtzhrzPJXKI0iQ,28167
 cirq/experiments/random_quantum_circuit_generation_test.py,sha256=1rvgN8-Ajedn_70FyYKVzjvzR6NVpHj6KQgo6tra-Jc,15995
-cirq/experiments/readout_confusion_matrix.py,sha256=jIyikXfYWGbVrOjU1pbV2VZL-m03VTFYS18KT1Cf2qk,21404
+cirq/experiments/readout_confusion_matrix.py,sha256=5yS7VXDe9LHYn_6YRYek-HZ9ftEBmCTn5__TYSUONGQ,20875
 cirq/experiments/readout_confusion_matrix_test.py,sha256=ETvKHVuJWvq8KuL0l6w22UOfZHhBNH-TVeWAKqjSQEc,10632
 cirq/experiments/single_qubit_readout_calibration.py,sha256=x6fF6GqU1D4YY05YvW1DFlTlbjC12_bfj7W2psd75-U,14722
 cirq/experiments/single_qubit_readout_calibration_test.py,sha256=_002QXj2rIFHkH3vw9iTVMh45vCPuCI_fTqOUK8uMe4,7718
@@ -1187,8 +1187,8 @@ cirq/work/sampler.py,sha256=y6qtCpAwO8SqZ_JKU8PwlbMLHpJskNPqGWD_pNbyZew,19779
 cirq/work/sampler_test.py,sha256=hL2UWx3dz2ukZVNxWftiKVvJcQoLplLZdQm-k1QcA40,13282
 cirq/work/zeros_sampler.py,sha256=x1C7cup66a43n-3tm8QjhiqJa07qcJW10FxNp9jJ59Q,2356
 cirq/work/zeros_sampler_test.py,sha256=JIkpBBFPJe5Ba4142vzogyWyboG1Q1ZAm0UVGgOoZn8,3279
-cirq_core-1.5.0.dev20241122173038.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-cirq_core-1.5.0.dev20241122173038.dist-info/METADATA,sha256=VH24wo8YSSqYHFvLY6zfFlfM3ODnFzDpfIR9zFGCTjM,1992
-cirq_core-1.5.0.dev20241122173038.dist-info/WHEEL,sha256=bFJAMchF8aTQGUgMZzHJyDDMPTO3ToJ7x23SLJa1SVo,92
-cirq_core-1.5.0.dev20241122173038.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
-cirq_core-1.5.0.dev20241122173038.dist-info/RECORD,,
+cirq_core-1.5.0.dev20241202190033.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+cirq_core-1.5.0.dev20241202190033.dist-info/METADATA,sha256=arpql58a9I3zdvyBWRoSj707zgIr2yg8mJ-McHybwik,1992
+cirq_core-1.5.0.dev20241202190033.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+cirq_core-1.5.0.dev20241202190033.dist-info/top_level.txt,sha256=Sz9iOxHU0IEMLSFGwiwOCaN2e9K-jFbBbtpPN1hB73g,5
+cirq_core-1.5.0.dev20241202190033.dist-info/RECORD,,

{cirq_core-1.5.0.dev20241122173038.dist-info → cirq_core-1.5.0.dev20241202190033.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.45.0)
+Generator: bdist_wheel (0.45.1)
 Root-Is-Purelib: true
 Tag: py3-none-any