From 8730f577aa2db755e17fe4576813761f697f536e Mon Sep 17 00:00:00 2001 From: Jake Lishman Date: Mon, 31 Jul 2023 18:40:37 +0100 Subject: [PATCH 1/2] Fix `ConvertIdToDelay` with conditional `IGate`s (#688) The logic of `DAGCircuit.substitute_node` already contains logic that propagates the condition from one node to another. The provider was previously duplicating this and before Terra 0.25, Qiskit would silently buggily overwrite any condition in the substitution. Now Qiskit will refuse, but the behaviour of propagating a set condition persists. --- .../transpiler/passes/basis/convert_id_to_delay.py | 1 - .../fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml diff --git a/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py b/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py index 65f17885d..3906d9046 100644 --- a/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py +++ b/qiskit_ibm_provider/transpiler/passes/basis/convert_id_to_delay.py @@ -69,7 +69,6 @@ def _run_inner(self, dag: DAGCircuit) -> bool: ) elif isinstance(node.op, IGate): delay_op = Delay(self._get_duration(qubit_index_map[node.qargs[0]])) - delay_op.condition = node.op.condition dag.substitute_node(node, delay_op, inplace=True) modified = True diff --git a/releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml b/releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml new file mode 100644 index 000000000..d4cfa2ac9 --- /dev/null +++ b/releasenotes/notes/fix-convert-id-delay-conditiona-8fc84c79fdcd4953.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + A transpilation error will no longer occur when attempting to transpile a circuit containing a + conditional :class:`~qiskit.circuit.library.IGate` with Qiskit 0.44. From 547528997ededb5568fafcb7f70149bd2f5b5bcc Mon Sep 17 00:00:00 2001 From: "Jack J. Woehr" <4604036+jwoehr@users.noreply.github.com> Date: Mon, 31 Jul 2023 12:02:22 -0600 Subject: [PATCH 2/2] Typographic error in comment corrected (#685) Co-authored-by: Kevin Tian --- qiskit_ibm_provider/exceptions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiskit_ibm_provider/exceptions.py b/qiskit_ibm_provider/exceptions.py index 13d1565ea..fc1e218b1 100644 --- a/qiskit_ibm_provider/exceptions.py +++ b/qiskit_ibm_provider/exceptions.py @@ -28,7 +28,7 @@ class IBMAccountError(IBMError): class IBMProviderError(IBMError): - """Base class for rrrors raise by IBMProvider.""" + """Base class for errors raise by IBMProvider.""" pass