qiskit 2.0.0rc1__cp39-abi3-win_amd64.whl → 2.0.0rc2__cp39-abi3-win_amd64.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,6 +1,6 @@
-qiskit/VERSION.txt,sha256=XtyE6PFyTt9PbWe-P91vRlQ4ug54c7RzUf_s2x0FkqM,10
+qiskit/VERSION.txt,sha256=d3kDUuvFThC6SCGYbLCyL9bbAhN5Sl1KgXvh5BYV6TY,10
 qiskit/__init__.py,sha256=YwDQ1WkSQ4JqOW7ciwsjnWXKsv17x4wRIBJRA7DWuV8,7552
-qiskit/_accelerate.pyd,sha256=ryLD9Pwo2gYg7rrXde8Dhkk561gTZRxFYwbvn26U0dM,11500032
+qiskit/_accelerate.pyd,sha256=zjXOUcbNkvXfz-URhee03MbuZcENVc1FkB45aD2ssRE,11363328
 qiskit/_numpy_compat.py,sha256=EV1RihNRJnvWzjb57z8sjMbv9EeRPzk8Mnegzw7ItR0,2888
 qiskit/exceptions.py,sha256=UamBNQmDJTx6ruzmj7iXgcsrBcvkfE-bZ4TH2-K_ngw,5772
 qiskit/user_config.py,sha256=yPpq2_vI1OXdUA6NS2e86qJHTU60MDSH68PzCdHVZCs,10591
@@ -26,7 +26,7 @@ qiskit/circuit/instructionset.py,sha256=jMo1446qm5J1YCVLvzykDRDpA-zDpGM588WH-Yq8
 qiskit/circuit/measure.py,sha256=4xwwPXAeM9pyttSRed7wdCanDBeVwo1i_UG7fbLKiAo,1864
 qiskit/circuit/operation.py,sha256=85i2oVIhvEF5mh4TTlpyEXdhfqKwver7LKD0ac2YLRQ,2145
 qiskit/circuit/parameter.py,sha256=5nZhW0cUdhRtSOwvxQHSKTZztFWl_yalcr0jK3Hwefk,7283
-qiskit/circuit/parameterexpression.py,sha256=YVU1s5afpEw1wn2OmHbootC4ePk1pjmKrToaHB8VqEw,27938
+qiskit/circuit/parameterexpression.py,sha256=QxhI9gDdt4Tf9FYZtGhLaVSCTHAMttJHbPOlhHNEynQ,28245
 qiskit/circuit/parametertable.py,sha256=4u7EuKAiVskcnWQW8dnfU8jgYKZ92KdH2g6PeTvvjjA,3388
 qiskit/circuit/parametervector.py,sha256=NgNAy0Tzvy0fdfLIhTI6Bg0kqckevhKVPBP9ONMF3uU,4907
 qiskit/circuit/quantumcircuit.py,sha256=LxeIgxDlG6yqkjrmzBfZVAJjNV-zJLrHAncg6mcUmkk,316701
@@ -137,7 +137,7 @@ qiskit/circuit/library/standard_gates/h.py,sha256=jREt1RMfF7NqqBcYhe653yhi66vMzE
 qiskit/circuit/library/standard_gates/i.py,sha256=2erk8dvGEQl4fL-JbF1HsM0dKMAgNDFfsNSz8p4deGY,2396
 qiskit/circuit/library/standard_gates/iswap.py,sha256=qnct9_zJNzaCZkdUOdkocLlk6MVIO4tcN1UFiC0Jf6k,4021
 qiskit/circuit/library/standard_gates/p.py,sha256=4Hl0kFuUDGrH16XQ4K9subUS1c2YUXu9e1YEjdexP4s,14498
-qiskit/circuit/library/standard_gates/r.py,sha256=OIyzlaRAFw21Fu3-0BK2AcDo3g8Pebr3GMQaHlD1DT8,3976
+qiskit/circuit/library/standard_gates/r.py,sha256=deteYBnev4vaXarqtrjLboZJuLt_56wYfKSY2JZZfbQ,3980
 qiskit/circuit/library/standard_gates/rx.py,sha256=rZ6CQNkb7VfJ_fi7Hn4o-PcqgSq51aZktjPnI2viNuA,10820
 qiskit/circuit/library/standard_gates/rxx.py,sha256=pckxbzG_bZT_kOrVsOZQqN73JpN2taH5jnYo1aKHhPQ,6737
 qiskit/circuit/library/standard_gates/ry.py,sha256=8gRei6yu8VF7Z0FvWWMlqvyEqHUjLLlWcM54DVG4LVw,10402
@@ -236,7 +236,7 @@ qiskit/circuit/library/templates/rzx/rzx_zz3.py,sha256=RDqK1pcyg-vRulclzK-0Ugooq
 qiskit/circuit/random/__init__.py,sha256=8Ndr3sYxCq3r03sI2KeFTXhSry8LX2TQy8VI5SuubOE,604
 qiskit/circuit/random/utils.py,sha256=LFAAAwaxlHM747B6yRRKr78aG2_PagXjL7EROYNnfKU,15413
 qiskit/circuit/tools/__init__.py,sha256=6O50HcNi3ilZfSEAWqlF0m4VSBkd2Pi2w3c2n0qBmkM,556
-qiskit/circuit/tools/pi_check.py,sha256=P6Ww17q3G86cML7zeBp1lNloXeJJyX9ZLKOj7m2mRfo,7363
+qiskit/circuit/tools/pi_check.py,sha256=BjWYX21ini1YvxaPWwjbsTtmeslA1aQaP-a5WzwfBa0,7524
 qiskit/compiler/__init__.py,sha256=J5DFtTt3p6uZgxZXy6r3Q2RTG8EEwpLuuh1-fKIsSQI,829
 qiskit/compiler/transpiler.py,sha256=a8VLDeod9YA3qkC2Mo76F52AlHjSetjSr3HXLHv6Ji8,18423
 qiskit/converters/__init__.py,sha256=12OGiGl9vTNzbQbW-aBlwxttqaPNkWfHoAVIPeTjR-4,2243
@@ -329,8 +329,9 @@ qiskit/qpy/interface.py,sha256=cQErTZnn2DOIx23lercaM1W9v4TGCDKhf0As--QJuZE,12902
 qiskit/qpy/type_keys.py,sha256=5nblShiqWcYx-xCtykGSso0YXeuB9n-_UWuoL3lw14c,11132
 qiskit/qpy/binary_io/__init__.py,sha256=XuIWJ68xO8_f0TOuBeUh9RfUEoudlLNIGWuUWhq7rxA,1082
 qiskit/qpy/binary_io/circuits.py,sha256=cAkygN-3v_hKnryRA8K9rIIW06G4A8JxVzOsMQKVGhs,58417
+qiskit/qpy/binary_io/parse_sympy_repr.py,sha256=EbCXrVMc0CNjzEnq81HHkAzyoveLbwjIquJ9E4Rqd9g,3411
 qiskit/qpy/binary_io/schedules.py,sha256=myzMfYKyuKvIinW2khnWxbAJLgcJQpqva4vYrdfzAD4,11685
-qiskit/qpy/binary_io/value.py,sha256=IqVYZNFYO1hC9hhZk3EIbxn_62wuSqens9YlWlFU4QA,47425
+qiskit/qpy/binary_io/value.py,sha256=erA8Wl2nFscNC3Teb9NiqZy8_mgKCZ620df3ti827gA,47447
 qiskit/quantum_info/__init__.py,sha256=aJ0-ScJplIxqOZf7MYtQzF1xWXqq3_y_TvGZQfo_n_c,3589
 qiskit/quantum_info/quaternion.py,sha256=qlB8jMmWBmYzBgzDwiLjINGD9KlfllfS5D5yCr2DML4,5040
 qiskit/quantum_info/random.py,sha256=N9f6Vgo_oWf03xbV3drM6Pmi0jWw7w2SC6hpO5BQiaE,941
@@ -571,7 +572,7 @@ qiskit/transpiler/passes/optimization/template_matching/backward_match.py,sha256
 qiskit/transpiler/passes/optimization/template_matching/forward_match.py,sha256=iDZUdCBeHZpVZXKFWLHWuUqjJQrEX42iZ1cgF4a4PeQ,17762
 qiskit/transpiler/passes/optimization/template_matching/maximal_matches.py,sha256=vKrypbcMr58X6j2_bDHV9ZO-SSh2jGfCcaWJ7H0sBLI,2514
 qiskit/transpiler/passes/optimization/template_matching/template_matching.py,sha256=RSmJS7acqs8LxBrkkZ4a8Qxn7-A_uZUPJIvJ4H5zmmw,18025
-qiskit/transpiler/passes/optimization/template_matching/template_substitution.py,sha256=m5sv9hxHFrcYyLpppPVK4sGo4SYFwzQMIERZLAOi62s,26549
+qiskit/transpiler/passes/optimization/template_matching/template_substitution.py,sha256=_j2wAyqUc2hcXu7fffDUgefj0ws4c6-nsqh7IKNe6u8,26555
 qiskit/transpiler/passes/routing/__init__.py,sha256=SfhAsVV6rPUZIeYl3jDdsF-a8kPGzVfiRcPaz7_cFWY,919
 qiskit/transpiler/passes/routing/basic_swap.py,sha256=2-psCRJsvxCKoNCKt_Tx9mC9vQp-V9AWr2hNSPc5MLs,6896
 qiskit/transpiler/passes/routing/layout_transformation.py,sha256=IWqOrP4_5V1DKNBSejSjFCyXCB51iMzJfGL4MjxWE44,4804
@@ -681,9 +682,9 @@ qiskit/visualization/timeline/types.py,sha256=jtpipQWUpahayNPQYKUst4GG6BqauovO0q
 qiskit/visualization/timeline/plotters/__init__.py,sha256=Klg9a1cSUIQhc815g8OpnD5vO1hcI51L9KlFfKzcuRg,588
 qiskit/visualization/timeline/plotters/base_plotter.py,sha256=taRkL2ZbyorRUEf6nJS8egdzKW2eznQ3w5oBLtMG_U8,1805
 qiskit/visualization/timeline/plotters/matplotlib.py,sha256=lqqNH3-bdf1F1cS2mDla9dLr5qEOeIFuqVl9Rhdg-Dw,7086
-qiskit-2.0.0rc1.dist-info/LICENSE.txt,sha256=pUbmRuPr1gJTTTWZu2c8UmNSntz-pDdKfGR-86NRkok,11619
-qiskit-2.0.0rc1.dist-info/METADATA,sha256=PVI6Otz7GT0SuSwRHdtSFimDOskl1Bx7KM_bHSwY_f4,12951
-qiskit-2.0.0rc1.dist-info/WHEEL,sha256=gmAbw2KMXvzCK2WBCU9yG78ZNLPoiprECHSnUbX8b8Y,99
-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/RECORD,,
+qiskit-2.0.0rc2.dist-info/LICENSE.txt,sha256=pUbmRuPr1gJTTTWZu2c8UmNSntz-pDdKfGR-86NRkok,11619
+qiskit-2.0.0rc2.dist-info/METADATA,sha256=n_MqAXSgLQfx5AJ0ynksdq-NfsAEziY-U8qjvyjXFeQ,12951
+qiskit-2.0.0rc2.dist-info/WHEEL,sha256=gmAbw2KMXvzCK2WBCU9yG78ZNLPoiprECHSnUbX8b8Y,99
+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/RECORD,,