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

ZCU111 #373

Merged
merged 153 commits into from
Jun 5, 2023
Merged
Show file tree
Hide file tree
Changes from 150 commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
d0f6d2c
first commit for zcu111 driver via server
rodolfocarobene Apr 3, 2023
4cd6c0f
platform updated to include flux info
rodolfocarobene Apr 3, 2023
33a5006
small fixes
rodolfocarobene Apr 4, 2023
a2b3945
multiplexed readout now does not raise errors
rodolfocarobene Apr 6, 2023
6ac5d84
fixed mux_ro
rodolfocarobene Apr 6, 2023
92dfc37
remove spurious print
rodolfocarobene Apr 6, 2023
5f74652
mini fix
rodolfocarobene Apr 7, 2023
b0eac5a
fixing the fix for the sweepers...
rodolfocarobene Apr 7, 2023
c50349c
add completely qicksweep, in theory this should work. Tests pass
rodolfocarobene Apr 9, 2023
2117ea8
frequency sweeps now seem to work (also on multiqubit)
rodolfocarobene Apr 10, 2023
75b9d6d
bias sweeps now seem to work (also on multiqubit)
rodolfocarobene Apr 10, 2023
647c07a
platform and runcard update
rodolfocarobene Apr 11, 2023
078eba1
Merge branch 'main' into zcu111-server
rodolfocarobene Apr 11, 2023
d589792
rfsoc merge
rodolfocarobene Apr 11, 2023
d76aca7
fix merge
rodolfocarobene Apr 11, 2023
4b8d26f
update runcard
rodolfocarobene Apr 12, 2023
bcfffd9
modify LO
rodolfocarobene Apr 13, 2023
3466214
Erasynth LO integrated in Qibola
JavierSerranoGarcia Apr 13, 2023
26a59b3
Read LO frequency from cfg
JavierSerranoGarcia Apr 14, 2023
75c8d63
prepare merge
rodolfocarobene Apr 14, 2023
66bc789
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 14, 2023
f1e0c8f
Merge pull request #376 from qiboteam/zcu111-LO
rodolfocarobene Apr 14, 2023
d9dabc3
merge main
rodolfocarobene Apr 14, 2023
4392405
fix averaged results
rodolfocarobene Apr 17, 2023
c35be02
remove old parameters from runcard
rodolfocarobene Apr 24, 2023
2026dcd
auto searching for not conflicting LO
rodolfocarobene Apr 25, 2023
3b2d94e
fix order of sweep results
rodolfocarobene Apr 25, 2023
2c9cb82
fix index in bias sweep
rodolfocarobene Apr 25, 2023
184d3e8
minor changes
rodolfocarobene Apr 25, 2023
8c5dd6c
runcard update
rodolfocarobene Apr 26, 2023
8e869ac
LO is computed also for sweeps
rodolfocarobene Apr 26, 2023
4290a04
merge latest zcu-server
rodolfocarobene Apr 26, 2023
531d41a
LO is computed also for sweeps
rodolfocarobene Apr 26, 2023
7ec824e
fixes
rodolfocarobene Apr 26, 2023
a64fcd5
fix erasynth driver
rodolfocarobene Apr 26, 2023
0df4147
update platform
rodolfocarobene Apr 26, 2023
9b6217c
Merge pull request #383 from qiboteam/rodolfo/find_best_LO_rfsoc
rodolfocarobene Apr 26, 2023
ea30f88
minor changes, considering control for 1 qubit
rodolfocarobene Apr 28, 2023
5b5fb10
merge latest erasynth
rodolfocarobene Apr 28, 2023
a28d973
raise error in qibolab
rodolfocarobene Apr 29, 2023
6f3ef78
extend raise errors
rodolfocarobene May 2, 2023
5562966
fix sweeper mirroring bug, runcard update
rodolfocarobene May 4, 2023
6f97b38
make bias sweeps relative to sweetspot
rodolfocarobene May 4, 2023
7dd7c40
runcard update
rodolfocarobene May 5, 2023
d685d6d
test updated
rodolfocarobene May 5, 2023
40443da
runcard update
rodolfocarobene May 5, 2023
ab32150
added few todos
rodolfocarobene May 8, 2023
2d3d003
platform change
rodolfocarobene May 8, 2023
1822a2e
minor changes
rodolfocarobene May 9, 2023
0b972c9
runcard update
rodolfocarobene May 9, 2023
ae6f97f
fix platform.py
rodolfocarobene May 9, 2023
66aab6a
sweetspot moved to runcard
rodolfocarobene May 9, 2023
af666fb
added todo
rodolfocarobene May 9, 2023
a96ab53
pylint comments
rodolfocarobene May 10, 2023
e9f56d8
fix tests
rodolfocarobene May 10, 2023
4d8e490
fix platform.py
rodolfocarobene May 10, 2023
44804a8
Merge branch 'zcu111-server' of https://github.com/qiboteam/qibolab i…
rodolfocarobene May 10, 2023
a454ca7
fix platform.py
rodolfocarobene May 10, 2023
6297f08
fix slow LO client-server comms [TEMPORARY]
rodolfocarobene May 11, 2023
d193fa6
Merge branch 'zcu111-server' of https://github.com/qiboteam/qibolab i…
rodolfocarobene May 11, 2023
9ec7ad0
runcard update
rodolfocarobene May 11, 2023
9a77ec6
Merge branch 'zcu111-server' into zcu111-server-mux
rodolfocarobene May 11, 2023
c877e72
now basic version working
rodolfocarobene May 11, 2023
61eab0a
new LO
rodolfocarobene May 11, 2023
fd6d356
pickle thing
rodolfocarobene May 11, 2023
e8a253c
restore pickle erasynth
rodolfocarobene May 15, 2023
36c6006
Merge branch 'zcu111-server' of https://github.com/qiboteam/qibolab i…
rodolfocarobene May 15, 2023
40a378c
fixes
rodolfocarobene May 15, 2023
6e88f96
change order of pulses
rodolfocarobene May 16, 2023
22f5efd
runcard update
rodolfocarobene May 16, 2023
1c7eab7
merge zcuserver
rodolfocarobene May 17, 2023
d64420a
add phase sweep
rodolfocarobene May 17, 2023
f786d00
qicksweep values to arrays
rodolfocarobene May 17, 2023
341c35f
platform update
rodolfocarobene May 17, 2023
666ba1f
fix original ro
rodolfocarobene May 18, 2023
8d9f6c8
pulse order
rodolfocarobene May 18, 2023
fb7e7d0
add multi-sweeps
rodolfocarobene May 18, 2023
983c77e
remove dead code
rodolfocarobene May 19, 2023
04aad5c
solve conflicts
rodolfocarobene May 19, 2023
3adb1d2
pylint
rodolfocarobene May 19, 2023
7496558
tests
rodolfocarobene May 19, 2023
e3dc087
pylint
rodolfocarobene May 19, 2023
c6379be
Merge pull request #422 from qiboteam/zcu111-server-mux
rodolfocarobene May 19, 2023
6bb5e09
Merge branch 'main' into zcu111-server
rodolfocarobene May 19, 2023
9bb21aa
Merge branch 'main' into zcu111-server
rodolfocarobene May 19, 2023
b37196f
some tests
rodolfocarobene May 19, 2023
320b62d
runcard update
rodolfocarobene May 22, 2023
dc25b06
qicksweep -> rfsocsweep
rodolfocarobene May 23, 2023
541d4f2
steps -> stops
rodolfocarobene May 23, 2023
2a9f241
small improvements
rodolfocarobene May 23, 2023
e10a87b
remove todo
rodolfocarobene May 23, 2023
7a9dbba
fix tests
rodolfocarobene May 23, 2023
14ab2a6
fix
rodolfocarobene May 23, 2023
c4350f0
invert dependency
rodolfocarobene May 24, 2023
d8e4f85
fixes
rodolfocarobene May 24, 2023
c08c6a8
merge main
rodolfocarobene May 24, 2023
4facce9
fix tests
rodolfocarobene May 24, 2023
441fe79
remove redundancy
rodolfocarobene May 24, 2023
486d1f5
Merge branch 'main' into zcu111-server
rodolfocarobene May 24, 2023
99af538
Merge branch 'zcu111-server' into invert-dependancy
rodolfocarobene May 24, 2023
f501ad7
fixes, now something is working
rodolfocarobene May 25, 2023
8e14291
merge
rodolfocarobene May 25, 2023
36339d6
fix
rodolfocarobene May 25, 2023
f02ff57
runcard
rodolfocarobene May 25, 2023
c8e137c
sweeper frequency
rodolfocarobene May 25, 2023
a0d3bd0
Merge branch 'invert-dependancy' of https://github.com/qiboteam/qibol…
rodolfocarobene May 25, 2023
603ea6c
fix test
rodolfocarobene May 25, 2023
46c66f9
runcard and delays
rodolfocarobene May 25, 2023
1cecbb2
Merge branch 'invert-dependancy' of https://github.com/qiboteam/qibol…
rodolfocarobene May 25, 2023
d6655be
fix units
rodolfocarobene May 25, 2023
26e03c9
change dep for rfsoc
rodolfocarobene May 26, 2023
6142182
merge main
rodolfocarobene May 26, 2023
78bbf70
Merge branch 'results' into invert-dependancy
rodolfocarobene May 26, 2023
476bee6
Merge pull request #442 from qiboteam/invert-dependancy
rodolfocarobene May 26, 2023
9431a5b
fixing tests
rodolfocarobene May 26, 2023
4865571
Merge branch 'main' into invert-dependancy
rodolfocarobene May 26, 2023
8a98966
fixing tests
rodolfocarobene May 26, 2023
c299435
fixes
rodolfocarobene May 26, 2023
3f80c26
Merge branch 'invert-dependancy' into zcu111-server
rodolfocarobene May 26, 2023
cf8bb0a
fix lint
rodolfocarobene May 26, 2023
db9abae
lint
rodolfocarobene May 26, 2023
3684815
improve coverage
rodolfocarobene May 26, 2023
92f930f
doc
rodolfocarobene May 26, 2023
ea2b833
dependency
rodolfocarobene May 26, 2023
2db4c0d
merge main
rodolfocarobene May 26, 2023
25b22f4
pickle -> json
rodolfocarobene May 27, 2023
1bfdfd0
fix json
rodolfocarobene May 27, 2023
5c276c5
fixes
rodolfocarobene May 27, 2023
1cd9533
split address
rodolfocarobene May 27, 2023
682b2bd
fix
rodolfocarobene May 27, 2023
befb947
QibosoqError
rodolfocarobene May 27, 2023
559608e
reflect rfsoc updated names
rodolfocarobene May 28, 2023
1c4a6fc
merge rmsettings
rodolfocarobene May 28, 2023
f4b3b26
update lock
rodolfocarobene May 29, 2023
ac83cb2
doc
rodolfocarobene May 29, 2023
890b937
fix
rodolfocarobene May 29, 2023
4f6ab03
Update doc/source/api-reference/qibolab.rst
rodolfocarobene May 29, 2023
1068098
some improvements
rodolfocarobene May 31, 2023
9187e76
tests
rodolfocarobene May 31, 2023
b43b4cc
re-adding a function I removed by error...
rodolfocarobene Jun 1, 2023
0cdcd63
merge main
rodolfocarobene Jun 1, 2023
e03023d
some improvements
rodolfocarobene Jun 1, 2023
d784cac
some improvements
rodolfocarobene Jun 1, 2023
b3fe6b2
copy
rodolfocarobene Jun 1, 2023
6f2626a
json simmetry
rodolfocarobene Jun 1, 2023
8075c31
update lock
rodolfocarobene Jun 1, 2023
98422a9
deprecate setup
rodolfocarobene Jun 1, 2023
1cc8b4d
Downgrade orjson manually
alecandido Jun 1, 2023
9dd328e
orjson 3.9.0
rodolfocarobene Jun 2, 2023
b7c8469
orjson 3.8.14
rodolfocarobene Jun 2, 2023
75c1383
add setuptools
rodolfocarobene Jun 2, 2023
fc8b0fe
remove setuptools
rodolfocarobene Jun 2, 2023
8ce266a
add setuptools dep to qm
rodolfocarobene Jun 5, 2023
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
6 changes: 3 additions & 3 deletions doc/source/api-reference/qibolab.rst
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,10 @@ IcarusQFPGA
:members:
:member-order: bysource

RFSoC 4x2
---------
RFSoC
-----

.. autoclass:: qibolab.instruments.rfsoc.TII_RFSOC4x2
.. autoclass:: qibolab.instruments.rfsoc.RFSoC
:members:
:member-order: bysource

Expand Down
441 changes: 314 additions & 127 deletions poetry.lock

Large diffs are not rendered by default.

19 changes: 12 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ qibo = "^0.1.12"
networkx = "^3.0"
more-itertools = "^9.1.0"
pyyaml = "^6.0"
qblox-instruments = { version = "0.9.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 }
qblox-instruments = { version = "0.9.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}
laboneq = { version ="==2.5.0", optional = true }
# TODO orjson should not be fixed
orjson = { version ="==3.8.14", optional = true }
rodolfocarobene marked this conversation as resolved.
Show resolved Hide resolved
# TODO change qibosoq when release
qibosoq = { git = "https://github.com/qiboteam/qibosoq.git", branch = "main", optional = true}

[tool.poetry.group.docs]
optional = true
Expand Down Expand Up @@ -64,7 +68,8 @@ pylint = ">=2.16.0"
[tool.poetry.extras]
qblox = ["qblox-instruments", "qcodes", "qcodes_contrib_drivers", "pyvisa-py"]
qm = ["qm-qua", "qualang-tools"]
zh = ["laboneq"]
zh = ["laboneq", "orjson"]
rfsoc = ["qibosoq", "qcodes", "qcodes_contrib_drivers"]


[tool.poe.tasks]
Expand Down
Loading