Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3c59717
create new cancellation file
vadebayo49 Jul 29, 2021
81b755c
added cancellation pass
vadebayo49 Aug 2, 2021
3df475a
added inverse-cancellation pass
vadebayo49 Aug 2, 2021
6bf4c0b
fixed lints
vadebayo49 Aug 2, 2021
4bfb368
add test
vadebayo49 Aug 4, 2021
e842746
update tests
vadebayo49 Aug 5, 2021
20b25c3
add fixes
vadebayo49 Aug 6, 2021
53f7a36
Make some updates and write out some TODOs
lcapelluto Aug 9, 2021
b175100
Revert debugging statements/changes
lcapelluto Aug 9, 2021
2fd283d
update self and inverse gates
vadebayo49 Aug 10, 2021
7c2c580
Changes from pair programming aug 13
lcapelluto Aug 13, 2021
89b5bc5
added error checking
vadebayo49 Aug 16, 2021
692bb7f
release notes
vadebayo49 Aug 17, 2021
e869d1a
respond to code review
vadebayo49 Aug 19, 2021
224b502
updated code review
vadebayo49 Aug 19, 2021
3aef2db
comment update
vadebayo49 Aug 23, 2021
5884574
update InverseCancellation
vadebayo49 Aug 24, 2021
01327b0
update Inversecancellation initialization
vadebayo49 Aug 24, 2021
70192a3
updated self.attribute
vadebayo49 Aug 24, 2021
b4e3d20
run method
vadebayo49 Aug 24, 2021
561af5e
Update qiskit/transpiler/passes/optimization/inverse_cancellation.py
lcapelluto Aug 25, 2021
e0cad12
Update test/python/transpiler/test_inverse_cancellation.py
lcapelluto Aug 25, 2021
77e8663
PR update
vadebayo49 Aug 25, 2021
962a730
Merge branch 'main' into issue-6576/general-cancellation-pass
lcapelluto Aug 26, 2021
c010d3c
Fix lint errors
lcapelluto Aug 26, 2021
ed6376c
Merge pull request #1 from lcapelluto/issue-6576/general-cancellation…
vadebayo49 Aug 26, 2021
b786923
Merge branch 'main' into issue-6576/general-cancellation-pass
mergify[bot] Aug 26, 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
1 change: 1 addition & 0 deletions qiskit/transpiler/passes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
from .optimization import CrosstalkAdaptiveSchedule
from .optimization import HoareOptimizer
from .optimization import TemplateOptimization
from .optimization import Cancellation
Comment thread
lcapelluto marked this conversation as resolved.
Outdated

# circuit analysis
from .analysis import ResourceEstimation
Expand Down
1 change: 1 addition & 0 deletions qiskit/transpiler/passes/optimization/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@
from .crosstalk_adaptive_schedule import CrosstalkAdaptiveSchedule
from .hoare_opt import HoareOptimizer
from .template_optimization import TemplateOptimization
from .inverse_cancellation import Cancellation
63 changes: 63 additions & 0 deletions qiskit/transpiler/passes/optimization/inverse_cancellation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# This code is part of Qiskit.
#
# (C) Copyright IBM 2020.
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
#
# 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 generic gate-inverse cancellation pass for a broad set of gate-inverse pairs.
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
"""

from qiskit.transpiler.basepasses import TransformationPass


class Cancellation(TransformationPass):
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
"""Cancel back-to-back `gates`in dag."""
Comment thread
lcapelluto marked this conversation as resolved.
Outdated

def __init__(self, gate_cancel):
"""Initialize gate_cancel"""
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
self.gate_cancel = gate_cancel
print(self.gate_cancel)
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
super().__init__()

def run(self, dag):
"""Run the Cancellation pass on `dag`.

Args:
dag (DAGCircuit): the directed acyclic graph to run on.

Returns:
DAGCircuit: Transformed DAG.
"""
gate_cancel_runs = dag.collect_runs(self.gate_cancel)
# Generalize input using self.gate_cancel
for gate_cancel_run in gate_cancel_runs:
# Partition the cx_run into chunks with equal gate arguments
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
partition = []
chunk = []
for i in range(len(gate_cancel_run) - 1):
chunk.append(gate_cancel_run[i])

qargs0 = gate_cancel_run[i].qargs
qargs1 = gate_cancel_run[i + 1].qargs

if qargs0 != qargs1:
partition.append(chunk)
chunk = []
chunk.append(gate_cancel_run[-1])
partition.append(chunk)
# Simplify each chunk in the partition
for chunk in partition:
if len(chunk) % 2 == 0:
for n in chunk:
dag.remove_op_node(n)
else:
for n in chunk[1:]:
dag.remove_op_node(n)
return dag
37 changes: 37 additions & 0 deletions test/python/transpiler/test_inverse_cancellation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# 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.

"""
Testing inverse_cancellation
"""

from qiskit import QuantumCircuit
from qiskit.transpiler.basepasses import TransformationPass
from qiskit.transpiler.passes import CXCancellation, Cancellation
from qiskit.test import QiskitTestCase
from qiskit.transpiler import PassManager
from numpy import pi

class TestCancellation(QiskitTestCase):

def test_inverse_cancellation(self):
Comment thread
lcapelluto marked this conversation as resolved.
Outdated
qc = QuantumCircuit(2,2)
qc.u(pi/2, 0, pi, 0)
qc.u(pi/2, 0, pi, 0)
pass_ = Cancellation(["u"])
pm = PassManager(pass_)
new_circ = pm.run(qc)
cir_after = new_circ.count_ops()
self.assertNotIn("u", cir_after)