Replace deprecated gate usage (#534)

qiskit/ignis/characterization/coherence/circuits.py

@@ -19,6 +19,7 @@
 from typing import List, Union, Tuple
 import numpy as np
 import qiskit
+from qiskit.circuit.library import U1Gate, U2Gate
 from ..characterization_utils import pad_id_gates
 
 
@@ -104,7 +105,7 @@ def t2star_circuits(num_of_gates: Union[List[int], np.array],
         for qind, qubit in enumerate(qubits):
             circ.h(qr[qubit])
             circ = pad_id_gates(circ, qr, qubit, circ_length)
-            circ.u1(2*np.pi*osc_freq*xdata[circ_index], qr[qubit])
+            circ.append(U1Gate(2*np.pi*osc_freq*xdata[circ_index]), [qr[qubit]])
             circ.h(qr[qubit])
         circ.barrier(qr)
         for qind, qubit in enumerate(qubits):
@@ -165,7 +166,7 @@ def t2_circuits(num_of_gates: Union[List[int], np.array],
         for qind, qubit in enumerate(qubits):
 
             # First Y90 and Y echo
-            circ.u2(0.0, 0.0, qr[qubit])  # Y90
+            circ.append(U2Gate(0.0, 0.0), [qr[qubit]])  # Y90
             circ = pad_id_gates(circ, qr, qubit, circ_length)  # ids
             circ.y(qr[qubit])
 
@@ -177,7 +178,7 @@ def t2_circuits(num_of_gates: Union[List[int], np.array],
                     circ.y(qr[qubit])
 
             circ = pad_id_gates(circ, qr, qubit, circ_length)  # ids
-            circ.u2(0.0, 0.0, qr[qubit])  # Y90
+            circ.append(U2Gate(0.0, 0.0), [qr[qubit]])  # Y90
         circ.barrier(qr)
         for qind, qubit in enumerate(qubits):
             circ.measure(qr[qubit], cr[qind])  # measure

qiskit/ignis/characterization/gates/circuits.py

@@ -20,6 +20,7 @@
 
 import numpy as np
 import qiskit
+from qiskit.circuit.library import U1Gate, U2Gate
 
 
 def ampcal_1Q_circuits(max_reps, qubits):
@@ -54,10 +55,10 @@ def ampcal_1Q_circuits(max_reps, qubits):
         circ = qiskit.QuantumCircuit(qr, cr)
         circ.name = 'ampcal1Qcircuit_' + str(circ_index) + '_0'
         for qind, qubit in enumerate(qubits):
-            circ.u2(0.0, 0.0, qr[qubit])
+            circ.append(U2Gate(0.0, 0.0), [qr[qubit]])
             for _ in range(circ_length):
                 circ.barrier(qr[qubit])
-                circ.u2(0.0, 0.0, qr[qubit])
+                circ.append(U2Gate(0.0, 0.0), [qr[qubit]])
 
         for qind, qubit in enumerate(qubits):
             circ.measure(qr[qubit], cr[qind])
@@ -97,22 +98,22 @@ def anglecal_1Q_circuits(max_reps, qubits, angleerr=0.0):
         circ = qiskit.QuantumCircuit(qr, cr)
         circ.name = 'anglecal1Qcircuit_' + str(circ_index) + '_0'
         for qind, qubit in enumerate(qubits):
-            circ.u2(0.0, 0.0, qr[qubit])  # Y90p
+            circ.append(U2Gate(0.0, 0.0), [qr[qubit]])  # Y90p
             for _ in range(circ_length):
                 if angleerr != 0:
-                    circ.u1(-2*angleerr, qr[qubit])
+                    circ.append(U1Gate(-2*angleerr), [qr[qubit]])
                 for _ in range(2):
                     circ.barrier(qr[qubit])
-                    circ.u2(-np.pi/2, np.pi/2, qr[qubit])  # Xp
+                    circ.append(U2Gate(-np.pi/2, np.pi/2), [qr[qubit]])  # Xp
                 if angleerr != 0:
-                    circ.u1(2*angleerr, qr[qubit])
+                    circ.append(U1Gate(2*angleerr), [qr[qubit]])
                 for _ in range(2):
                     circ.barrier(qr[qubit])
-                    circ.u2(0.0, 0.0, qr[qubit])  # Yp
+                    circ.append(U2Gate(0.0, 0.0), [qr[qubit]])  # Yp
 
             if angleerr != 0:
-                circ.u1(-angleerr, qr[qubit])
-            circ.u2(-np.pi/2, np.pi/2, qr[qubit])  # X90p
+                circ.append(U1Gate(-angleerr), [qr[qubit]])
+            circ.append(U2Gate(-np.pi/2, np.pi/2), [qr[qubit]])  # X90p
         for qind, qubit in enumerate(qubits):
             circ.measure(qr[qubit], cr[qind])
         circuits.append(circ)
@@ -159,7 +160,7 @@ def ampcal_cx_circuits(max_reps, qubits, control_qubits):
         circ.name = 'ampcalcxcircuit_' + str(circ_index) + '_0'
         for qind, qubit in enumerate(qubits):
             circ.x(qr[control_qubits[qind]])
-            circ.u2(-np.pi/2, np.pi/2, qr[qubit])  # X90p
+            circ.append(U2Gate(-np.pi/2, np.pi/2), [qr[qubit]])  # X90p
             for _ in range(circ_length):
                 circ.barrier([qr[control_qubits[qind]], qr[qubit]])
                 circ.cx(qr[control_qubits[qind]], qr[qubit])
@@ -214,17 +215,17 @@ def anglecal_cx_circuits(max_reps, qubits, control_qubits, angleerr=0.0):
         circ.name = 'anglecalcxcircuit_' + str(circ_index) + '_0'
         for qind, qubit in enumerate(qubits):
             circ.x(qr[control_qubits[qind]])
-            circ.u2(0.0, 0.0, qr[qubit])  # Y90p (target)
+            circ.append(U2Gate(0.0, 0.0), [qr[qubit]])  # Y90p (target)
             for _ in range(circ_length):
                 if angleerr != 0:
-                    circ.u1(-angleerr, qr[qubit])
+                    circ.append(U1Gate(-angleerr), [qr[qubit]])
                 circ.barrier([qr[control_qubits[qind]], qr[qubit]])
                 circ.cx(qr[control_qubits[qind]], qr[qubit])
                 if angleerr != 0:
-                    circ.u1(angleerr, qr[qubit])
+                    circ.append(U1Gate(angleerr), [qr[qubit]])
                 circ.y(qr[qubit])  # Yp (target)
 
-            circ.u2(-np.pi/2., np.pi/2., qr[qubit])  # X90p (target)
+            circ.append(U2Gate(-np.pi/2., np.pi/2.), [qr[qubit]])  # X90p (target)
         for qind, qubit in enumerate(qubits):
             circ.measure(qr[qubit], cr[qind])
         circuits.append(circ)

qiskit/ignis/characterization/hamiltonian/circuits.py

@@ -18,6 +18,7 @@
 
 import numpy as np
 import qiskit
+from qiskit.circuit.library import U1Gate
 from ..characterization_utils import pad_id_gates
 
 
@@ -75,7 +76,7 @@ def zz_circuits(num_of_gates, gate_time, qubits, spectators, nosc=5):
             for qind, qubit in enumerate(qubits):
                 circ.h(qr[qubit])
                 circ = pad_id_gates(circ, qr, qubit, circ_length)
-                circ.u1(2*np.pi*osc_freq*xdata[circ_index], qr[qubit])
+                circ.append(U1Gate(2*np.pi*osc_freq*xdata[circ_index]), [qr[qubit]])
                 circ.h(qr[qubit])
             circ.barrier(qr)
             for qind, qubit in enumerate(qubits):

qiskit/ignis/verification/entanglement/linear.py

@@ -20,6 +20,7 @@
 from typing import Tuple, List
 from qiskit.circuit import ClassicalRegister, QuantumRegister, Parameter
 from qiskit.circuit import QuantumCircuit
+from qiskit.circuit.library import U1Gate, U2Gate
 
 
 def get_measurement_circ(n: int,
@@ -106,7 +107,7 @@ def get_ghz_mqc(n: int,
     circ = get_ghz_simple(n, measure=False)
     circinv = circ.inverse()
     circ.barrier()
-    circ.u1(delta, q)
+    circ.append(U1Gate(delta), [q])
     circ.x(q)
     circ.barrier()
     circ += circinv
@@ -135,7 +136,7 @@ def get_ghz_mqc_para(n: int,
     delta = Parameter('t')
     circinv = circ.inverse()
     circ.barrier()
-    circ.u1(delta, q)
+    circ.append(U1Gate(delta), [q])
     circ.x(q)
     circ.barrier()
     circ += circinv
@@ -161,7 +162,7 @@ def get_ghz_po(n: int, delta: float) -> QuantumCircuit:
     circ = get_ghz_simple(n, measure=False)
 
     circ.barrier()
-    circ.u2(delta, -delta, q)
+    circ.append(U2Gate(delta, -delta), [q])
     circ.barrier()
     meas = get_measurement_circ(n, 'q', 'c', True)
     circ = circ + meas
@@ -187,7 +188,7 @@ def get_ghz_po_para(n: int) -> Tuple[QuantumCircuit, List[Parameter]]:
     circ = get_ghz_simple(n, measure=False)
 
     circ.barrier()
-    circ.u2(delta, deltaneg, q)
+    circ.append(U2Gate(delta, deltaneg), [q])
     meas = get_measurement_circ(n, 'q', 'c', True)
     circ = circ + meas
     return circ, [delta, deltaneg]

qiskit/ignis/verification/entanglement/parallelize.py

@@ -32,6 +32,7 @@
 from qiskit.circuit import ClassicalRegister, QuantumRegister, Parameter
 from qiskit.circuit import QuantumCircuit
 from qiskit.compiler import transpile
+from qiskit.circuit.library import U1Gate, U2Gate
 
 
 class BConfig:
@@ -323,7 +324,7 @@ def get_ghz_mqc(self,
         rotate = QuantumCircuit(q)
 
         rotate.barrier()
-        rotate.u1(delta, q)
+        rotate.append(U1Gate(delta), [q])
         rotate.barrier()
         rotate.x(q)
         rotate.barrier()
@@ -362,7 +363,7 @@ def get_ghz_mqc_para(self,
         rotate = QuantumCircuit(q)
         delta = Parameter('t')
         rotate.barrier()
-        rotate.u1(delta, q)
+        rotate.append(U1Gate(delta), [q])
         rotate.barrier()
         rotate.x(q)
         rotate.barrier()
@@ -398,7 +399,7 @@ def get_ghz_po(self,
         rotate = QuantumCircuit(q)
 
         rotate.barrier()
-        rotate.u2(delta, -delta, q)
+        rotate.append(U2Gate(delta, -delta), [q])
         rotate.barrier()
         rotate = transpile(rotate,
                            backend=self.backend,
@@ -437,7 +438,7 @@ def get_ghz_po_para(self,
         deltaneg = Parameter('-t')
 
         rotate.barrier()
-        rotate.u2(delta, deltaneg, q)
+        rotate.append(U2Gate(delta, deltaneg), [q])
         rotate.barrier()
         rotate = transpile(rotate,
                            backend=self.backend,