qiskit 1.2.2__tar.gz → 1.2.3__tar.gz

{qiskit-1.2.2 → qiskit-1.2.3}/Cargo.lock

@@ -1161,7 +1161,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-accelerate"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "ahash 0.8.11",
  "approx",
@@ -1189,7 +1189,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-circuit"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "bytemuck",
  "hashbrown 0.14.5",
@@ -1203,7 +1203,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-pyext"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "pyo3",
  "qiskit-accelerate",
@@ -1214,7 +1214,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-qasm2"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "hashbrown 0.14.5",
  "num-bigint",
@@ -1224,7 +1224,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-qasm3"
-version = "1.2.2"
+version = "1.2.3"
 dependencies = [
  "hashbrown 0.14.5",
  "indexmap",

{qiskit-1.2.2 → qiskit-1.2.3}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 
 [workspace.package]
-version = "1.2.2"
+version = "1.2.3"
 edition = "2021"
 rust-version = "1.70"  # Keep in sync with README.md and rust-toolchain.toml.
 license = "Apache-2.0"

{qiskit-1.2.2 → qiskit-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qiskit
-Version: 1.2.2
+Version: 1.2.3
 Summary: An open-source SDK for working with quantum computers at the level of extended quantum circuits, operators, and primitives.
 Author-email: Qiskit Development Team <qiskit@us.ibm.com>
 License: Apache 2.0
@@ -36,7 +36,7 @@ Requires-Dist: dill>=0.3
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: stevedore>=3.0.0
 Requires-Dist: typing-extensions
-Requires-Dist: symengine>=0.11
+Requires-Dist: symengine<0.14,>=0.11
 Provides-Extra: qasm3-import
 Requires-Dist: qiskit-qasm3-import>=0.1.0; extra == "qasm3-import"
 Provides-Extra: visualization

{qiskit-1.2.2 → qiskit-1.2.3}/crates/qasm3/src/circuit.rs

@@ -21,7 +21,7 @@ pub trait PyRegister {
     // or at a minimum
     //      fn iter<'a>(&'a self, py: Python<'a>) -> ::pyo3::types::iter::PyListIterator<'a>;
     // but we can't use the former before Rust 1.75 and the latter before PyO3 0.21.
-    fn bit_list<'a>(&'a self, py: Python<'a>) -> &Bound<'a, PyList>;
+    fn bit_list<'a>(&'a self, py: Python<'a>) -> &'a Bound<'a, PyList>;
 }
 
 macro_rules! register_type {
@@ -38,7 +38,7 @@ macro_rules! register_type {
         }
 
         impl PyRegister for $name {
-            fn bit_list<'a>(&'a self, py: Python<'a>) -> &Bound<'a, PyList> {
+            fn bit_list<'a>(&'a self, py: Python<'a>) -> &'a Bound<'a, PyList> {
                 self.items.bind(py)
             }
         }
@@ -286,7 +286,7 @@ pub struct PyCircuit(Py<PyAny>);
 
 impl PyCircuit {
     /// Untyped access to the inner Python object.
-    pub fn inner<'a>(&'a self, py: Python<'a>) -> &Bound<'a, PyAny> {
+    pub fn inner<'a>(&'a self, py: Python<'a>) -> &'a Bound<'a, PyAny> {
         self.0.bind(py)
     }
 

qiskit-1.2.3/qiskit/VERSION.txt

@@ -0,0 +1 @@
+1.2.3

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/circuit/__init__.py

@@ -455,7 +455,7 @@ attempt to "close over" outer circuit registers, or use hidden parameters inside
 :class:`Instruction`\ s can be related to other circuits to provide a decompositions by using
 their :attr:`Instruction.definition` attribute, which provides a local, one-off decomposition.  This
 can be in whatever basis set of operations is most convenient to you, as long as the definitions of
-all contained gates have some topological order; that is, you cannot use a gate in a definition it
+all contained gates have some topological order; that is, you cannot use a gate in a definition if
 its own definition depends on the parent.  If the :class:`Instruction` should be considered entirely
 opaque to optimizers, its :attr:`~Instruction.definition` can be ``None``.  See
 :ref:`circuit-custom-gates` for more detail.

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/circuit/library/standard_gates/rxx.py

@@ -63,7 +63,7 @@ class RXXGate(Gate):
 
         .. math::
 
-            R_{XX}(\theta = \pi) = i X \otimes X
+            R_{XX}(\theta = \pi) = -i X \otimes X
 
         .. math::
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/circuit/library/standard_gates/ryy.py

@@ -63,7 +63,7 @@ class RYYGate(Gate):
 
         .. math::
 
-            R_{YY}(\theta = \pi) = i Y \otimes Y
+            R_{YY}(\theta = \pi) = -i Y \otimes Y
 
         .. math::
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/circuit/library/standard_gates/rzx.py

@@ -108,7 +108,7 @@ class RZXGate(Gate):
 
         .. math::
 
-            R_{ZX}(\theta = \pi) = -i Z \otimes X
+            R_{ZX}(\theta = \pi) = -i X \otimes Z
 
         .. math::
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/qpy/__init__.py

@@ -116,6 +116,30 @@ and how the feature will be internally handled.
 
 .. autoexception:: QPYLoadingDeprecatedFeatureWarning
 
+.. note::
+
+    With versions of Qiskit before 1.2.3, the ``use_symengine=True`` argument to :func:`.qpy.dump`
+    could cause problems with backwards compatibility if there were :class:`.ParameterExpression`
+    objects to serialize.  In particular:
+
+    * When the loading version of Qiskit is 1.2.3 or greater, QPY files generated with any version
+      of Qiskit >= 0.46.0 can be loaded.  If a version of Qiskit between 0.45.0 and 0.45.3 was used
+      to generate the files, and the non-default argument ``use_symengine=True`` was given to
+      :func:`.qpy.dump`, the file can only be read if the version of ``symengine`` used in the
+      generating environment was in the 0.11 or 0.13 series. However, if the environment was created
+      during the support window of Qiskit 0.45, it is likely that ``symengine==0.9.2`` was used.
+
+    * When the loading version of Qiskit is between 0.46.0 and 1.2.2 inclusive, the file can only be
+      read if the installed version of ``symengine`` in the loading environment matches the version
+      used in the generating environment.
+
+    To recover a QPY file that fails with ``symengine`` version-related errors during a call to
+    :func:`.qpy.load`, try first to use Qiskit >= 1.2.3 to load the file.  If this still fails,
+    it is likely because Qiskit 0.45.x was used to generate the file with ``use_symengine=True``.
+    In this case, use Qiskit 0.45.3 with ``symengine==0.9.2`` to load the file, and then re-export
+    it to QPY setting ``use_symengine=False``.  The resulting file can then be loaded by any later
+    version of Qiskit.
+
 QPY format version history
 --------------------------
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/qpy/binary_io/schedules.py

@@ -20,9 +20,6 @@ from io import BytesIO
 
 import numpy as np
 import symengine as sym
-from symengine.lib.symengine_wrapper import (  # pylint: disable = no-name-in-module
-    load_basic,
-)
 
 from qiskit.exceptions import QiskitError
 from qiskit.pulse import library, channels, instructions
@@ -106,7 +103,7 @@ def _loads_symbolic_expr(expr_bytes, use_symengine=False):
         return None
     expr_bytes = zlib.decompress(expr_bytes)
     if use_symengine:
-        return load_basic(expr_bytes)
+        return common.load_symengine_payload(expr_bytes)
     else:
         from sympy import parse_expr
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/qpy/binary_io/value.py

@@ -20,9 +20,6 @@ import uuid
 
 import numpy as np
 import symengine
-from symengine.lib.symengine_wrapper import (  # pylint: disable = no-name-in-module
-    load_basic,
-)
 
 
 from qiskit.circuit import CASE_DEFAULT, Clbit, ClassicalRegister
@@ -290,7 +287,7 @@ def _read_parameter_expression_v3(file_obj, vectors, use_symengine):
 
     payload = file_obj.read(data.expr_size)
     if use_symengine:
-        expr_ = load_basic(payload)
+        expr_ = common.load_symengine_payload(payload)
     else:
         from sympy.parsing.sympy_parser import parse_expr
 

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/qpy/common.py

@@ -18,7 +18,12 @@ Common functions across several serialization and deserialization modules.
 import io
 import struct
 
-from qiskit.qpy import formats
+import symengine
+from symengine.lib.symengine_wrapper import (  # pylint: disable = no-name-in-module
+    load_basic,
+)
+
+from qiskit.qpy import formats, exceptions
 
 QPY_VERSION = 12
 QPY_COMPATIBILITY_VERSION = 10
@@ -304,3 +309,42 @@ def mapping_from_binary(binary_data, deserializer, **kwargs):
         mapping = read_mapping(container, deserializer, **kwargs)
 
     return mapping
+
+
+def load_symengine_payload(payload: bytes) -> symengine.Expr:
+    """Load a symengine expression from its serialized cereal payload."""
+    # This is a horrible hack to workaround the symengine version checking
+    # it's deserialization does. There were no changes to the serialization
+    # format between 0.11 and 0.13 but the deserializer checks that it can't
+    # load across a major or minor version boundary. This works around it
+    # by just lying about the generating version.
+    symengine_version = symengine.__version__.split(".")
+    major = payload[2]
+    minor = payload[3]
+    if int(symengine_version[1]) != minor:
+        if major != "0":
+            raise exceptions.QpyError(
+                "Qiskit doesn't support loading a symengine payload generated with symengine >= 1.0"
+            )
+        if minor == 9:
+            raise exceptions.QpyError(
+                "Qiskit doesn't support loading a historical QPY file with `use_symengine=True` "
+                "generated in an environment using symengine 0.9.0. If you need to load this file "
+                "you can do so with Qiskit 0.45.x or 0.46.x and re-export the QPY file using "
+                "`use_symengine=False`."
+            )
+        if minor not in (11, 13):
+            raise exceptions.QpyError(
+                f"Incompatible symengine version {major}.{minor} used to generate the QPY "
+                "payload"
+            )
+        minor_version = int(symengine_version[1])
+        if minor_version not in (11, 13):
+            raise exceptions.QpyError(
+                f"Incompatible installed symengine version {symengine.__version__} to load "
+                "this QPY payload"
+            )
+        payload = bytearray(payload)
+        payload[3] = minor_version
+        payload = bytes(payload)
+    return load_basic(payload)

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit/qpy/interface.py

@@ -144,6 +144,17 @@ def dump(
                 from the QPY format at that version will persist. This should only be used if
                 compatibility with loading the payload with an older version of Qiskit is necessary.
 
+            .. note::
+
+                If serializing a :class:`.QuantumCircuit` or :class:`.ScheduleBlock` that contain
+                :class:`.ParameterExpression` objects with ``version`` set low with the intent to
+                load the payload using a historical release of Qiskit, it is safest to set the
+                ``use_symengine`` flag to ``False``.  Versions of Qiskit prior to 1.2.3 cannot load
+                QPY files containing ``symengine``-serialized :class:`.ParameterExpression` objects
+                unless the version of ``symengine`` used between the loading and generating
+                environments matches.
+
+
     Raises:
         QpyError: When multiple data format is mixed in the output.
         TypeError: When invalid data type is input.

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qiskit
-Version: 1.2.2
+Version: 1.2.3
 Summary: An open-source SDK for working with quantum computers at the level of extended quantum circuits, operators, and primitives.
 Author-email: Qiskit Development Team <qiskit@us.ibm.com>
 License: Apache 2.0
@@ -36,7 +36,7 @@ Requires-Dist: dill>=0.3
 Requires-Dist: python-dateutil>=2.8.0
 Requires-Dist: stevedore>=3.0.0
 Requires-Dist: typing-extensions
-Requires-Dist: symengine>=0.11
+Requires-Dist: symengine<0.14,>=0.11
 Provides-Extra: qasm3-import
 Requires-Dist: qiskit-qasm3-import>=0.1.0; extra == "qasm3-import"
 Provides-Extra: visualization

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit.egg-info/SOURCES.txt

@@ -1392,7 +1392,7 @@ test/python/visualization/timeline/test_core.py
 test/python/visualization/timeline/test_drawings.py
 test/python/visualization/timeline/test_generators.py
 test/python/visualization/timeline/test_layouts.py
-test/qpy_compat/compare_versions.py
+test/qpy_compat/get_versions.py
 test/qpy_compat/test_qpy.py
 test/randomized/__init__.py
 test/randomized/test_clifford.py

{qiskit-1.2.2 → qiskit-1.2.3}/qiskit.egg-info/requires.txt

@@ -6,7 +6,7 @@ dill>=0.3
 python-dateutil>=2.8.0
 stevedore>=3.0.0
 typing-extensions
-symengine>=0.11
+symengine<0.14,>=0.11
 
 [all]
 qiskit[crosstalk-pass,csp-layout-pass,qasm3-import,visualization]

{qiskit-1.2.2 → qiskit-1.2.3}/requirements.txt

@@ -6,4 +6,4 @@ dill>=0.3
 python-dateutil>=2.8.0
 stevedore>=3.0.0
 typing-extensions
-symengine>=0.11
+symengine>=0.11,<0.14

qiskit-1.2.3/test/qpy_compat/get_versions.py

@@ -0,0 +1,99 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2024.
+#
+# This code is licensed under the Apache License, Version 2.0. You may
+# obtain a copy of this license in the LICENSE.txt file in the root directory
+# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# Any modifications or derivative works of this code must retain this
+# copyright notice, and modified files need to carry a notice indicating
+# that they have been altered from the originals.
+
+"""List the versions of Qiskit and Terra that should be tested for QPY compatibility."""
+
+import json
+import sys
+import urllib.request
+
+import packaging.version
+import packaging.tags
+
+import qiskit
+
+
+def tags_from_wheel_name(wheel: str):
+    """Extract the wheel tag from its filename."""
+    assert wheel.lower().endswith(".whl")
+    # For more information, see:
+    # - https://packaging.python.org/en/latest/specifications/binary-distribution-format/
+    # - https://packaging.python.org/en/latest/specifications/platform-compatibility-tags/
+    #
+    # In particular, take note that a wheel's filename can include "compressed tag sets" (and our
+    # Linux wheels generally do this), which is why this function returns an iterable of tags.
+    _prefix, interpreters, abis, platforms = wheel[:-4].rsplit("-", 3)
+    yield from (
+        packaging.tags.Tag(interpreter, abi, platform)
+        for interpreter in interpreters.split(".")
+        for abi in abis.split(".")
+        for platform in platforms.split(".")
+    )
+
+
+def available_versions():
+    """Get all the versions of Qiskit that support exporting QPY, and are installable with the
+    active version of Python on this platform."""
+    our_version = packaging.version.parse(qiskit.__version__)
+    supported_tags = set(packaging.tags.sys_tags())
+
+    def available_versions_for_package(package, min_version=None, max_version=None):
+        with urllib.request.urlopen(f"https://pypi.org/pypi/{package}/json") as fd:
+            data = json.load(fd)
+        min_version = min_version and packaging.version.parse(min_version)
+        max_version = max_version and packaging.version.parse(max_version)
+        for other_version, payload in data["releases"].items():
+            other_version = packaging.version.parse(other_version)
+            if min_version is not None and other_version < min_version:
+                continue
+            if max_version is not None and other_version >= max_version:
+                continue
+            if other_version > our_version:
+                continue
+            if other_version.pre is not None and other_version.pre[0] in ("a", "b"):
+                # We skip alpha and beta prereleases, but we currently want to test for
+                # compatibility with release candidates.
+                continue
+            # Note: this ignores versions that are uninstallable because we're using a Python
+            # version that's too new, which can be a problem for the oldest Terras, especially from
+            # before we built for abi3.  We're not counting sdists, since if we didn't release a
+            # compatible wheel for the current Python version, there's no guarantee it'll install.
+            if not any(
+                tag in supported_tags
+                for release in payload
+                if release["packagetype"] == "bdist_wheel"
+                for tag in tags_from_wheel_name(release["filename"])
+            ):
+                print(
+                    f"skipping '{other_version}', which has no installable binary artifacts",
+                    file=sys.stderr,
+                )
+                continue
+            yield other_version
+
+    yield from (
+        ("qiskit-terra", version)
+        for version in available_versions_for_package("qiskit-terra", "0.18.0", "1.0.0")
+    )
+    yield from (
+        ("qiskit", version) for version in available_versions_for_package("qiskit", "1.0.0")
+    )
+
+
+def main():
+    """main"""
+    for package, version in available_versions():
+        print(package, version)
+
+
+if __name__ == "__main__":
+    main()

qiskit-1.2.2/qiskit/VERSION.txt

@@ -1 +0,0 @@
-1.2.2

qiskit-1.2.2/test/qpy_compat/compare_versions.py

@@ -1,40 +0,0 @@
-#!/usr/bin/env python3
-# This code is part of Qiskit.
-#
-# (C) Copyright IBM 2023.
-#
-# This code is licensed under the Apache License, Version 2.0. You may
-# obtain a copy of this license in the LICENSE.txt file in the root directory
-# of this source tree or at http://www.apache.org/licenses/LICENSE-2.0.
-#
-# Any modifications or derivative works of this code must retain this
-# copyright notice, and modified files need to carry a notice indicating
-# that they have been altered from the originals.
-
-"""Compare Qiskit versions to determine if we should run qpy compat tests."""
-
-import argparse
-import sys
-
-from qiskit.qpy.interface import VERSION_PATTERN_REGEX
-
-
-def main():
-    """Main function."""
-    parser = argparse.ArgumentParser(prog="compare_version", description="Compare version strings")
-    parser.add_argument(
-        "source_version", help="Source version of Qiskit that is generating the payload"
-    )
-    parser.add_argument("test_version", help="Version under test that will load the QPY payload")
-    args = parser.parse_args()
-    source_match = VERSION_PATTERN_REGEX.search(args.source_version)
-    target_match = VERSION_PATTERN_REGEX.search(args.test_version)
-    source_version = tuple(int(x) for x in source_match.group("release").split("."))
-    target_version = tuple(int(x) for x in target_match.group("release").split("."))
-    if source_version > target_version:
-        sys.exit(1)
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()