Fix deprecations for Qiskit 2.0

docs/how-tos/how_to_generate_exact_sampling_coefficients.ipynb

@@ -20,7 +20,7 @@
    "outputs": [],
    "source": [
     "import numpy as np\n",
-    "from qiskit.circuit.library import EfficientSU2\n",
+    "from qiskit.circuit.library import efficient_su2\n",
     "from qiskit.quantum_info import SparsePauliOp\n",
     "\n",
     "from qiskit_addon_cutting import (\n",
@@ -48,7 +48,7 @@
     }
    ],
    "source": [
-    "circuit = EfficientSU2(4, entanglement=\"linear\", reps=2).decompose()\n",
+    "circuit = efficient_su2(4, entanglement=\"linear\", reps=2).decompose()\n",
     "circuit.assign_parameters([0.8] * len(circuit.parameters), inplace=True)\n",
     "observable = SparsePauliOp([\"ZZZZ\"])\n",
     "circuit.draw(\"mpl\", scale=0.8)"

docs/tutorials/01_gate_cutting_to_reduce_circuit_width.ipynb

@@ -51,9 +51,9 @@
     }
    ],
    "source": [
-    "from qiskit.circuit.library import EfficientSU2\n",
+    "from qiskit.circuit.library import efficient_su2\n",
     "\n",
-    "qc = EfficientSU2(4, entanglement=\"linear\", reps=2).decompose()\n",
+    "qc = efficient_su2(4, entanglement=\"linear\", reps=2).decompose()\n",
     "qc.assign_parameters([0.4] * len(qc.parameters), inplace=True)\n",
     "\n",
     "qc.draw(\"mpl\", scale=0.8)"

docs/tutorials/02_gate_cutting_to_reduce_circuit_depth.ipynb

@@ -51,9 +51,9 @@
     }
    ],
    "source": [
-    "from qiskit.circuit.library import EfficientSU2\n",
+    "from qiskit.circuit.library import efficient_su2\n",
     "\n",
-    "circuit = EfficientSU2(num_qubits=4, entanglement=\"circular\").decompose()\n",
+    "circuit = efficient_su2(num_qubits=4, entanglement=\"circular\").decompose()\n",
     "circuit.assign_parameters([0.4] * len(circuit.parameters), inplace=True)\n",
     "circuit.draw(\"mpl\", scale=0.8)"
    ]

test/cut_finding/test_cco_utils.py

@@ -16,7 +16,7 @@
 
 import pytest
 from pytest import fixture
-from qiskit.circuit.library import EfficientSU2
+from qiskit.circuit.library import efficient_su2
 from qiskit import QuantumCircuit, QuantumRegister
 from qiskit.circuit import Qubit, Instruction, CircuitInstruction
 from qiskit_addon_cutting.cut_finding.cco_utils import (
@@ -40,7 +40,7 @@ def create_test_circuit_1():
 
 
 def create_test_circuit_2():
-    tc_2 = EfficientSU2(2, entanglement="linear", reps=2).decompose()
+    tc_2 = efficient_su2(2, entanglement="linear", reps=2).decompose()
     tc_2.assign_parameters([0.4] * len(tc_2.parameters), inplace=True)
     return tc_2
 

test/cut_finding/test_cut_finder_results.py

@@ -17,7 +17,7 @@
 import unittest
 from pytest import raises
 from qiskit import QuantumCircuit
-from qiskit.circuit.library import EfficientSU2
+from qiskit.circuit.library import efficient_su2
 from qiskit_addon_cutting.cut_finding.cco_utils import qc_to_cco_circuit
 from qiskit_addon_cutting.cut_finding.circuit_interface import (
     SimpleGateList,
@@ -41,7 +41,7 @@
 
 class TestCuttingFourQubitCircuit(unittest.TestCase):
     def setUp(self):
-        qc = EfficientSU2(4, entanglement="linear", reps=2).decompose()
+        qc = efficient_su2(4, entanglement="linear", reps=2).decompose()
         qc.assign_parameters([0.4] * len(qc.parameters), inplace=True)
         self.circuit_internal = qc_to_cco_circuit(qc)
 

test/qpd/test_qpd.py

@@ -22,7 +22,7 @@
 from ddt import ddt, data, unpack
 from qiskit.circuit import QuantumCircuit, ClassicalRegister, CircuitInstruction
 from qiskit.circuit.library import (
-    EfficientSU2,
+    efficient_su2,
     CXGate,
     CYGate,
     CZGate,
@@ -72,7 +72,7 @@
 class TestQPDFunctions(unittest.TestCase):
     def setUp(self):
         # Use HWEA for simplicity and easy visualization
-        qpd_circuit = EfficientSU2(4, entanglement="linear", reps=2).decompose()
+        qpd_circuit = efficient_su2(4, entanglement="linear", reps=2).decompose()
 
         # We will instantiate 2 QPDBasis objects using from_instruction
         rxx_gate = RXXGate(np.pi / 3)

test/test_cutting_decomposition.py

@@ -17,7 +17,7 @@
 import numpy as np
 from qiskit import QuantumCircuit
 from qiskit.circuit import CircuitInstruction, Barrier, Clbit
-from qiskit.circuit.library import EfficientSU2, RXXGate
+from qiskit.circuit.library import efficient_su2, RXXGate
 from qiskit.circuit.library.standard_gates import CXGate
 from qiskit.quantum_info import PauliList
 
@@ -37,8 +37,8 @@
 class TestCuttingDecomposition(unittest.TestCase):
     def setUp(self):
         # Use HWEA for simplicity and easy visualization
-        circuit = EfficientSU2(4, entanglement="linear", reps=2).decompose()
-        qpd_circuit = EfficientSU2(4, entanglement="linear", reps=2).decompose()
+        circuit = efficient_su2(4, entanglement="linear", reps=2).decompose()
+        qpd_circuit = efficient_su2(4, entanglement="linear", reps=2).decompose()
 
         # We will instantiate 2 QPDBasis objects using from_instruction
         rxx_gate = RXXGate(np.pi / 3)

test/test_cutting_workflows.py

@@ -16,7 +16,7 @@
 
 import numpy as np
 from qiskit.circuit import QuantumCircuit
-from qiskit.circuit.library import EfficientSU2, CXGate
+from qiskit.circuit.library import efficient_su2, CXGate
 from qiskit.quantum_info import PauliList
 from qiskit.transpiler.preset_passmanagers import generate_preset_pass_manager
 from qiskit.providers.fake_provider import GenericBackendV2
@@ -38,7 +38,7 @@
 def test_transpile_before_realizing_basis_id():
     """Test a workflow where a :class:`.SingleQubitQPDGate` is passed through the transpiler."""
     num_qubits = 4
-    circuit = EfficientSU2(num_qubits, entanglement="linear", reps=2).decompose()
+    circuit = efficient_su2(num_qubits, entanglement="linear", reps=2).decompose()
     circuit.assign_parameters([0.8] * len(circuit.parameters), inplace=True)
     observables = PauliList(["ZZII"])
     subcircuits, bases, subobservables = partition_problem(
@@ -72,7 +72,7 @@ def test_transpile_before_realizing_basis_id():
 )
 def test_exotic_labels(label1, label2):
     """Test workflow with labels of non-uniform type."""
-    circuit = EfficientSU2(4, entanglement="linear", reps=2).decompose()
+    circuit = efficient_su2(4, entanglement="linear", reps=2).decompose()
     circuit.assign_parameters([0.8] * len(circuit.parameters), inplace=True)
     observables = PauliList(["ZZII", "IZZI", "IIZZ", "XIXI", "ZIZZ", "IXIX"])
     subcircuits, bases, subobservables = partition_problem(

test/test_find_cuts.py

@@ -17,7 +17,7 @@
 import os
 import numpy as np
 from qiskit import QuantumCircuit
-from qiskit.circuit.library import EfficientSU2
+from qiskit.circuit.library import efficient_su2
 
 from qiskit_addon_cutting.automated_cut_finding import (
     find_cuts,
@@ -49,7 +49,7 @@ def test_find_cuts(self):
             assert metadata["minimum_reached"] is True
 
         with self.subTest("Cut both wires instance"):
-            qc = EfficientSU2(4, entanglement="linear", reps=2).decompose()
+            qc = efficient_su2(4, entanglement="linear", reps=2).decompose()
             qc.assign_parameters([0.4] * len(qc.parameters), inplace=True)
             optimization = OptimizationParameters(
                 seed=12345, gate_lo=False, wire_lo=True

test/utils/test_transforms.py

@@ -20,7 +20,7 @@
     QuantumCircuit,
     CircuitInstruction,
 )
-from qiskit.circuit.library import EfficientSU2, Measure
+from qiskit.circuit.library import efficient_su2, Measure
 from qiskit.circuit.library.standard_gates import RZZGate
 
 from qiskit_addon_cutting import partition_circuit_qubits
@@ -33,7 +33,7 @@
 
 
 def prepare_hwea():
-    circuit = EfficientSU2(4, entanglement="linear", reps=1).decompose()
+    circuit = efficient_su2(4, entanglement="linear", reps=1).decompose()
 
     # Exchange CNOTs with gates we support
     for i, gate in enumerate(circuit.data):