Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid collecting non atomic nodes in 1q runs #5570

Merged
merged 5 commits into from
Jan 7, 2021
Merged

Avoid collecting non atomic nodes in 1q runs #5570

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
89b9f70
Fixing issue 5543 avoid collecting non atomic nodes in 1q runs
paolob67 Jan 1, 2021
d51f5b0
Merge branch 'master' into issue#5543
paolob67 Jan 1, 2021
50b5e93
Update qiskit/dagcircuit/dagcircuit.py
paolob67 Jan 6, 2021
d8c0479
Merge branch 'master' into issue#5543
kdk Jan 7, 2021
1da98e4
Merge branch 'master' into issue#5543
kdk Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions qiskit/dagcircuit/dagcircuit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,6 +1384,8 @@ def filter_fn(node):
return node.type == 'op' and len(node.qargs) == 1 \
and len(node.cargs) == 0 and node.condition is None \
and not node.op.is_parameterized() \
and isinstance(node.op, Gate) \
and hasattr(node.op, '__array__')

group_list = rx.collect_runs(self._multi_graph, filter_fn)
return set(tuple(x) for x in group_list)
Expand Down
11 changes: 11 additions & 0 deletions test/python/dagcircuit/test_dagcircuit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from qiskit.circuit import QuantumCircuit
from qiskit.circuit import Measure
from qiskit.circuit import Reset
from qiskit.circuit import Delay
from qiskit.circuit import Gate, Instruction
from qiskit.circuit import Parameter
from qiskit.circuit.library.standard_gates.i import IGate
Expand Down Expand Up @@ -712,6 +713,8 @@ def test_dag_collect_runs_conditional_in_middle(self):

def test_dag_collect_1q_runs(self):
"""Test the collect_1q_runs method with 3 different gates."""
self.dag.apply_operation_back(Reset(), [self.qubit0])
self.dag.apply_operation_back(Delay(100), [self.qubit0])
self.dag.apply_operation_back(U1Gate(3.14), [self.qubit0])
self.dag.apply_operation_back(U1Gate(3.14), [self.qubit0])
self.dag.apply_operation_back(U1Gate(3.14), [self.qubit0])
Expand All @@ -736,6 +739,8 @@ def test_dag_collect_1q_runs(self):

def test_dag_collect_1q_runs_start_with_conditional(self):
"""Test collect 1q runs with a conditional at the start of the run."""
self.dag.apply_operation_back(Reset(), [self.qubit0])
self.dag.apply_operation_back(Delay(100), [self.qubit0])
h_gate = HGate()
h_gate.condition = self.condition
self.dag.apply_operation_back(
Expand All @@ -752,6 +757,8 @@ def test_dag_collect_1q_runs_start_with_conditional(self):

def test_dag_collect_1q_runs_conditional_in_middle(self):
"""Test collect_1q_runs with a conditional in the middle of a run."""
self.dag.apply_operation_back(Reset(), [self.qubit0])
self.dag.apply_operation_back(Delay(100), [self.qubit0])
h_gate = HGate()
h_gate.condition = self.condition
self.dag.apply_operation_back(HGate(), [self.qubit0])
Expand All @@ -769,6 +776,8 @@ def test_dag_collect_1q_runs_conditional_in_middle(self):
def test_dag_collect_1q_runs_with_parameterized_gate(self):
"""Test collect 1q splits on parameterized gates."""
theta = Parameter('theta')
self.dag.apply_operation_back(Reset(), [self.qubit0])
self.dag.apply_operation_back(Delay(100), [self.qubit0])
self.dag.apply_operation_back(HGate(), [self.qubit0])
self.dag.apply_operation_back(HGate(), [self.qubit0])
self.dag.apply_operation_back(U1Gate(theta), [self.qubit0])
Expand All @@ -783,6 +792,8 @@ def test_dag_collect_1q_runs_with_parameterized_gate(self):

def test_dag_collect_1q_runs_with_cx_in_middle(self):
"""Test collect_1q_runs_with a cx in the middle of the run."""
self.dag.apply_operation_back(Reset(), [self.qubit0])
self.dag.apply_operation_back(Delay(100), [self.qubit0])
self.dag.apply_operation_back(HGate(), [self.qubit0])
self.dag.apply_operation_back(HGate(), [self.qubit0])
self.dag.apply_operation_back(U1Gate(3.14), [self.qubit0])
Expand Down