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.

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

BIP mapping pass #6580

Merged
merged 74 commits into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
4028834
wip: initial move
itoko May 25, 2021
4b58dd2
fix a bug when no coupling_map is supplied
itoko May 26, 2021
6c8fd4f
Merge pull request #1 from itoko/pr-mip-routing
gnannicini May 26, 2021
fb28792
Improved documentation and parameter settings
gnannicini May 26, 2021
d66e409
Merge pull request #20 from gnannicini/pr-mip-routing-gn
itoko May 27, 2021
1c45eed
Improved logical/physical qubit mapping
gnannicini Jun 1, 2021
6e074cb
Better handling of measurements and final layout
gnannicini Jun 2, 2021
0921e93
Merge pull request #22 from gnannicini/pr-mip-routing-gn
itoko Jun 9, 2021
0f81b27
minor fixes
itoko Jun 9, 2021
4627b11
add unit tests
itoko Jun 10, 2021
dc9f67a
wip: start refactoring
itoko Jun 10, 2021
4369494
improve layout handling
itoko Jun 10, 2021
4b7f511
simplify dag construction and fix to output all ops
itoko Jun 11, 2021
578a6d0
fix to work with ApplyLayout
itoko Jun 11, 2021
a9e88b4
focus on layout+routing
itoko Jun 11, 2021
01b054e
improve how to call MIPMapping
itoko Jun 11, 2021
fc0aa63
simplify the spec
itoko Jun 11, 2021
c54bda6
add an error handling
itoko Jun 11, 2021
01b7b18
fix how to call MIPMapping pass
itoko Jun 14, 2021
55c570d
update user warning for change of given layout
itoko Jun 14, 2021
1f87c49
wip: refactor mip model
itoko Jun 14, 2021
93ad785
improve top-level interface
itoko Jun 15, 2021
d5684e7
return original dag if fails to solve MIP
itoko Jun 15, 2021
03e374a
minor fixes
itoko Jun 15, 2021
87d5266
care the case no cplex is installed
itoko Jun 15, 2021
4c1dbfb
Merge remote-tracking branch 'upstream/main' into pr-mip-routing
itoko Jun 15, 2021
1179da9
fix not to ignore swaps in original layers
itoko Jun 16, 2021
d99e1c4
fix mismatch in layer and su4layer indices
itoko Jun 16, 2021
2c11cc7
simplify by focusing only on depth objective
itoko Jun 16, 2021
95313a8
rename MIP to BIP
itoko Jun 16, 2021
f27ccf3
lint
itoko Jun 16, 2021
5bac324
improve interface around dummy steps
itoko Jun 17, 2021
1785091
improve error message when cplex fails
itoko Jun 17, 2021
5df04cc
restore level3 preset passmanager
itoko Jun 17, 2021
59732c0
improve depth objective
itoko Jun 17, 2021
8c2d609
Rework optional dependency and add test configuration
mtreinish Jun 17, 2021
b574cfd
Merge remote-tracking branch 'origin/main' into pr-mip-routing
mtreinish Jun 17, 2021
5de0630
Fix lint
mtreinish Jun 17, 2021
c799f29
Fix test, lint and logging
itoko Jun 18, 2021
5c5f9dd
Fix lint and test, update docstring
itoko Jun 18, 2021
559bc90
Fix docstring and improve performance taking the risk of failing to map
itoko Jun 18, 2021
d7f3b1f
Update docstring
itoko Jun 19, 2021
697d37c
Replace cplex.Cplex with docplex.mp.model.Model to improve readability
itoko Jun 21, 2021
1def0f7
Improve BIPMappingModel interface
itoko Jun 21, 2021
6683418
Update qiskit/transpiler/passes/routing/algorithms/bip_model.py
itoko Jun 21, 2021
761745d
Fix docplex dependency
itoko Jun 21, 2021
a8b1887
Merge remote-tracking branch 'refs/remotes/origin/pr-mip-routing' int…
itoko Jun 21, 2021
728f042
fix unnecessary-comprehension
itoko Jun 21, 2021
73d0bd8
Merge branch 'main' into pr-mip-routing
itoko Jun 21, 2021
7b1e011
lint
itoko Jun 21, 2021
3b8fd75
Merge branch 'pr-mip-routing' of https://github.com/itoko/qiskit-sdk-…
itoko Jun 21, 2021
d08fc26
Merge branch 'main' into pr-mip-routing
itoko Jun 21, 2021
d2988d2
lint
itoko Jun 22, 2021
7f4c6a1
update how to set cplex params and remove redundant constraints
itoko Jun 22, 2021
254e7ef
skip unless docplex
itoko Jun 22, 2021
5662848
fix a bug in arg threads
itoko Jun 22, 2021
4e0fd07
remove python version restriction
itoko Jun 22, 2021
c2660af
Change spec to require the number of virtual and physical qubits are …
itoko Jun 24, 2021
60d1be9
Update to use 'requires' to require precondition passes
itoko Jun 24, 2021
e54a76b
Merge branch 'main' into pr-mip-routing
itoko Jun 25, 2021
f930102
Update qiskit/transpiler/passes/routing/algorithms/bip_model.py
itoko Jun 28, 2021
4b812ff
lint
itoko Jun 28, 2021
3ef9150
Add release note
itoko Jun 28, 2021
d74d039
Update docstring
itoko Jun 29, 2021
b30359d
Improve error handling
itoko Jun 30, 2021
76e8c5e
Change to return mapped dag for circuits with only 1q-gates
itoko Jun 30, 2021
c73af80
Revert the spec change in the case of only 1q-gates
itoko Jun 30, 2021
c26bdbe
Update releasenotes/notes/add-bip-mapper-f729f2c5672d7f3e.yaml
itoko Jul 1, 2021
97b1e0c
Update releasenotes/notes/add-bip-mapper-f729f2c5672d7f3e.yaml
itoko Jul 1, 2021
0eb93d8
Update qiskit/transpiler/passes/routing/bip_mapping.py
itoko Jul 1, 2021
636a74e
Update qiskit/transpiler/passes/routing/bip_mapping.py
itoko Jul 1, 2021
a23057d
Update qiskit/transpiler/passes/routing/bip_mapping.py
itoko Jul 1, 2021
d689e39
Update qiskit/transpiler/passes/routing/bip_mapping.py
itoko Jul 1, 2021
442e826
Merge branch 'main' into pr-mip-routing
mergify[bot] Jul 1, 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: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ stages:
pip install -U -r requirements.txt -r requirements-dev.txt -c constraints.txt
python setup.py sdist
pip install -U -c constraints.txt dist/qiskit-terra*.tar.gz
pip install -U "qiskit-aer" "z3-solver" -c constraints.txt
pip install -U "cplex" "qiskit-aer" "z3-solver" -c constraints.txt
itoko marked this conversation as resolved.
Show resolved Hide resolved
mkdir -p /tmp/terra-tests
cp -r test /tmp/terra-tests/.
cp .stestr.conf /tmp/terra-tests/.
Expand Down
2 changes: 2 additions & 0 deletions qiskit/transpiler/passes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
LookaheadSwap
StochasticSwap
SabreSwap
BIPMapping

Basis Change
============
Expand Down Expand Up @@ -144,6 +145,7 @@
from .routing import LookaheadSwap
from .routing import StochasticSwap
from .routing import SabreSwap
from .routing import BIPMapping

# basis change
from .basis import Decompose
Expand Down
1 change: 1 addition & 0 deletions qiskit/transpiler/passes/routing/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
from .lookahead_swap import LookaheadSwap
from .stochastic_swap import StochasticSwap
from .sabre_swap import SabreSwap
from .bip_mapping import BIPMapping
Loading