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

Support for QM Octaves #733

Merged
merged 61 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
136ebf8
feat: introduce QM Octaves (wip)
stavros11 Dec 29, 2023
cbda43d
fix: add connectivity to octave section in config
stavros11 Dec 30, 2023
fbd07df
fix: working without octaves
stavros11 Dec 30, 2023
bf075a6
fix: bump qm-qua version
stavros11 Dec 30, 2023
5278b0f
feat: instrument settings in runcard for QM
stavros11 Jan 1, 2024
30ce83f
fix: fix qm devices serialization
stavros11 Jan 1, 2024
898232a
fix: inherit QM devices from Instrument
stavros11 Jan 1, 2024
fbc1f7c
fix: fix execution when using Octaves
stavros11 Jan 3, 2024
53799da
fix: fix duplicate port names for input/output in runcard
stavros11 Jan 3, 2024
2c2f679
fix: port serialization
stavros11 Jan 4, 2024
553870b
fix: port access from QMController
stavros11 Jan 4, 2024
527d1fe
Merge main
stavros11 Jan 4, 2024
e6e2825
fix: tests
stavros11 Jan 4, 2024
b994d10
docs: docstrings for QM devices
stavros11 Jan 4, 2024
cfe0144
docs: docstring for QM ports
stavros11 Jan 4, 2024
df310a9
refactor: simplify devices
stavros11 Jan 4, 2024
05ea6ea
test: test using qm_octave platform
stavros11 Jan 4, 2024
b39a5a2
test: fix mocker order
stavros11 Jan 4, 2024
235e22f
feat: Add method to calibrate mixers when using Octaves
stavros11 Jan 6, 2024
c5a1e27
test: Test newly introduced methods
stavros11 Jan 6, 2024
96656f5
feat: Support sequence unrolling for QM
stavros11 Jan 8, 2024
4c169d8
fix: Recover old QMPulse to fix pulse scheduling
stavros11 Jan 9, 2024
ecd1611
refactor: Remove QMSim class
stavros11 Jan 9, 2024
b4841f7
fix: Fix simulator results
stavros11 Jan 9, 2024
b935dfb
test: Update tests
stavros11 Jan 9, 2024
7d40211
Fix bug with singleshot discrimination
stavros11 Jan 10, 2024
0333f48
refactor: Simplify Ports dict
stavros11 Jan 12, 2024
9c5f966
Merge main
stavros11 Jan 12, 2024
1889424
Merge branch 'octaves' into qmunrolling
stavros11 Jan 12, 2024
b6dae8f
Merge main
stavros11 Jan 23, 2024
932725c
Review comments for controller and devices
stavros11 Jan 23, 2024
f8b3c16
Review comment about qubit.frequencies
stavros11 Jan 23, 2024
510e3ca
Replace port input with output
stavros11 Jan 23, 2024
6f85966
Fix conflicts
stavros11 Jan 23, 2024
8cb49d6
Merge main
stavros11 Jan 30, 2024
6a0d292
Merge branch 'main' into octaves
stavros11 Jan 31, 2024
8e09cb0
Merge branch 'octaves' into qmunrolling
stavros11 Jan 31, 2024
f3aac36
refactor: Move threshold and angle to ShotsAcquisition
stavros11 Feb 5, 2024
555b12f
refactor: Drop error
stavros11 Feb 5, 2024
50af0a8
refactor: Merge acquisition measure and save
stavros11 Feb 5, 2024
77d2d71
test: remove calibration path from testing platform
stavros11 Feb 5, 2024
7711fe9
fix: Mixers update when multiple pulses are used
stavros11 Feb 15, 2024
001f77f
Merge branch 'octaves' into qmunrolling
stavros11 Feb 15, 2024
e02af42
Merge main
stavros11 Feb 15, 2024
d1c8c8a
Merge branch 'octaves' into qmunrolling
stavros11 Feb 15, 2024
7af1dee
Set batch size for unrolling
stavros11 Feb 15, 2024
c1ccab7
fix: Remove default debug script file name
stavros11 Feb 16, 2024
1affed0
feat: Integration weights from qubit.kernel
stavros11 Feb 16, 2024
4889778
Merge branch 'octaves' into qmunrolling
stavros11 Feb 16, 2024
4509421
fix: Zero q-component for rectangular readout pulse
stavros11 Feb 19, 2024
72018be
Merge branch 'octaves' into qmunrolling
stavros11 Feb 19, 2024
ac31d56
fix: tests
stavros11 Feb 19, 2024
eb853ec
chore: naming conventions
stavros11 Feb 19, 2024
d5b8b45
refactor: simplify fetching
stavros11 Feb 19, 2024
0aaf828
refactor: simplify declare_acquisition
stavros11 Feb 19, 2024
27893f8
refactor: Lift result object creation to base Acquisition
stavros11 Feb 19, 2024
2d0420e
fix: names of result_cls
stavros11 Feb 19, 2024
5f77a71
fix: cast samples to uint32
stavros11 Feb 19, 2024
12841b3
Convert acquisitions to list
stavros11 Feb 20, 2024
8af9d88
Merge pull request #738 from qiboteam/qmunrolling
stavros11 Feb 20, 2024
3cf00f2
Merge branch 'main' into octaves
stavros11 Feb 20, 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
2 changes: 1 addition & 1 deletion doc/source/main-documentation/qibolab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ A list of all the supported instruments follows:
Controllers (subclasses of :class:`qibolab.instruments.abstract.Controller`):
- Dummy Instrument: :class:`qibolab.instruments.dummy.DummyInstrument`
- Zurich Instruments: :class:`qibolab.instruments.zhinst.Zurich`
- Quantum Machines: :class:`qibolab.instruments.qm.driver.QMOPX`
- Quantum Machines: :class:`qibolab.instruments.qm.controller.QMController`
- Qblox: :class:`qibolab.instruments.qblox.controller.QbloxCluster`
- Xilinx RFSoCs: :class:`qibolab.instruments.rfsoc.driver.RFSoC`

Expand Down
2 changes: 1 addition & 1 deletion doc/source/tutorials/instrument.rst
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,6 @@ the new controller a new port type. See, for example, the already implemented
ports:

* :class:`qibolab.instruments.rfsoc.driver.RFSoCPort`
* :class:`qibolab.instruments.qm.config.QMPort`
* :class:`qibolab.instruments.qm.ports.QMPort`
* :class:`qibolab.instruments.zhinst.ZhPort`
* :class:`qibolab.instruments.qblox.port`
244 changes: 194 additions & 50 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ qblox-instruments = { version = "0.11.0", optional = true }
qcodes = { version = "^0.37.0", optional = true }
qcodes_contrib_drivers = { version = "0.18.0", optional = true }
pyvisa-py = { version = "0.5.3", optional = true }
qm-qua = { version = "==1.1.1", optional = true }
qualang-tools = { version = "==0.14.0", optional = true }
qm-qua = { version = "^1.1.6", optional = true }
qualang-tools = { version = "^0.15.0", optional = true}
setuptools = { version = ">67.0.0", optional = true }
laboneq = { version = "==2.21.0", optional = true }
qibosoq = { version = ">=0.0.4,<0.2", optional = true }
Expand Down Expand Up @@ -61,7 +61,7 @@ qblox-instruments = "0.11.0"
qcodes = "^0.37.0"
qcodes_contrib_drivers = "0.18.0"
qibosoq = ">=0.0.4,<0.2"
qualang-tools = "==0.14.0"
qualang-tools = "^0.15.0"
laboneq = "==2.21.0"

[tool.poetry.group.tests]
Expand Down
Loading