Add calibrations with the TemplateOptimization

qiskit/circuit/library/templates/__init__.py

@@ -65,6 +65,13 @@
 from .nct.template_nct_9d_9 import template_nct_9d_9
 from .nct.template_nct_9d_10 import template_nct_9d_10
 
+from .rzx.rzx_yz import rzx_yz
+from .rzx.rzx_xz import rzx_xz
+from .rzx.rzx_cy import rzx_cy
+from .rzx.rzx_zz1 import rzx_zz1
+from .rzx.rzx_zz2 import rzx_zz2
+from .rzx.rzx_zz3 import rzx_zz3
+
 from .clifford.clifford_2_1 import clifford_2_1
 from .clifford.clifford_2_2 import clifford_2_2
 from .clifford.clifford_2_3 import clifford_2_3

qiskit/circuit/library/templates/rzx/__init__.py

@@ -0,0 +1,25 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2020.
+#
+# 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.
+
+"""
+A library of template circuits.
+
+Templates are circuits that compute the identity. They find use
+in circuit optimization where matching part of the template allows the compiler
+to replace the match with the inverse of the remainder from the template.
+"""
+from .rzx_yz import rzx_yz
+from .rzx_xz import rzx_xz
+from .rzx_cy import rzx_cy
+from .rzx_zz1 import rzx_zz1
+from .rzx_zz2 import rzx_zz2
+from .rzx_zz3 import rzx_zz3

qiskit/circuit/library/templates/rzx/rzx_cy.py

@@ -0,0 +1,42 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - RYGate - CX
+.. parsed-literal::
+                                                       ┌──────────┐
+q_0: ──■─────────────■─────────────────────────────────┤0         ├───────────
+     ┌─┴─┐┌───────┐┌─┴─┐┌────────┐┌──────────┐┌───────┐│  RZX(-ϴ) │┌─────────┐
+q_1: ┤ X ├┤ RY(ϴ) ├┤ X ├┤ RY(-ϴ) ├┤ RZ(-π/2) ├┤ RX(ϴ) ├┤1         ├┤ RZ(π/2) ├
+     └───┘└───────┘└───┘└────────┘└──────────┘└───────┘└──────────┘└─────────┘
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_cy(theta: float = None):
+    """Template for CX - RYGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    circ = QuantumCircuit(2)
+    circ.cx(0, 1)
+    circ.ry(theta, 1)
+    circ.cx(0, 1)
+    circ.ry(-1*theta, 1)
+    circ.rz(-np.pi / 2, 1)
+    circ.rx(theta, 1)
+    circ.rzx(-1*theta, 0, 1)
+    circ.rz(np.pi / 2, 1)
+
+    return circ

qiskit/circuit/library/templates/rzx/rzx_xz.py

@@ -0,0 +1,49 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - RXGate - CX
+.. parsed-literal::
+     ┌───┐         ┌───┐┌─────────┐┌─────────┐┌─────────┐┌──────────┐»
+q_0: ┤ X ├─────────┤ X ├┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├┤0         ├»
+     └─┬─┘┌───────┐└─┬─┘└─────────┘└─────────┘└─────────┘│  RZX(-ϴ) │»
+q_1: ──■──┤ RX(ϴ) ├──■───────────────────────────────────┤1         ├»
+          └───────┘                                      └──────────┘»
+«     ┌─────────┐┌─────────┐┌─────────┐
+«q_0: ┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├
+«     └─────────┘└─────────┘└─────────┘
+«q_1: ─────────────────────────────────
+«
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_xz(theta: float = None):
+    """Template for CX - RXGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    qc = QuantumCircuit(2)
+    qc.cx(1, 0)
+    qc.rx(theta, 1)
+    qc.cx(1, 0)
+
+    qc.rz(np.pi / 2, 0)
+    qc.rx(np.pi / 2, 0)
+    qc.rz(np.pi / 2, 0)
+    qc.rzx(-1*theta, 0, 1)
+    qc.rz(np.pi / 2, 0)
+    qc.rx(np.pi / 2, 0)
+    qc.rz(np.pi / 2, 0)
+    return qc

qiskit/circuit/library/templates/rzx/rzx_yz.py

@@ -0,0 +1,40 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - RYGate - CX
+.. parsed-literal::
+          ┌────────┐     ┌─────────┐┌─────────┐┌──────────┐
+q_0: ──■──┤ RY(-ϴ) ├──■──┤ RX(π/2) ├┤0        ├┤ RX(-π/2) ├
+     ┌─┴─┐└────────┘┌─┴─┐└─────────┘│  RZX(ϴ) │└──────────┘
+q_1: ┤ X ├──────────┤ X ├───────────┤1        ├────────────
+     └───┘          └───┘           └─────────┘
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_yz(theta: float = None):
+    """Template for CX - RYGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    circ = QuantumCircuit(2)
+    circ.cx(0, 1)
+    circ.ry(-1*theta, 0)
+    circ.cx(0, 1)
+    circ.rx(np.pi / 2, 0)
+    circ.rzx(theta, 0, 1)
+    circ.rx(-np.pi / 2, 0)
+
+    return circ

qiskit/circuit/library/templates/rzx/rzx_zz1.py

@@ -0,0 +1,64 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - phase - CX
+.. parsed-literal::
+                                                                            »
+q_0: ──■────────────────────────────────────────────■───────────────────────»
+     ┌─┴─┐┌───────┐┌────┐┌───────┐┌────┐┌────────┐┌─┴─┐┌────────┐┌─────────┐»
+q_1: ┤ X ├┤ RZ(ϴ) ├┤ √X ├┤ RZ(π) ├┤ √X ├┤ RZ(3π) ├┤ X ├┤ RZ(-ϴ) ├┤ RZ(π/2) ├»
+     └───┘└───────┘└────┘└───────┘└────┘└────────┘└───┘└────────┘└─────────┘»
+«                                    ┌──────────┐                      »
+«q_0: ───────────────────────────────┤0         ├──────────────────────»
+«     ┌─────────┐┌─────────┐┌───────┐│  RZX(-ϴ) │┌─────────┐┌─────────┐»
+«q_1: ┤ RX(π/2) ├┤ RZ(π/2) ├┤ RX(ϴ) ├┤1         ├┤ RZ(π/2) ├┤ RX(π/2) ├»
+«     └─────────┘└─────────┘└───────┘└──────────┘└─────────┘└─────────┘»
+«
+«q_0: ───────────
+«     ┌─────────┐
+«q_1: ┤ RZ(π/2) ├
+«     └─────────┘
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_zz1(theta: float = None):
+    """Template for CX - RZGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    qc = QuantumCircuit(2)
+    qc.cx(0, 1)
+    qc.rz(theta, 1)
+    qc.sx(1)
+    qc.rz(np.pi, 1)
+    qc.sx(1)
+    qc.rz(3 * np.pi, 1)
+    qc.cx(0, 1)
+    qc.rz(-1*theta, 1)
+
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    qc.rx(theta, 1)
+    qc.rzx(-1*theta, 0, 1)
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    return qc

qiskit/circuit/library/templates/rzx/rzx_zz2.py

@@ -0,0 +1,54 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - PhaseGate - CX
+.. parsed-literal::
+                                                                          »
+q_0: ──■────────────■─────────────────────────────────────────────────────»
+     ┌─┴─┐┌──────┐┌─┴─┐┌───────┐┌─────────┐┌─────────┐┌─────────┐┌───────┐»
+q_1: ┤ X ├┤ P(ϴ) ├┤ X ├┤ P(-ϴ) ├┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├┤ RX(ϴ) ├»
+     └───┘└──────┘└───┘└───────┘└─────────┘└─────────┘└─────────┘└───────┘»
+«     ┌──────────┐
+«q_0: ┤0         ├─────────────────────────────────
+«     │  RZX(-ϴ) │┌─────────┐┌─────────┐┌─────────┐
+«q_1: ┤1         ├┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├
+«     └──────────┘└─────────┘└─────────┘└─────────┘
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_zz2(theta: float = None):
+    """Template for CX - RZGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    qc = QuantumCircuit(2)
+    qc.cx(0, 1)
+    qc.p(theta, 1)
+    qc.cx(0, 1)
+    qc.p(-1*theta, 1)
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    qc.rx(theta, 1)
+    qc.rzx(-1*theta, 0, 1)
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    return qc

qiskit/circuit/library/templates/rzx/rzx_zz3.py

@@ -0,0 +1,54 @@
+# This code is part of Qiskit.
+#
+# (C) Copyright IBM 2021.
+#
+# 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.
+
+"""
+RZX based template for CX - RZGate - CX
+.. parsed-literal::
+                                                                            »
+q_0: ──■─────────────■──────────────────────────────────────────────────────»
+     ┌─┴─┐┌───────┐┌─┴─┐┌────────┐┌─────────┐┌─────────┐┌─────────┐┌───────┐»
+q_1: ┤ X ├┤ RZ(ϴ) ├┤ X ├┤ RZ(-ϴ) ├┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├┤ RX(ϴ) ├»
+     └───┘└───────┘└───┘└────────┘└─────────┘└─────────┘└─────────┘└───────┘»
+«     ┌──────────┐
+«q_0: ┤0         ├─────────────────────────────────
+«     │  RZX(-ϴ) │┌─────────┐┌─────────┐┌─────────┐
+«q_1: ┤1         ├┤ RZ(π/2) ├┤ RX(π/2) ├┤ RZ(π/2) ├
+«     └──────────┘└─────────┘└─────────┘└─────────┘
+"""
+
+import numpy as np
+from qiskit.circuit import Parameter, QuantumCircuit
+
+
+def rzx_zz3(theta: float = None):
+    """Template for CX - RZGate - CX."""
+    if theta is None:
+        theta = Parameter('ϴ')
+
+    qc = QuantumCircuit(2)
+    qc.cx(0, 1)
+    qc.rz(theta, 1)
+    qc.cx(0, 1)
+    qc.rz(-1*theta, 1)
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    qc.rx(theta, 1)
+    qc.rzx(-1*theta, 0, 1)
+    # Hadamard
+    qc.rz(np.pi / 2, 1)
+    qc.rx(np.pi / 2, 1)
+    qc.rz(np.pi / 2, 1)
+
+    return qc

qiskit/dagcircuit/dagcircuit.py

@@ -195,6 +195,23 @@ def calibrations(self, calibrations):
         """
         self._calibrations = defaultdict(dict, calibrations)
 
+    def add_calibration(self, gate, qubits, schedule, params=None):
+        """Register a low-level, custom pulse definition for the given gate.
+
+        Args:
+            gate (Union[Gate, str]): Gate information.
+            qubits (Union[int, Tuple[int]]): List of qubits to be measured.
+            schedule (Schedule): Schedule information.
+            params (Optional[List[Union[float, Parameter]]]): A list of parameters.
+
+        Raises:
+            Exception: if the gate is of type string and params is None.
+        """
+        if isinstance(gate, Gate):
+            self._calibrations[gate.name][(tuple(qubits), tuple(gate.params))] = schedule
+        else:
+            self._calibrations[gate][(tuple(qubits), tuple(params or []))] = schedule
+
     def has_calibration_for(self, node):
         """Return True if the dag has a calibration defined for the node operation. In this
         case, the operation does not need to be translated to the device basis.

qiskit/transpiler/passes/scheduling/__init__.py

@@ -15,3 +15,5 @@
 from .alap import ALAPSchedule
 from .asap import ASAPSchedule
 from .time_unit_analysis import TimeUnitAnalysis
+from .calibration_creators import CalibrationCreator, RZXCalibrationBuilder
+from .rzx_templates import rzx_templates