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

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

Merged

Conversation

jjmartinezQT
Copy link
Collaborator

@jjmartinezQT jjmartinezQT commented Aug 19, 2024

This PR brings the proposal for the default square measurement for annealing needed for the first demo.

visagim added 30 commits August 1, 2024 12:50
Copy link
Contributor

@visagim visagim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made some comments

@jjmartinezQT
Copy link
Collaborator Author

Made some comments

addressed, thanks!

@jjmartinezQT jjmartinezQT requested a review from visagim August 21, 2024 11:01
@jjmartinezQT jjmartinezQT requested a review from fedonman August 21, 2024 12:23
@jjmartinezQT jjmartinezQT dismissed visagim’s stale review August 21, 2024 12:23

comments addressed

Copy link
Contributor

@visagim visagim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 👍

@jjmartinezQT jjmartinezQT merged commit b037fca into main Aug 21, 2024
6 checks passed
@jjmartinezQT jjmartinezQT deleted the qhc-691-add-default-measurement-pulse-to-annealing-program branch August 21, 2024 14:32
jjmartinezQT added a commit that referenced this pull request Aug 21, 2024
…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>
jjmartinezQT added a commit that referenced this pull request Aug 21, 2024
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants