qiskit 2.0.1__tar.gz → 2.0.2__tar.gz

{qiskit-2.0.1 → qiskit-2.0.2}/Cargo.lock

@@ -1410,7 +1410,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-accelerate"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "ahash 0.8.11",
  "approx",
@@ -1442,7 +1442,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-cext"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "cbindgen",
  "num-complex",
@@ -1454,7 +1454,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-circuit"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "ahash 0.8.11",
  "approx",
@@ -1476,7 +1476,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-pyext"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "pyo3",
  "qiskit-accelerate",
@@ -1488,7 +1488,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-qasm2"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "hashbrown 0.15.2",
  "num-bigint",
@@ -1498,7 +1498,7 @@ dependencies = [
 
 [[package]]
 name = "qiskit-qasm3"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "ahash 0.8.11",
  "hashbrown 0.15.2",

{qiskit-2.0.1 → qiskit-2.0.2}/Cargo.toml

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

{qiskit-2.0.1 → qiskit-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qiskit
-Version: 2.0.1
+Version: 2.0.2
 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.2/qiskit/VERSION.txt

@@ -0,0 +1 @@
+2.0.2

{qiskit-2.0.1 → qiskit-2.0.2}/qiskit/circuit/library/boolean_logic/quantum_or.py

@@ -151,11 +151,11 @@ class OrGate(Gate):
     ) -> None:
         """
         Args:
-            num_variable_qubits: The qubits of which the AND is computed. The result will be written
+            num_variable_qubits: The qubits of which the OR is computed. The result will be written
                 into an additional result qubit.
             flags: A list of +1/0/-1 marking negations or omissions of qubits.
         """
-        super().__init__("and", num_variable_qubits + 1, [])
+        super().__init__("or", num_variable_qubits + 1, [])
         self.num_variable_qubits = num_variable_qubits
         self.flags = flags
 

{qiskit-2.0.1 → qiskit-2.0.2}/qiskit/circuit/library/n_local/evolved_operator_ansatz.py

@@ -27,6 +27,7 @@ from qiskit.circuit import QuantumRegister
 from qiskit.circuit.quantumcircuit import QuantumCircuit
 from qiskit.quantum_info import Operator, Pauli, SparsePauliOp
 from qiskit.quantum_info.operators.base_operator import BaseOperator
+from qiskit.synthesis.evolution.product_formula import real_or_fail
 
 from qiskit._accelerate.circuit_library import pauli_evolution
 
@@ -136,7 +137,8 @@ def evolved_operator_ansatz(
             for term in sparse_labels:
                 param = next(param_iter)
                 expanded_paulis += [
-                    (pauli, indices, 2 * coeff * param) for pauli, indices, coeff in term
+                    (pauli, indices, 2 * real_or_fail(coeff) * param)
+                    for pauli, indices, coeff in term
                 ]
 
         data = pauli_evolution(num_qubits, expanded_paulis, insert_barriers, False)

{qiskit-2.0.1 → qiskit-2.0.2}/qiskit/transpiler/passes/optimization/consolidate_blocks.py

@@ -91,6 +91,7 @@ class ConsolidateBlocks(TransformationPass):
         """
         super().__init__()
         self.basis_gates = None
+        self.basis_gate_name = None
         # Bypass target if it doesn't contain any basis gates (i.e. it's a _FakeTarget), as this
         # not part of the official target model.
         self.target = target if target is not None and len(target.operation_names) > 0 else None
@@ -99,6 +100,7 @@ class ConsolidateBlocks(TransformationPass):
         self.force_consolidate = force_consolidate
         if kak_basis_gate is not None:
             self.decomposer = TwoQubitBasisDecomposer(kak_basis_gate)
+            self.basis_gate_name = kak_basis_gate.name
         elif basis_gates is not None:
             kak_gates = KAK_GATE_NAMES.keys() & (basis_gates or [])
             kak_param_gates = KAK_GATE_PARAM_NAMES.keys() & (basis_gates or [])
@@ -106,14 +108,17 @@ class ConsolidateBlocks(TransformationPass):
                 self.decomposer = TwoQubitControlledUDecomposer(
                     KAK_GATE_PARAM_NAMES[list(kak_param_gates)[0]]
                 )
+                self.basis_gate_name = list(kak_param_gates)[0]
             elif kak_gates:
                 self.decomposer = TwoQubitBasisDecomposer(
                     KAK_GATE_NAMES[list(kak_gates)[0]], basis_fidelity=approximation_degree or 1.0
                 )
+                self.basis_gate_name = list(kak_gates)[0]
             else:
                 self.decomposer = None
         else:
             self.decomposer = TwoQubitBasisDecomposer(CXGate())
+            self.basis_gate_name = "cx"
 
     def run(self, dag):
         """Run the ConsolidateBlocks pass on `dag`.
@@ -134,7 +139,7 @@ class ConsolidateBlocks(TransformationPass):
         consolidate_blocks(
             dag,
             self.decomposer._inner_decomposer,
-            self.decomposer.gate_name,
+            self.basis_gate_name,
             self.force_consolidate,
             target=self.target,
             basis_gates=self.basis_gates,

{qiskit-2.0.1 → qiskit-2.0.2}/qiskit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qiskit
-Version: 2.0.1
+Version: 2.0.2
 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.1 → qiskit-2.0.2}/test/python/circuit/library/test_evolved_op_ansatz.py

@@ -183,6 +183,15 @@ class TestEvolvedOperatorAnsatz(QiskitTestCase):
             self.assertIn("hamiltonian", ops)
             self.assertIn("PauliEvolution", ops)
 
+    def test_sympify_is_real(self):
+        """Test converting the parameters to sympy is real."""
+        evo = evolved_operator_ansatz(SparsePauliOp(["Z"], coeffs=[1 + 0j]))
+        param = evo.parameters[0]  # get the gamma parameter
+
+        angle = evo.data[0].operation.params[0]
+        expected = (2.0 * param).sympify()
+        self.assertEqual(expected, angle.sympify())
+
 
 class TestHamiltonianVariationalAnsatz(QiskitTestCase):
     """Test the hamiltonian_variational_ansatz function.

{qiskit-2.0.1 → qiskit-2.0.2}/test/python/circuit/library/test_qaoa_ansatz.py

@@ -220,3 +220,12 @@ class TestQAOAAnsatz(QiskitTestCase):
                         circuit = QAOAAnsatz(cost_operator=cost, mixer_operator=mixer, reps=reps)
                     target = reps if mixer is None else 0
                     self.assertEqual(circuit.num_parameters, target)
+
+    def test_sympify_is_real(self):
+        """Test converting the parameters to sympy is real."""
+        qaoa = qaoa_ansatz(SparsePauliOp(["Z"], coeffs=[1 + 0j]))
+        param = qaoa.parameters[1]  # get the gamma parameter
+
+        angle = qaoa.data[1].operation.params[0]
+        expected = (2.0 * param).sympify()
+        self.assertEqual(expected, angle.sympify())

{qiskit-2.0.1 → qiskit-2.0.2}/test/python/transpiler/test_consolidate_blocks.py

@@ -14,7 +14,6 @@
 Tests for the ConsolidateBlocks transpiler pass.
 """
 
-import unittest
 import numpy as np
 from ddt import ddt, data
 
@@ -24,10 +23,12 @@ from qiskit.circuit.library import (
     SwapGate,
     CXGate,
     CZGate,
+    ECRGate,
     UnitaryGate,
     SXGate,
     XGate,
     RZGate,
+    RZZGate,
 )
 from qiskit.converters import circuit_to_dag
 from qiskit.quantum_info.operators import Operator
@@ -352,12 +353,13 @@ class TestConsolidateBlocks(QiskitTestCase):
         expected.unitary(np.array([[1, 0, 0, 0], [0, 0, 1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]), [0, 1])
         self.assertEqual(expected, pass_manager.run(qc))
 
-    def test_single_gate_block_outside_basis_with_target(self):
+    @data(CXGate, CZGate, ECRGate)
+    def test_single_gate_block_outside_basis_with_target(self, basis_gate):
         """Test a gate outside basis defined in target gets converted."""
         qc = QuantumCircuit(2)
         target = Target(num_qubits=2)
         # Add ideal basis gates to all qubits
-        target.add_instruction(CXGate())
+        target.add_instruction(basis_gate())
         qc.swap(0, 1)
         consolidate_block_pass = ConsolidateBlocks(target=target)
         pass_manager = PassManager()
@@ -367,12 +369,13 @@ class TestConsolidateBlocks(QiskitTestCase):
         expected.unitary(np.array([[1, 0, 0, 0], [0, 0, 1, 0], [0, 1, 0, 0], [0, 0, 0, 1]]), [0, 1])
         self.assertEqual(expected, pass_manager.run(qc))
 
-    def test_single_gate_block_outside_local_basis_with_target(self):
+    @data(CXGate, CZGate, ECRGate)
+    def test_single_gate_block_outside_local_basis_with_target(self, basis_gate):
         """Test that a gate in basis but outside valid qubits is treated as outside basis with target."""
         qc = QuantumCircuit(2)
         target = Target(num_qubits=2)
-        # Add ideal cx to (1, 0) only
-        target.add_instruction(CXGate(), {(1, 0): None})
+        # Add ideal basis to (1, 0) only
+        target.add_instruction(basis_gate(), {(1, 0): None})
         qc.cx(0, 1)
         consolidate_block_pass = ConsolidateBlocks(target=target)
         pass_manager = PassManager()
@@ -382,7 +385,8 @@ class TestConsolidateBlocks(QiskitTestCase):
         expected.unitary(np.array([[1, 0, 0, 0], [0, 0, 0, 1], [0, 0, 1, 0], [0, 1, 0, 0]]), [0, 1])
         self.assertEqual(expected, pass_manager.run(qc))
 
-    def test_single_gate_block_outside_target_with_matching_basis_gates(self):
+    @data("cx", "ecr", "cz")
+    def test_single_gate_block_outside_target_with_matching_basis_gates(self, basis_gate):
         """Ensure the target is the source of truth with basis_gates also set."""
         qc = QuantumCircuit(2)
         target = Target(num_qubits=2)
@@ -390,7 +394,7 @@ class TestConsolidateBlocks(QiskitTestCase):
         target.add_instruction(SwapGate())
         qc.swap(0, 1)
         consolidate_block_pass = ConsolidateBlocks(
-            basis_gates=["id", "cx", "rz", "sx", "x"], target=target
+            basis_gates=["id", basis_gate, "rz", "sx", "x"], target=target
         )
         pass_manager = PassManager()
         pass_manager.append(Collect2qBlocks())
@@ -669,6 +673,21 @@ class TestConsolidateBlocks(QiskitTestCase):
         tqc = pm.run(qc)
         self.assertEqual(tqc.count_ops()["rzz"], 1)
 
+    @data(CXGate, CZGate, ECRGate)
+    def test_rzz_collection(self, basis_gate):
+        """Test that a parameterized gate outside the target is consolidated."""
+        phi = Parameter("phi")
+        target = Target(num_qubits=2)
+        target.add_instruction(SXGate(), {(0,): None, (1,): None})
+        target.add_instruction(XGate(), {(0,): None, (1,): None})
+        target.add_instruction(RZGate(phi), {(0,): None, (1,): None})
+        target.add_instruction(basis_gate(), {(0, 1): None, (1, 0): None})
+        consolidate_pass = ConsolidateBlocks(target=target)
 
-if __name__ == "__main__":
-    unittest.main()
+        for angle in [np.pi / 2, np.pi]:
+            qc = QuantumCircuit(2)
+            qc.rzz(angle, 0, 1)
+            res = consolidate_pass(qc)
+            expected = QuantumCircuit(2)
+            expected.unitary(np.asarray(RZZGate(angle)), [0, 1])
+            self.assertEqual(res, expected)

qiskit-2.0.1/qiskit/VERSION.txt

@@ -1 +0,0 @@
-2.0.1