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

Integrating BQSKit into MQTBench bench viewer (website) module #288

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Integrating BQSKit into MQTBench bench viewer (website) module #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4c3e6b3
✨ Update target indep compiler option
jagandecapri Jan 23, 2024
c63469f
✨ Update native dep compiler option
jagandecapri Jan 23, 2024
e8b31cf
✨ Update target dep compiler option
jagandecapri Jan 23, 2024
8ccb88a
✨ Add bqskit parsing of benchmark file data
jagandecapri Jan 23, 2024
9ff9bc1
✨ Add bqskit to preparing form input
jagandecapri Jan 23, 2024
d7ddcaa
✨ Add bqskit to filter database
jagandecapri Jan 23, 2024
b1deb90
🐛 Fix bug in checking bqskit compiler flag
jagandecapri Jan 24, 2024
d062513
🐛 Rearrange order of compiler options indep lvl
jagandecapri Jan 24, 2024
23e7d6a
🐛 Rearrange order of compiler options in native gates lvl
jagandecapri Jan 24, 2024
dd2c8e1
🐛 Rearrange order of compiler options mapped lvl
jagandecapri Jan 24, 2024
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
86 changes: 74 additions & 12 deletions src/mqt/benchviewer/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,19 @@
min_qubits: int
max_qubits: int
indices_benchmarks: list[int]
indep_bqskit_compiler: bool
indep_qiskit_compiler: bool
indep_tket_compiler: bool
nativegates_bqskit_compiler: bool
nativegates_qiskit_compiler: bool
nativegates_tket_compiler: bool
mapped_bqskit_compiler: bool
mapped_qiskit_compiler: bool
mapped_tket_compiler: bool
native_bqskit_opt_lvls: list[int] | None = None
native_qiskit_opt_lvls: list[int] | None = None
native_gatesets: list[str] | None = None
mapped_bqskit_opt_lvls: list[int] | None = None
mapped_qiskit_opt_lvls: list[int] | None = None
mapped_tket_placements: list[str] | None = None
mapped_devices: list[str] | None = None
Expand Down Expand Up @@ -183,35 +188,69 @@
| (self.database["benchmark"].isin(selected_nonscalable_benchmarks))
]

if benchmark_config.indep_qiskit_compiler:
db_tmp1 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "qiskit")]
if benchmark_config.indep_bqskit_compiler:
db_tmp1 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "bqskit")]

Check warning on line 192 in src/mqt/benchviewer/backend.py

View check run for this annotation

Codecov / codecov/patch

src/mqt/benchviewer/backend.py#L192 

Added line #L192 was not covered by tests
db_filtered = pd.concat([db_filtered, db_tmp1])

if benchmark_config.indep_tket_compiler:
db_tmp2 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "tket")]
if benchmark_config.indep_qiskit_compiler:
db_tmp2 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "qiskit")]
db_filtered = pd.concat([db_filtered, db_tmp2])

if benchmark_config.indep_tket_compiler:
db_tmp3 = db_tmp.loc[(db_tmp["indep_flag"]) & (db_tmp["compiler"] == "tket")]
db_filtered = pd.concat([db_filtered, db_tmp3])

if (
benchmark_config.nativegates_bqskit_compiler
and benchmark_config.native_gatesets
and benchmark_config.native_bqskit_opt_lvls
):
for gate_set in benchmark_config.native_gatesets:
for opt_lvl in benchmark_config.native_bqskit_opt_lvls:
db_tmp4 = db_tmp.loc[

Check warning on line 210 in src/mqt/benchviewer/backend.py

View check run for this annotation

Codecov / codecov/patch

src/mqt/benchviewer/backend.py#L208-L210 

Added lines #L208 - L210 were not covered by tests
(db_tmp["nativegates_flag"])
& (db_tmp["gate_set"] == gate_set)
& (db_tmp["compiler"] == "bqskit")
& (db_tmp["compiler_settings"] == opt_lvl)
]
db_filtered = pd.concat([db_filtered, db_tmp4])

Check warning on line 216 in src/mqt/benchviewer/backend.py

View check run for this annotation

Codecov / codecov/patch

src/mqt/benchviewer/backend.py#L216 

Added line #L216 was not covered by tests

if (
benchmark_config.nativegates_qiskit_compiler
and benchmark_config.native_gatesets
and benchmark_config.native_qiskit_opt_lvls
):
for gate_set in benchmark_config.native_gatesets:
for opt_lvl in benchmark_config.native_qiskit_opt_lvls:
db_tmp3 = db_tmp.loc[
db_tmp5 = db_tmp.loc[
(db_tmp["nativegates_flag"])
& (db_tmp["gate_set"] == gate_set)
& (db_tmp["compiler"] == "qiskit")
& (db_tmp["compiler_settings"] == opt_lvl)
]
db_filtered = pd.concat([db_filtered, db_tmp3])
db_filtered = pd.concat([db_filtered, db_tmp5])

if benchmark_config.nativegates_tket_compiler and benchmark_config.native_gatesets:
for gate_set in benchmark_config.native_gatesets:
db_tmp4 = db_tmp.loc[
db_tmp6 = db_tmp.loc[
(db_tmp["nativegates_flag"]) & (db_tmp["gate_set"] == gate_set) & (db_tmp["compiler"] == "tket")
]
db_filtered = pd.concat([db_filtered, db_tmp4])
db_filtered = pd.concat([db_filtered, db_tmp6])

if (
benchmark_config.mapped_bqskit_compiler
and benchmark_config.mapped_bqskit_opt_lvls
and benchmark_config.mapped_devices
):
for opt_lvl in benchmark_config.mapped_bqskit_opt_lvls:
for device in benchmark_config.mapped_devices:
db_tmp6 = db_tmp.loc[

Check warning on line 247 in src/mqt/benchviewer/backend.py

View check run for this annotation

Codecov / codecov/patch

src/mqt/benchviewer/backend.py#L245-L247 

Added lines #L245 - L247 were not covered by tests
(db_tmp["mapped_flag"])
& (db_tmp["target_device"] == device)
& (db_tmp["compiler"] == "bqskit")
& (db_tmp["compiler_settings"] == opt_lvl)
]
db_filtered = pd.concat([db_filtered, db_tmp6])

Check warning on line 253 in src/mqt/benchviewer/backend.py

View check run for this annotation

Codecov / codecov/patch

src/mqt/benchviewer/backend.py#L253 

Added line #L253 was not covered by tests

if (
benchmark_config.mapped_qiskit_compiler
Expand All @@ -220,13 +259,13 @@
):
for opt_lvl in benchmark_config.mapped_qiskit_opt_lvls:
for device in benchmark_config.mapped_devices:
db_tmp5 = db_tmp.loc[
db_tmp6 = db_tmp.loc[
(db_tmp["mapped_flag"])
& (db_tmp["target_device"] == device)
& (db_tmp["compiler"] == "qiskit")
& (db_tmp["compiler_settings"] == opt_lvl)
]
db_filtered = pd.concat([db_filtered, db_tmp5])
db_filtered = pd.concat([db_filtered, db_tmp6])

if (
benchmark_config.mapped_tket_compiler
Expand All @@ -235,13 +274,13 @@
):
for placement in benchmark_config.mapped_tket_placements:
for device in benchmark_config.mapped_devices:
db_tmp6 = db_tmp.loc[
db_tmp7 = db_tmp.loc[
(db_tmp["mapped_flag"])
& (db_tmp["target_device"] == device)
& (db_tmp["compiler"] == "tket")
& (db_tmp["compiler_settings"] == placement)
]
db_filtered = pd.concat([db_filtered, db_tmp6])
db_filtered = pd.concat([db_filtered, db_tmp7])

return cast(list[str], db_filtered["filename"].to_list())

Expand Down Expand Up @@ -308,14 +347,19 @@
min_qubits = 2
max_qubits = 130
indices_benchmarks = []
indep_bqskit_compiler = False
indep_qiskit_compiler = False
indep_tket_compiler = False
nativegates_bqskit_compiler = False
nativegates_qiskit_compiler = False
nativegates_tket_compiler = False
native_bqskit_opt_lvls = []
native_qiskit_opt_lvls = []
native_gatesets = []
mapped_bqskit_compiler = False
mapped_qiskit_compiler = False
mapped_tket_compiler = False
mapped_bqskit_opt_lvls = []
mapped_qiskit_opt_lvls = []
mapped_tket_placements = []
mapped_devices = []
Expand All @@ -328,11 +372,17 @@
min_qubits = int(v) if "minQubits" in k and v else min_qubits
max_qubits = int(v) if "maxQubits" in k and v else max_qubits

indep_bqskit_compiler = "indep_bqskit_compiler" in k or indep_bqskit_compiler
indep_qiskit_compiler = "indep_qiskit_compiler" in k or indep_qiskit_compiler
indep_tket_compiler = "indep_tket_compiler" in k or indep_tket_compiler

nativegates_bqskit_compiler = "nativegates_bqskit_compiler" in k or nativegates_bqskit_compiler
nativegates_qiskit_compiler = "nativegates_qiskit_compiler" in k or nativegates_qiskit_compiler
nativegates_tket_compiler = "nativegates_tket_compiler" in k or nativegates_tket_compiler
native_bqskit_opt_lvls.append(1) if "nativegates_bqskit_compiler_opt1" in k else None
native_bqskit_opt_lvls.append(2) if "nativegates_bqskit_compiler_opt2" in k else None
native_bqskit_opt_lvls.append(3) if "nativegates_bqskit_compiler_opt3" in k else None
native_bqskit_opt_lvls.append(4) if "nativegates_bqskit_compiler_opt4" in k else None
native_qiskit_opt_lvls.append(0) if "nativegates_qiskit_compiler_opt0" in k else None
native_qiskit_opt_lvls.append(1) if "nativegates_qiskit_compiler_opt1" in k else None
native_qiskit_opt_lvls.append(2) if "nativegates_qiskit_compiler_opt2" in k else None
Expand All @@ -343,8 +393,13 @@
native_gatesets.append("ionq") if "nativegates_ionq" in k else None
native_gatesets.append("quantinuum") if "nativegates_quantinuum" in k else None

mapped_bqskit_compiler = "mapped_bqskit_compiler" in k or mapped_bqskit_compiler
mapped_qiskit_compiler = "mapped_qiskit_compiler" in k or mapped_qiskit_compiler
mapped_tket_compiler = "mapped_tket_compiler" in k or mapped_tket_compiler
mapped_bqskit_opt_lvls.append(1) if "mapped_bqskit_compiler_opt1" in k else None
mapped_bqskit_opt_lvls.append(2) if "mapped_bqskit_compiler_opt2" in k else None
mapped_bqskit_opt_lvls.append(3) if "mapped_bqskit_compiler_opt3" in k else None
mapped_bqskit_opt_lvls.append(4) if "mapped_bqskit_compiler_opt4" in k else None
mapped_qiskit_opt_lvls.append(0) if "mapped_qiskit_compiler_opt0" in k else None
mapped_qiskit_opt_lvls.append(1) if "mapped_qiskit_compiler_opt1" in k else None
mapped_qiskit_opt_lvls.append(2) if "mapped_qiskit_compiler_opt2" in k else None
Expand All @@ -363,14 +418,19 @@
min_qubits=min_qubits,
max_qubits=max_qubits,
indices_benchmarks=indices_benchmarks,
indep_bqskit_compiler=indep_bqskit_compiler,
indep_qiskit_compiler=indep_qiskit_compiler,
indep_tket_compiler=indep_tket_compiler,
nativegates_bqskit_compiler=nativegates_bqskit_compiler,
nativegates_qiskit_compiler=nativegates_qiskit_compiler,
nativegates_tket_compiler=nativegates_tket_compiler,
native_bqskit_opt_lvls=native_bqskit_opt_lvls,
native_qiskit_opt_lvls=native_qiskit_opt_lvls,
native_gatesets=native_gatesets,
mapped_bqskit_compiler=mapped_bqskit_compiler,
mapped_qiskit_compiler=mapped_qiskit_compiler,
mapped_tket_compiler=mapped_tket_compiler,
mapped_bqskit_opt_lvls=mapped_bqskit_opt_lvls,
mapped_qiskit_opt_lvls=mapped_qiskit_opt_lvls,
mapped_tket_placements=mapped_tket_placements,
mapped_devices=mapped_devices,
Expand Down Expand Up @@ -620,6 +680,8 @@


def get_compiler_and_settings(filename: str) -> tuple[str, str | int | None]:
if "bqskit" in filename:
return "bqskit", get_opt_level(filename)
if "qiskit" in filename:
return "qiskit", get_opt_level(filename)
if "tket" in filename:
Expand Down
Loading
Loading