[QHC-636] Create AnnealingSchedule class in Qililab. #767

visagim · 2024-08-01T16:59:06Z

No description provided.

…qilimanjaro-tech/qililab into add-one-qubit-analog-transpiler

linear · 2024-08-01T16:59:09Z

QHC-636 Create AnnealingSchedule class in Qililab.

codecov · 2024-08-01T17:06:52Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.81%. Comparing base (ed5a9f5) to head (54277d8).
Report is 43 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #767      +/-   ##
==========================================
+ Coverage   95.77%   95.81%   +0.03%     
==========================================
  Files         266      267       +1     
  Lines        8593     8670      +77     
==========================================
+ Hits         8230     8307      +77     
  Misses        363      363

Flag	Coverage Δ
unittests	`95.81% <100.00%> (+0.03%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests

src/qililab/analog/annealing_program.py

src/qililab/platform/platform.py

…quivalent to another

src/qililab/platform/platform.py

fedonman

Great work Victor! 💯 Requested a couple of changes, mainly on OOP concepts, and naming conventions.

src/qililab/analog/annealing_program.py

src/qililab/platform/platform.py

src/qililab/qprogram/qprogram.py

…ub.com/qilimanjaro-tech/qililab into create-annealingSchedule-class/QHC-636

fedonman

Added a new comment and there still one unresolved question from previous review and is good to go 💯 🚀

src/qililab/analog/annealing_program.py

src/qililab/platform/platform.py

src/qililab/analog/annealing_program.py

visagim · 2024-08-14T10:57:20Z

Added a new comment and there still one unresolved question from previous review and is good to go 💯 🚀

what's the unresolved comment?

fedonman · 2024-08-14T11:05:49Z

Added a new comment and there still one unresolved question from previous review and is good to go 💯 🚀

what's the unresolved comment?

this, you can find it if you scroll higher.

visagim · 2024-08-14T11:17:30Z

Also a further note on this

Also, why have we chosen the transpiler to be a Callable and not a class? Now the method transpile() belongs to AnnealingProgram when it should belong to the Transpiler class.

The flux to ising transpiler is very much at its infancy still, and there is a lot of uncertainty about how will it evolve further than the one qubit case. That is why I am reluctant about starting to make classes and big structures for a workflow that is sure to change in the short term (1-2months) - I think it's better to keep something minimal and make it more rigid (efficient) as we consolidate each step and are sure that that's how it's going to be in the mid term (5-10months).
But I do believe at some point we'll definitely make a transpiler class with more complicated logic, just think that right now it's overkill

fedonman · 2024-08-14T11:26:19Z

Also a further note on this

Also, why have we chosen the transpiler to be a Callable and not a class? Now the method transpile() belongs to AnnealingProgram when it should belong to the Transpiler class.

The flux to ising transpiler is very much at its infancy still, and there is a lot of uncertainty about how will it evolve further than the one qubit case. That is why I am reluctant about starting to make classes and big structures for a workflow that is sure to change in the short term (1-2months) - I think it's better to keep something minimal and make it more rigid (efficient) as we consolidate each step and are sure that that's how it's going to be in the mid term (5-10months). But I do believe at some point we'll definitely make a transpiler class with more complicated logic, just think that right now it's overkill

It's not an overkill if we know that we will need it eventually. Making the change after 2+ months of additional development will be much more difficult than it is to make it now.

fedonman · 2024-08-14T11:41:12Z

Also a further note on this

Also, why have we chosen the transpiler to be a Callable and not a class? Now the method transpile() belongs to AnnealingProgram when it should belong to the Transpiler class.

The flux to ising transpiler is very much at its infancy still, and there is a lot of uncertainty about how will it evolve further than the one qubit case. That is why I am reluctant about starting to make classes and big structures for a workflow that is sure to change in the short term (1-2months) - I think it's better to keep something minimal and make it more rigid (efficient) as we consolidate each step and are sure that that's how it's going to be in the mid term (5-10months). But I do believe at some point we'll definitely make a transpiler class with more complicated logic, just think that right now it's overkill

It's not an overkill if we know that we will need it eventually. Making the change after 2+ months of additional development will be much more difficult than it is to make it now.

My main concern is that this is public API since it is in platform.execute_annealing() and it will be much difficult to change the API once we start using it.

If you answer the other question above, How do we expect users to create/use these transpilers? Do we have a number of predefined algorithms for transpilation?, we can try to find an minimal OOP design that provides a friendly UX API.

My current guess is an AnnealingTranspiler generic class, that can be sub-classed to provide different pre-defined algorithms, or also initialized using a custom Callable as it is now.

That way the signature of platform.execute_annealing() would be (annealing_program: AnnealingProgram, transpiler: AnnealingTranspiler) which makes it more UX friendly than (anneal_program_dict: list[dict[str, dict[str, float]]], transpiler: Callable)

Very good points, as to how is it gonna be long term, also think we are aiming to be a company that makes custom chips, that is, analog chips that solve particular problems, so this needs to be also in our minds, how to make this as generic as possible to fit within that technical development.

visagim · 2024-08-14T14:46:08Z

I added a ticket to address (I believe) all of the suggestions above and marked related conversations as resolved (as I believe they have been). Once @fedonman gives the OK I'll merge

This reverts commit 6dc9b07.

This reverts commit a958ea8.

This reverts commit 86a2bbd.

This reverts commit d7d0669.

fedonman

I am approving, since we will discuss further OOP improvements after the first demo. Awesome job 💯

* add parameter class and one qubit analog transpiler * add unit tests * add unit tests * move fluqe parameter inside analog, fix pylint complains * draft of anneal program with transpiler for 1q * add analog program execution workflow * add changelog * fix mypy * fix docstring * add unit test for anneal program * wip platform unit tests * add to_dict method to qprogram in order to tests that a qprogram is equivalent to another * fix tests * fix pylint * fix docstrings, pylint * still trying to fix docs * still trying to fix the docs * still trying to fix the docs * still trying to fix the docs * change qprogram to_readable_dict to __str__ method * fix tests, fix docs * add suggested changes * add unittest for qprogram str method * fix tests * remove unused import * fix coverage * update changelog * tests * returning changes lost * isort * measure in test * Revert "measure in test" This reverts commit 6dc9b07. * Revert "isort" This reverts commit a958ea8. * Revert "returning changes lost" This reverts commit 86a2bbd. * Revert "tests" This reverts commit d7d0669. --------- Co-authored-by: GitHub Actions bot <actions@github.com>

…778) * add parameter class and one qubit analog transpiler * add unit tests * add unit tests * move fluqe parameter inside analog, fix pylint complains * draft of anneal program with transpiler for 1q * add analog program execution workflow * add changelog * fix mypy * fix docstring * add unit test for anneal program * wip platform unit tests * add to_dict method to qprogram in order to tests that a qprogram is equivalent to another * fix tests * fix pylint * fix docstrings, pylint * still trying to fix docs * still trying to fix the docs * still trying to fix the docs * still trying to fix the docs * change qprogram to_readable_dict to __str__ method * fix tests, fix docs * add suggested changes * add unittest for qprogram str method * fix tests * remove unused import * fix coverage * update changelog * implementation proposal * code quality * testing annealing * weights are optional * raising error * raises error test * QHC 621 Modify set_intermediate_frequency for the jobAPI (#764) * update to support opx1000 * fix import error * fix typo * add default type * fix typo * change octave connectivity * Implemented necessary changes for QUA/job API (#756) * Implemented necessary changes for QUA/job API * Update tests/instruments/quantum_machines/test_quantum_machines_cluster.py * FIXED AUTOMATIC FORMAT * add if_outputs * add if_outputs * opx1000 * corrected deprecated functions * fix typos and tests * fix code quality * Fixing Documentation warnings * allowing more than a QM existing at same time * Changes on the IF set * updated job type * ignored changes * pylint disabled * fix * formatted tests * Fixed isort issues * fix pylint * fix test * fix * added missing coverage * fixed change * Added octave calibrate_element after if / lo set * fixed tests * removed incorrect assertions * fixed black formatter * code quality * code quality * ignoring types * black * Ignoring job type * Make ignore typing only for `[union-attr]` * Rewritten job order to execute set_frequency * changed from job to self.job for tests and the future * Forgot a space :) * ADDED PYLINT EXCEPTION * Fixed Mypy * a¡changed type requirements * Added compatibility with opx+ and opx1000 * black * reset self._intermediate_frequency * fix test * fixed moretests * tests * created function to get the controller * black * added changelog * coverage * fixed tests * fix * test reaise error * pylint * Update src/qililab/instruments/quantum_machines/quantum_machines_cluster.py * Apply suggestions from code review Co-authored-by: Vyron Vasileiadis <hi@fedonman.com> * implemented suggested changes * black * fix tests * removed unexistent test --------- Co-authored-by: Vyron Vasileiads <hi@fedonman.com> Co-authored-by: Guillermo Abad López <109400222+GuillermoAbadLopez@users.noreply.github.com> Co-authored-by: GitHub Actions bot <actions@github.com> Co-authored-by: jjmartinezQT <133863373+jjmartinezQT@users.noreply.github.com> * tests * isort * measure in test * code quality * code quality * removing duplicate fixture * removing duplicate * disabling too many lines in platform * removing unused arguments * calibration fixture * code quality * fixing unittest * removing brackets typo * passing by calibration to execute_qprogram * refactoring * fixing unittest * removing comment * [QHC-636] Create AnnealingSchedule class in Qililab. (#767) * add parameter class and one qubit analog transpiler * add unit tests * add unit tests * move fluqe parameter inside analog, fix pylint complains * draft of anneal program with transpiler for 1q * add analog program execution workflow * add changelog * fix mypy * fix docstring * add unit test for anneal program * wip platform unit tests * add to_dict method to qprogram in order to tests that a qprogram is equivalent to another * fix tests * fix pylint * fix docstrings, pylint * still trying to fix docs * still trying to fix the docs * still trying to fix the docs * still trying to fix the docs * change qprogram to_readable_dict to __str__ method * fix tests, fix docs * add suggested changes * add unittest for qprogram str method * fix tests * remove unused import * fix coverage * update changelog * tests * returning changes lost * isort * measure in test * Revert "measure in test" This reverts commit 6dc9b07. * Revert "isort" This reverts commit a958ea8. * Revert "returning changes lost" This reverts commit 86a2bbd. * Revert "tests" This reverts commit d7d0669. --------- Co-authored-by: GitHub Actions bot <actions@github.com> * changelog * code quality * returning results of annealing * returning type * code quality * making calibration file non optional * introducing sync * code quality * code quality * outside loop * checking type * changing test * adding calibration * fixing unittest * checking return type * removing src * code quality --------- Co-authored-by: victor <visangim@gmail.com> Co-authored-by: GitHub Actions bot <actions@github.com> Co-authored-by: jordivallsq <151619025+jordivallsq@users.noreply.github.com> Co-authored-by: Vyron Vasileiads <hi@fedonman.com> Co-authored-by: Guillermo Abad López <109400222+GuillermoAbadLopez@users.noreply.github.com>

* update to support opx1000 * fix import error * fix typo * add default type * fix typo * change octave connectivity * Implemented necessary changes for QUA/job API (#756) * Implemented necessary changes for QUA/job API * Update tests/instruments/quantum_machines/test_quantum_machines_cluster.py * FIXED AUTOMATIC FORMAT * add if_outputs * add if_outputs * opx1000 * corrected deprecated functions * fix typos and tests * fix code quality * Fixing Documentation warnings * allowing more than a QM existing at same time * adding try, except * black * not bare except * changelog * removing duplicated code on merge * right program from import * fixing unittest from bad merge * testing raising error * code quality * fixing unittest * code quality * unittest * unittest * code quality * changing the execution * unittest * undoing * unittest * unittest * mocking cluster turn off * code quality * changing message * regex * regex * escaping error message * escaped error str * code quality * code quality * do not close machines * code quality * platform merge fix * merge arbitrary waveform hash fix from main * Default measurement for annealing for the first demo implementation. (#778) * add parameter class and one qubit analog transpiler * add unit tests * add unit tests * move fluqe parameter inside analog, fix pylint complains * draft of anneal program with transpiler for 1q * add analog program execution workflow * add changelog * fix mypy * fix docstring * add unit test for anneal program * wip platform unit tests * add to_dict method to qprogram in order to tests that a qprogram is equivalent to another * fix tests * fix pylint * fix docstrings, pylint * still trying to fix docs * still trying to fix the docs * still trying to fix the docs * still trying to fix the docs * change qprogram to_readable_dict to __str__ method * fix tests, fix docs * add suggested changes * add unittest for qprogram str method * fix tests * remove unused import * fix coverage * update changelog * implementation proposal * code quality * testing annealing * weights are optional * raising error * raises error test * QHC 621 Modify set_intermediate_frequency for the jobAPI (#764) * update to support opx1000 * fix import error * fix typo * add default type * fix typo * change octave connectivity * Implemented necessary changes for QUA/job API (#756) * Implemented necessary changes for QUA/job API * Update tests/instruments/quantum_machines/test_quantum_machines_cluster.py * FIXED AUTOMATIC FORMAT * add if_outputs * add if_outputs * opx1000 * corrected deprecated functions * fix typos and tests * fix code quality * Fixing Documentation warnings * allowing more than a QM existing at same time * Changes on the IF set * updated job type * ignored changes * pylint disabled * fix * formatted tests * Fixed isort issues * fix pylint * fix test * fix * added missing coverage * fixed change * Added octave calibrate_element after if / lo set * fixed tests * removed incorrect assertions * fixed black formatter * code quality * code quality * ignoring types * black * Ignoring job type * Make ignore typing only for `[union-attr]` * Rewritten job order to execute set_frequency * changed from job to self.job for tests and the future * Forgot a space :) * ADDED PYLINT EXCEPTION * Fixed Mypy * a¡changed type requirements * Added compatibility with opx+ and opx1000 * black * reset self._intermediate_frequency * fix test * fixed moretests * tests * created function to get the controller * black * added changelog * coverage * fixed tests * fix * test reaise error * pylint * Update src/qililab/instruments/quantum_machines/quantum_machines_cluster.py * Apply suggestions from code review Co-authored-by: Vyron Vasileiadis <hi@fedonman.com> * implemented suggested changes * black * fix tests * removed unexistent test --------- Co-authored-by: Vyron Vasileiads <hi@fedonman.com> Co-authored-by: Guillermo Abad López <109400222+GuillermoAbadLopez@users.noreply.github.com> Co-authored-by: GitHub Actions bot <actions@github.com> Co-authored-by: jjmartinezQT <133863373+jjmartinezQT@users.noreply.github.com> * tests * isort * measure in test * code quality * code quality * removing duplicate fixture * removing duplicate * disabling too many lines in platform * removing unused arguments * calibration fixture * code quality * fixing unittest * removing brackets typo * passing by calibration to execute_qprogram * refactoring * fixing unittest * removing comment * [QHC-636] Create AnnealingSchedule class in Qililab. (#767) * add parameter class and one qubit analog transpiler * add unit tests * add unit tests * move fluqe parameter inside analog, fix pylint complains * draft of anneal program with transpiler for 1q * add analog program execution workflow * add changelog * fix mypy * fix docstring * add unit test for anneal program * wip platform unit tests * add to_dict method to qprogram in order to tests that a qprogram is equivalent to another * fix tests * fix pylint * fix docstrings, pylint * still trying to fix docs * still trying to fix the docs * still trying to fix the docs * still trying to fix the docs * change qprogram to_readable_dict to __str__ method * fix tests, fix docs * add suggested changes * add unittest for qprogram str method * fix tests * remove unused import * fix coverage * update changelog * tests * returning changes lost * isort * measure in test * Revert "measure in test" This reverts commit 6dc9b07. * Revert "isort" This reverts commit a958ea8. * Revert "returning changes lost" This reverts commit 86a2bbd. * Revert "tests" This reverts commit d7d0669. --------- Co-authored-by: GitHub Actions bot <actions@github.com> * changelog * code quality * returning results of annealing * returning type * code quality * making calibration file non optional * introducing sync * code quality * code quality * outside loop * checking type * changing test * adding calibration * fixing unittest * checking return type * removing src * code quality --------- Co-authored-by: victor <visangim@gmail.com> Co-authored-by: GitHub Actions bot <actions@github.com> Co-authored-by: jordivallsq <151619025+jordivallsq@users.noreply.github.com> Co-authored-by: Vyron Vasileiads <hi@fedonman.com> Co-authored-by: Guillermo Abad López <109400222+GuillermoAbadLopez@users.noreply.github.com> --------- Co-authored-by: Vyron Vasileiads <hi@fedonman.com> Co-authored-by: jordivallsq <151619025+jordivallsq@users.noreply.github.com> Co-authored-by: jvallsq <jordi.valls@qilimanjaro.tech> Co-authored-by: Guillermo Abad López <109400222+GuillermoAbadLopez@users.noreply.github.com> Co-authored-by: GitHub Actions bot <actions@github.com> Co-authored-by: victor <visangim@gmail.com>

visagim added 8 commits August 1, 2024 12:50

add parameter class and one qubit analog transpiler

543da5e

add unit tests

6c3a0f6

Merge branch 'main' into add-one-qubit-analog-transpiler

d3f70db

Merge branch 'main' into add-one-qubit-analog-transpiler

eb9da50

add unit tests

5bb6efc

Merge branch 'add-one-qubit-analog-transpiler' of https://github.com/…

e39bc13

…qilimanjaro-tech/qililab into add-one-qubit-analog-transpiler

move fluqe parameter inside analog, fix pylint complains

57bbf9c

draft of anneal program with transpiler for 1q

1c07db7

Base automatically changed from add-one-qubit-analog-transpiler to main August 5, 2024 09:44

visagim added 3 commits August 6, 2024 16:26

add analog program execution workflow

c9f49d8

merge main

95970f9

add changelog

d5543d3

jjmartinezQT requested review from jjmartinezQT and fedonman August 6, 2024 15:05

jjmartinezQT reviewed Aug 7, 2024

View reviewed changes

src/qililab/analog/annealing_program.py Show resolved Hide resolved

src/qililab/platform/platform.py Show resolved Hide resolved

visagim added 6 commits August 7, 2024 14:16

fix mypy

a2a0bec

fix docstring

aa52461

add unit test for anneal program

6527d4c

wip platform unit tests

81bb027

add to_dict method to qprogram in order to tests that a qprogram is e…

9b29997

…quivalent to another

Merge branch 'main' into create-annealingSchedule-class/QHC-636

e6fb8d6

jjmartinezQT requested changes Aug 9, 2024

View reviewed changes

src/qililab/platform/platform.py Show resolved Hide resolved

Merge branch 'main' into create-annealingSchedule-class/QHC-636

fc6eb65

fedonman requested changes Aug 9, 2024

View reviewed changes

fedonman reviewed Aug 9, 2024

View reviewed changes

src/qililab/qprogram/qprogram.py Outdated Show resolved Hide resolved

visagim added 3 commits August 11, 2024 14:55

fix tests

8ad0457

Merge branch 'create-annealingSchedule-class/QHC-636' of https://gith…

12e0cca

…ub.com/qilimanjaro-tech/qililab into create-annealingSchedule-class/QHC-636

Merge branch 'main' into create-annealingSchedule-class/QHC-636

2c24f26

fedonman reviewed Aug 14, 2024

View reviewed changes

src/qililab/analog/annealing_program.py Show resolved Hide resolved

fedonman reviewed Aug 14, 2024

View reviewed changes

src/qililab/platform/platform.py Show resolved Hide resolved

fedonman reviewed Aug 14, 2024

View reviewed changes

src/qililab/analog/annealing_program.py Show resolved Hide resolved

Merge branch 'main' into create-annealingSchedule-class/QHC-636

eb7373f

Merge branch 'main' into create-annealingSchedule-class/QHC-636

af70254

Merge branch 'main' into create-annealingSchedule-class/QHC-636

083ce17

visagim mentioned this pull request Aug 19, 2024

Default measurement for annealing for the first demo implementation. #778

Merged

actions-user added 8 commits August 19, 2024 13:53

tests

d7d0669

returning changes lost

86a2bbd

isort

a958ea8

measure in test

6dc9b07

Revert "measure in test"

4699420

This reverts commit 6dc9b07.

Revert "isort"

e47d3c4

This reverts commit a958ea8.

Revert "returning changes lost"

ab35001

This reverts commit 86a2bbd.

Revert "tests"

54277d8

This reverts commit d7d0669.

visagim requested a review from fedonman August 20, 2024 20:03

fedonman approved these changes Aug 21, 2024

View reviewed changes

jjmartinezQT merged commit d2a3522 into main Aug 21, 2024
6 checks passed

jjmartinezQT deleted the create-annealingSchedule-class/QHC-636 branch August 21, 2024 08:32

visagim mentioned this pull request Aug 26, 2024

[QHC-670]Add xtalk compensation matrix to annealing program workflow #775

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[QHC-636] Create AnnealingSchedule class in Qililab. #767

[QHC-636] Create AnnealingSchedule class in Qililab. #767

visagim commented Aug 1, 2024

linear bot commented Aug 1, 2024

codecov bot commented Aug 1, 2024 •

edited

Loading

fedonman left a comment

fedonman left a comment

visagim commented Aug 14, 2024

fedonman commented Aug 14, 2024

visagim commented Aug 14, 2024

fedonman commented Aug 14, 2024

fedonman commented Aug 14, 2024 •

edited by jjmartinezQT

Loading

visagim commented Aug 14, 2024

fedonman left a comment

[QHC-636] Create AnnealingSchedule class in Qililab. #767

[QHC-636] Create AnnealingSchedule class in Qililab. #767

Conversation

visagim commented Aug 1, 2024

linear bot commented Aug 1, 2024

codecov bot commented Aug 1, 2024 • edited Loading

Codecov Report

fedonman left a comment

Choose a reason for hiding this comment

fedonman left a comment

Choose a reason for hiding this comment

visagim commented Aug 14, 2024

fedonman commented Aug 14, 2024

visagim commented Aug 14, 2024

fedonman commented Aug 14, 2024

fedonman commented Aug 14, 2024 • edited by jjmartinezQT Loading

visagim commented Aug 14, 2024

fedonman left a comment

Choose a reason for hiding this comment

codecov bot commented Aug 1, 2024 •

edited

Loading

fedonman commented Aug 14, 2024 •

edited by jjmartinezQT

Loading