qiskit 2.0.0rc1__cp39-abi3-macosx_10_12_x86_64.whl → 2.0.0rc2__cp39-abi3-macosx_10_12_x86_64.whl

qiskit/VERSION.txt

@@ -1 +1 @@
-2.0.0rc1
+2.0.0rc2

qiskit/circuit/library/standard_gates/r.py

@@ -79,7 +79,7 @@ class RGate(Gate):
         self.definition = qc
 
     def inverse(self, annotated: bool = False):
-        """Invert this gate as: :math:`r(θ, φ)^dagger = r(-θ, φ)`
+        r"""Invert this gate as: :math:`R(θ, φ)^{\dagger} = R(-θ, φ)`
 
         Args:
             annotated: when set to ``True``, this is typically used to return an

qiskit/circuit/parameterexpression.py

@@ -26,6 +26,7 @@ import numpy
 import symengine
 
 from qiskit.circuit.exceptions import CircuitError
+from qiskit.exceptions import QiskitError
 from qiskit.utils.optionals import HAS_SYMPY
 
 # This type is redefined at the bottom to insert the full reference to "ParameterExpression", so it
@@ -531,6 +532,9 @@ class ParameterExpression:
     def __str__(self):
         from sympy import sympify, sstr
 
+        if not isinstance(self._symbol_expr, symengine.Basic):
+            raise QiskitError("Invalid ParameterExpression")
+
         return sstr(sympify(self._symbol_expr), full_prec=False)
 
     def __complex__(self):
@@ -611,6 +615,9 @@ class ParameterExpression:
                 return False
             from sympy import sympify
 
+            if not isinstance(self._symbol_expr, symengine.Basic):
+                raise QiskitError("Invalid ParameterExpression")
+
             return sympify(self._symbol_expr).equals(sympify(other._symbol_expr))
         elif isinstance(other, numbers.Number):
             return len(self.parameters) == 0 and complex(self._symbol_expr) == other

qiskit/circuit/tools/pi_check.py

@@ -49,7 +49,10 @@ def pi_check(inpt, eps=1e-9, output="text", ndigits=None):
     if isinstance(inpt, ParameterExpression):
         param_str = str(inpt)
         from sympy import sympify
+        import symengine
 
+        if not isinstance(inpt._symbol_expr, symengine.Basic):
+            raise QiskitError("Invalid ParameterExpression provided")
         expr = sympify(inpt._symbol_expr)
         syms = expr.atoms()
         for sym in syms:

qiskit/qpy/binary_io/parse_sympy_repr.py

@@ -0,0 +1,121 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2025.
+#
+# 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.
+
+"""Parser for sympy expressions srepr from ParameterExpression internals."""
+
+import ast
+
+from qiskit.qpy.exceptions import QpyError
+
+
+ALLOWED_CALLERS = {
+    "Abs",
+    "Add",
+    "Sub",
+    "Mul",
+    "Div",
+    "Pow",
+    "Symbol",
+    "Integer",
+    "Rational",
+    "Complex",
+    "Float",
+    "log",
+    "sin",
+    "cos",
+    "tan",
+    "atan",
+    "acos",
+    "asin",
+    "exp",
+    "conjugate",
+}
+
+UNARY = {
+    "sin",
+    "cos",
+    "tan",
+    "atan",
+    "acos",
+    "asin",
+    "conjugate",
+    "Symbol",
+    "Integer",
+    "Complex",
+    "Abs",
+    "Float",
+}
+
+
+class ParseSympyWalker(ast.NodeVisitor):
+    """A custom ast walker that is passed the sympy srepr from QPY < 13 and creates a custom
+    expression."""
+
+    def __init__(self):
+        self.stack = []
+
+    def visit_UnaryOp(self, node: ast.UnaryOp):  # pylint: disable=invalid-name
+        """Visit a python unary op node"""
+        self.visit(node.operand)
+        arg = self.stack.pop()
+        if isinstance(node.op, ast.UAdd):
+            self.stack.append(+arg)
+        elif isinstance(node.op, ast.USub):
+            self.stack.append(-arg)
+        elif isinstance(node.op, ast.Not):
+            self.stack.append(not arg)
+        elif isinstance(node.op, ast.Invert):
+            self.stack.append(~arg)
+        else:
+            raise QpyError(f"Invalid unary op as part of sympy srepr: {node.op}")
+
+    def visit_Constant(self, node: ast.Constant):  # pylint: disable=invalid-name
+        """Visit a constant node."""
+        self.stack.append(node.value)
+
+    def visit_Call(self, node: ast.Call):  # pylint: disable=invalid-name
+        """Visit a call node
+
+        This can only be parameter expression allowed sympy call types.
+        """
+        import sympy
+
+        if isinstance(node.func, ast.Name):
+            name = node.func.id
+        else:
+            raise QpyError("Unknown node type")
+
+        if name not in ALLOWED_CALLERS:
+            raise QpyError(f"{name} is not part of a valid sympy expression srepr")
+
+        args = node.args
+        if name in UNARY:
+            if len(args) != 1:
+                raise QpyError(f"{name} has an invalid number of args in sympy srepr")
+            self.visit(args[0])
+            obj = getattr(sympy, name)(self.stack.pop())
+            self.stack.append(obj)
+        else:
+            for arg in args:
+                self.visit(arg)
+            out_args = [self.stack.pop() for _ in range(len(args))]
+            out_args.reverse()
+            obj = getattr(sympy, name)(*out_args)
+            self.stack.append(obj)
+
+
+def parse_sympy_repr(sympy_repr: str):
+    """Parse a given sympy srepr into a symbolic expression object."""
+    tree = ast.parse(sympy_repr, mode="eval")
+    visitor = ParseSympyWalker()
+    visitor.visit(tree)
+    return visitor.stack.pop()

qiskit/qpy/binary_io/value.py

@@ -34,6 +34,7 @@ from qiskit.circuit.parameterexpression import (
 )
 from qiskit.circuit.parametervector import ParameterVector, ParameterVectorElement
 from qiskit.qpy import common, formats, exceptions, type_keys
+from qiskit.qpy.binary_io.parse_sympy_repr import parse_sympy_repr
 
 
 def _write_parameter(file_obj, obj):
@@ -473,9 +474,9 @@ def _read_parameter_expression(file_obj):
     data = formats.PARAMETER_EXPR(
         *struct.unpack(formats.PARAMETER_EXPR_PACK, file_obj.read(formats.PARAMETER_EXPR_SIZE))
     )
-    from sympy.parsing.sympy_parser import parse_expr
 
-    expr_ = symengine.sympify(parse_expr(file_obj.read(data.expr_size).decode(common.ENCODE)))
+    sympy_str = file_obj.read(data.expr_size).decode(common.ENCODE)
+    expr_ = symengine.sympify(parse_sympy_repr(sympy_str))
     symbol_map = {}
     for _ in range(data.map_elements):
         elem_data = formats.PARAM_EXPR_MAP_ELEM(
@@ -514,9 +515,8 @@ def _read_parameter_expression_v3(file_obj, vectors, use_symengine):
     if use_symengine:
         expr_ = common.load_symengine_payload(payload)
     else:
-        from sympy.parsing.sympy_parser import parse_expr
-
-        expr_ = symengine.sympify(parse_expr(payload.decode(common.ENCODE)))
+        sympy_str = payload.decode(common.ENCODE)
+        expr_ = symengine.sympify(parse_sympy_repr(sympy_str))
 
     symbol_map = {}
     for _ in range(data.map_elements):

qiskit/transpiler/passes/optimization/template_matching/template_substitution.py

@@ -496,7 +496,6 @@ class TemplateSubstitution:
                 parameter constraints, returns None.
         """
         import sympy as sym
-        from sympy.parsing.sympy_parser import parse_expr
 
         if _optionals.HAS_SYMENGINE:
             import symengine
@@ -572,7 +571,8 @@ class TemplateSubstitution:
                 if isinstance(circuit_param, ParameterExpression):
                     circ_param_sym = circuit_param.sympify()
                 else:
-                    circ_param_sym = parse_expr(str(circuit_param))
+                    # if it's not a ParameterExpression we're a float
+                    circ_param_sym = sym.Float(circuit_param)
                 equations.append(sym.Eq(template_param.sympify(), circ_param_sym))
 
                 for param in template_param.parameters:

{qiskit-2.0.0rc1.dist-info → qiskit-2.0.0rc2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: qiskit
-Version: 2.0.0rc1
+Version: 2.0.0rc2
 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

{qiskit-2.0.0rc1.dist-info → qiskit-2.0.0rc2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 qiskit/version.py,sha256=MiraFeJt5GQEspFyvP3qJedHen2C1e8dNEttzg0u7YU,2498
 qiskit/__init__.py,sha256=BAdBBkA5KfLScFyiI6le8qONUJysnbFwidu1DchfbWw,7408
-qiskit/_accelerate.abi3.so,sha256=3g08wKYU_dfhE_v_0wAH0U9BJHMykQx8oVNaUNeuumY,11506916
+qiskit/_accelerate.abi3.so,sha256=cFmD8g-rhhi6gR8Ah6Yp2GAWQYTeaKOoLbntzG2-9H4,10713876
 qiskit/user_config.py,sha256=3ez0XDwu0WKnjdHB-LNk4XRTQl9Eu-WgqkXOC771pTs,10325
 qiskit/_numpy_compat.py,sha256=ZlnDTF2KBTKcVF489ZuxoBk6r9KLsMuhAlozFhOn0a8,2815
 qiskit/exceptions.py,sha256=78bbfww9680_v4CaNgepavY5DwGTN7_j47Ckob3lLPM,5619
-qiskit/VERSION.txt,sha256=n3TIEW4DZ6G4lSP-VlGpxGo2k1ymRwbvbg6RuN1JN5c,9
+qiskit/VERSION.txt,sha256=7aptyQ-2F8VHC1PykWxcrN6WGOVK7BfF8Ehq-dyauQY,9
 qiskit/visualization/circuit_visualization.py,sha256=6R-A96Uwb_RZOovsSB0LGVsC7lP5IhtLNp6VP2yVBwE,698
 qiskit/visualization/counts_visualization.py,sha256=qBJHQyD6oSAa9nacOQvUPu6WpGGJ7baxy2Y6YerAWVU,16887
 qiskit/visualization/pass_manager_visualization.py,sha256=hJIvex7i-DQuOOq73TbPMzsQZDOaoElqrJO000v51ck,10972
@@ -124,7 +124,7 @@ qiskit/transpiler/passes/optimization/consolidate_blocks.py,sha256=NTM7TEKikhwUQ
 qiskit/transpiler/passes/optimization/reset_after_measure_simplification.py,sha256=PpvRkYe4xqqQ_H2xPEf8_9IoE-z24dx1aMmygxifuRY,2108
 qiskit/transpiler/passes/optimization/optimize_1q_commutation.py,sha256=vZk8xzidwp6lDlyVv9T1N8J9UTYP-4Gi6_-Fa5TsNU8,10294
 qiskit/transpiler/passes/optimization/template_matching/template_matching.py,sha256=Rmry8mO4rgB1uWvQ4UC7XGVjh53VT8eR-uQzRO3o9Xs,17655
-qiskit/transpiler/passes/optimization/template_matching/template_substitution.py,sha256=4yOgMvqcvWx8MS8myyT8reeiyePblS064qT_8teANk0,25910
+qiskit/transpiler/passes/optimization/template_matching/template_substitution.py,sha256=Qwfe9UFFaQzR1SvfaBk62jPi5kiMf285ai38aZodV7I,25916
 qiskit/transpiler/passes/optimization/template_matching/__init__.py,sha256=WLBNsjSCRCJBtXQl8dRNIohoL3IbWB4RqfzJVxqv2IY,829
 qiskit/transpiler/passes/optimization/template_matching/backward_match.py,sha256=AA8OlwFA12pGOrzBPcK-7PVtzY7FoKjM-qS__EbpvEk,30053
 qiskit/transpiler/passes/optimization/template_matching/maximal_matches.py,sha256=cZDRpCGZaQAbDQDDLQrWoL0Eybp0WcKq8-x1JVNYw1g,2437
@@ -220,7 +220,7 @@ qiskit/circuit/duration.py,sha256=_nN8cP9vjjurDXu74a_wiFOsP7bDmDcQgbjmzkQadGo,24
 qiskit/circuit/__init__.py,sha256=OtAgmKZEosWdp5UqZIOSG_V-bsTnN8IQnI26ky653f0,61953
 qiskit/circuit/operation.py,sha256=5SrIb_ap6EVKRHMNud5t-Iu7RU3Hz_KFSFjUUfHuf9w,2077
 qiskit/circuit/_add_control.py,sha256=YfJMZjonGp14emNNk67wFJMOnh5G_NF_xtozw0jvWUc,10987
-qiskit/circuit/parameterexpression.py,sha256=T6_EBbWW5vzNkB0rs8H7CHitszgQBCpUoYEGEhtlMl4,27242
+qiskit/circuit/parameterexpression.py,sha256=qZlcvGdtN9qaeAOc-WHDQOGAsGzjO-6VeIjfFbARbOY,27542
 qiskit/circuit/delay.py,sha256=HmK9WnxZdYY7ggBBGXB5SayZ_vewXAeu0FvyAInhdfw,6603
 qiskit/circuit/twirling.py,sha256=HmpR4EzfKEkI5hW50gstzg2S6f464jF6MbtGquyGbG8,6213
 qiskit/circuit/gate.py,sha256=YPmZEWYDmsheKjSLOYg2GgYGqJEMnKUM5ngisA_n3oQ,10171
@@ -237,7 +237,7 @@ qiskit/circuit/instructionset.py,sha256=GtrxGA1Tnge96ke5Xd6pmLA-9CHxeKbfDHUfM6mn
 qiskit/circuit/parameter.py,sha256=NqPG5MFEIbZU2jhWnOkTsQjlSnz79nI0qv85fwXp7dU,7104
 qiskit/circuit/_utils.py,sha256=3M6KH31COnbiwYwjOf64l2xujBq23TeszSi1v5TMYcU,6447
 qiskit/circuit/commutation_library.py,sha256=uoghnYE4cdFMb-Yiwpe01iVSNYIZkzJI8slulUWDmwg,850
-qiskit/circuit/tools/pi_check.py,sha256=6gwDvgfhud2I9nW3UikG4w4GFzPF-na0w6AoPevYTfk,7173
+qiskit/circuit/tools/pi_check.py,sha256=QWFwVu2JFrCBoH4RTEiaiu1kAjLTQkBGqCFzZ8opI0o,7331
 qiskit/circuit/tools/__init__.py,sha256=_Rpdz9Yqiksplpw9CSGq0gOAJDIxoXQ26BRkHi1x0HY,540
 qiskit/circuit/library/pauli_evolution.py,sha256=yv5H-xiUoOqeAvPUtFrSh-v10fqXHdK2eVKe9i0DN-c,6929
 qiskit/circuit/library/hidden_linear_function.py,sha256=2X_9jf8alqG2gbg7rJRWP1qDhSJFuH9MXC8Ct824Jek,5670
@@ -307,7 +307,7 @@ qiskit/circuit/library/arithmetic/multipliers/rg_qft_multiplier.py,sha256=fhFUM0
 qiskit/circuit/library/standard_gates/s.py,sha256=yJRxBpKnJW8H6u8ZZPeoEp98saE5lzDK3U5MyDNjUpo,12457
 qiskit/circuit/library/standard_gates/rz.py,sha256=Y_JCZujQb_ol3jyWWRKokv2VJo9aqkQ_u90kKU0xN-8,10541
 qiskit/circuit/library/standard_gates/u1.py,sha256=5F5q4U4xuO_QWJ2A7RSuPvCzdFedit40bjI7WNDc6wY,15700
-qiskit/circuit/library/standard_gates/r.py,sha256=LO1YiwDDpGJ8fBb1-Ba5pub8B2ONR2-jqeHrhA1lxUg,3863
+qiskit/circuit/library/standard_gates/r.py,sha256=11eurd-8yvZbdJsHX5fbYNiig4Tw8_q2qBfrdcZqFWY,3867
 qiskit/circuit/library/standard_gates/swap.py,sha256=WcfCalCRDcEnvrKSktezCJIFwe271XZZR5usa5jMq5I,8732
 qiskit/circuit/library/standard_gates/y.py,sha256=lvngibtU_ci-3qfzhKzWtOUsDbefdiOHPfIJi89RFBQ,7682
 qiskit/circuit/library/standard_gates/__init__.py,sha256=8wIoY7hEet-xOJQijyo-p4fAjaxaTfr0mohbdk5jaPY,3906
@@ -608,7 +608,8 @@ qiskit/qpy/formats.py,sha256=MaKel58rJ5bsk2AWZSr0DFmdU3I1M6jlk6tZOjPeqbw,12825
 qiskit/qpy/exceptions.py,sha256=YOwVSKR74VYOrXS5hBdln7EZ0ett0qsSQSALJDoJxwA,1847
 qiskit/qpy/binary_io/circuits.py,sha256=XORHbsST4Tg8Hu4TJhjGQUKkTFpoB9hc---wi1seAD8,56967
 qiskit/qpy/binary_io/__init__.py,sha256=6rvwDWSLMXjTorczGI2dCHEVKuYWQ1_aBlzpohOF7wk,1047
-qiskit/qpy/binary_io/value.py,sha256=HSorqz3xZCIFg4VcCTrfaXeZZNEF_AOE0h4erPqaiMo,46260
+qiskit/qpy/binary_io/value.py,sha256=BAGJk-D3O9aylEyOYWroKvgm4Y_OoLVk95RtnweyQk8,46282
+qiskit/qpy/binary_io/parse_sympy_repr.py,sha256=68szuHlFtspE9_fDlSoW15gU56g3doK9vfV4THARMKE,3290
 qiskit/qpy/binary_io/schedules.py,sha256=Z4MOsZVKQhFMGRIABU4cIFPVX92Sx8aQSk7GZU-rulo,11377
 qiskit/qasm/libs/stdgates.inc,sha256=UvFVDcEVQUrsHh3VBiUZ5JgoqkbnsSUtgqdSnEzI6Ko,2328
 qiskit/qasm/libs/qelib1.inc,sha256=2CddZ7ogjAwbU1pKvxfcp4YRGXW-1CHF47e1FFLrf2M,4820
@@ -681,9 +682,9 @@ qiskit/quantum_info/states/densitymatrix.py,sha256=Xc21mIvH2WM-u_XxMbQImjgzGILH8
 qiskit/quantum_info/states/quantum_state.py,sha256=v__EAFkAu2aJwafAfaVDce5_525fTkTrTaJdrdQhAr0,17774
 qiskit/compiler/__init__.py,sha256=oDzbHDFJQlrjnwsRZFfJJ5m_2ioDP6untCZP-8S_2os,802
 qiskit/compiler/transpiler.py,sha256=tVl3Z90mq3UZLc1BXrW-Sf7TAJjmRYjK94efA1da_z8,18048
-qiskit-2.0.0rc1.dist-info/RECORD,,
-qiskit-2.0.0rc1.dist-info/WHEEL,sha256=Q7UnxuL0prKqHj-_-792Mat687EaVdrbWpGXr0yNvDs,136
-qiskit-2.0.0rc1.dist-info/entry_points.txt,sha256=s7DbN_JlupsHGMLE4SzM0OObcstvjMeUlc7ZWTaJIp0,6238
-qiskit-2.0.0rc1.dist-info/top_level.txt,sha256=_vjFXLv7qrHyJJOC2-JXfG54o4XQygW9GuQPxgtSt9Q,7
-qiskit-2.0.0rc1.dist-info/LICENSE.txt,sha256=IXrBXbzaJ4LgBPUVKIbYR5iMY2eqoMT8jDVTY8Ib0iQ,11416
-qiskit-2.0.0rc1.dist-info/METADATA,sha256=jp1KIjjDrqwW8dX_c0IxB67kkYbhJDhEVZEIrLQ5A10,12732
+qiskit-2.0.0rc2.dist-info/RECORD,,
+qiskit-2.0.0rc2.dist-info/WHEEL,sha256=Q7UnxuL0prKqHj-_-792Mat687EaVdrbWpGXr0yNvDs,136
+qiskit-2.0.0rc2.dist-info/entry_points.txt,sha256=s7DbN_JlupsHGMLE4SzM0OObcstvjMeUlc7ZWTaJIp0,6238
+qiskit-2.0.0rc2.dist-info/top_level.txt,sha256=_vjFXLv7qrHyJJOC2-JXfG54o4XQygW9GuQPxgtSt9Q,7
+qiskit-2.0.0rc2.dist-info/LICENSE.txt,sha256=IXrBXbzaJ4LgBPUVKIbYR5iMY2eqoMT8jDVTY8Ib0iQ,11416
+qiskit-2.0.0rc2.dist-info/METADATA,sha256=CE7YDI1MvLcGPOOFCuTEV41bD0eAPeudyh9PMn8FfAM,12732