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

Jump to bottom

Integrate QRAO into Qiskit Optimization #487

Merged
merged 89 commits into from
Sep 8, 2023
Merged

Integrate QRAO into Qiskit Optimization #487

merged 89 commits into from
Sep 8, 2023

Conversation

a-matsuo
Copy link
Contributor

@a-matsuo a-matsuo commented Mar 24, 2023 •
edited
Loading

Summary

This pull request is for integrating qrao-prototype into Qiskit Optimization.

close #473

Details and comments

  • Move QRAO files to Qiskit Optimization and check whether they work. (~3/27)
  • Conduct a thorough review of the existing QRAO code including unittests and tutorials to identify any potential issues when moving to Qiskit Optimization. (3/27 ~ 3/31)
  • Design a new implementation of the existing QRAO classes that is compatible with Qiskit Optimization. (4/1 ~ 4/7)
  • Implement the new QRAO implementation in Qiskit Optimization. (4/7 ~ 4/14)
    • Use Estimator and Sampler instead of quantum instance
    • Use SparsePauliOp instead of PauliSumOp
  • Write unit tests to verify the functionality of the QRAO implementation and ensure that it is compatible with the Qiskit Optimization framework. (4/14 ~ 4/21)
  • Create documentation and a tutorial for the QRAO implementation and Finalize the PR. (~5/12)

The following figure is for the existing implementation of QRAO.
classes

The following is a workflow diagram of the new QuantumRandomAccessOptimizer class.
qrao_diagram

Co-authored-by: Jim Garrison garrison@ibm.com
Co-authored-by: Bryce Fuller Bryce.Fuller@ibm.com
Co-authored-by: Jennifer Glick Jennifer.R.Glick@ibm.com
Co-authored-by: Caleb Johnson calebj1524@outlook.com
Co-authored-by: Takashi Imamichi 31178928+t-imamichi@users.noreply.github.com
Co-authored-by: Toshinari Itoko itoko@jp.ibm.com
Co-authored-by: Areeq Hasan areeq.i.hasan@gmail.com
Co-authored-by: Steve Wood 40241007+woodsp-ibm@users.noreply.github.com

@woodsp-ibm woodsp-ibm added this to the 0.6.0 milestone Apr 13, 2023
a-matsuo and others added 9 commits April 16, 2023 16:21
@a-matsuo
update qrao
6e914ce
@a-matsuo
update qrao
32acacb
@a-matsuo
add expecation_values getter
31507c1
@a-matsuo
Merge remote-tracking branch 'upstream/main' into qrao
b210cb0
@a-matsuo
inherit OptimizationAlgorithm
11a5e40
@a-matsuo
Merge remote-tracking branch 'upstream/main' into qrao
ba244a2
@a-matsuo
add unittests for encoding
6a67943
@a-matsuo
add unittests for optimizer
41f86eb
@a-matsuo @garrison
@BryceFuller @jenglick @caleb-johnson @t-imamichi @itoko @areeq-hasan
add unittests for optimizer
b4277ad 
Co-authored-by: Jim Garrison <garrison@ibm.com>
Co-authored-by: Bryce Fuller <Bryce.Fuller@ibm.com>
Co-authored-by: Jennifer Glick <Jennifer.R.Glick@ibm.com>
Co-authored-by: Caleb Johnson <calebj1524@outlook.com>
Co-authored-by: Takashi Imamichi <31178928+t-imamichi@users.noreply.github.com>
Co-authored-by: Toshinari Itoko <itoko@jp.ibm.com>
Co-authored-by: Areeq Hasan <areeq.i.hasan@gmail.com>
@t-imamichi
Copy link
Collaborator

Could you merge main and apply black? Since black may change the code drastically, I would like to add comments after black.

@a-matsuo
Copy link
Contributor Author

Yes, I applied pylint, mypy, and black to clean up the code. (I also merged main)

@a-matsuo a-matsuo marked this pull request as ready for review May 12, 2023 08:16
@a-matsuo a-matsuo changed the title [WIP] Integrate QRAO into Qiskit Optimization Integrate QRAO into Qiskit Optimization May 12, 2023
a-matsuo and others added 12 commits September 7, 2023 17:20
@a-matsuo
fix
8e0cb42
@a-matsuo @woodsp-ibm
Update docs/tutorials/13_quantum_random_access_optimizer.ipynb
74dec95 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo @woodsp-ibm
Update docs/tutorials/13_quantum_random_access_optimizer.ipynb
a5ec643 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo
fix
c1c329d
@a-matsuo @woodsp-ibm
Update qiskit_optimization/algorithms/qrao/__init__.py
cbba4f8 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo @woodsp-ibm
Update releasenotes/notes/qrao-89d5ff1d2927de64.yaml
4b2ea88 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo @woodsp-ibm
Update test/algorithms/qrao/test_magic_rounding.py
9f61f4c 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo @woodsp-ibm
Update test/algorithms/qrao/test_quantum_random_access_optimizer.py
bf16e25 
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>
@a-matsuo
fix mypy
3b4570e
@a-matsuo
Merge remote-tracking branch 'upstream/main' into qrao
e494613
@a-matsuo
fix
6e1f1c3
@a-matsuo
fix
d5ffb28
woodsp-ibm
woodsp-ibm previously approved these changes Sep 7, 2023
View reviewed changes
Copy link
Member

@woodsp-ibm woodsp-ibm left a comment

Choose a reason for hiding this comment

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

To me it all looks good now. Thx for all the fixups and changes.

@a-matsuo
Copy link
Contributor Author

a-matsuo commented Sep 7, 2023

Thank you for reviewing always! @woodsp-ibm

@t-imamichi
Copy link
Collaborator

I have a comment. We removed 12_qaoa_runtime.ipynb at #542. So, you can use the number 12 for QRAO tutorial.

@t-imamichi t-imamichi added the Changelog: New feature Include in the Added section of the changelog label Sep 8, 2023
@a-matsuo
Copy link
Contributor Author

a-matsuo commented Sep 8, 2023

Got it. @t-imamichi

t-imamichi
t-imamichi approved these changes Sep 8, 2023
View reviewed changes
Copy link
Collaborator

@t-imamichi t-imamichi left a comment

Choose a reason for hiding this comment

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

LGTM

@mergify mergify bot merged commit d7b9ddb into qiskit-community:main Sep 8, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t-imamichi t-imamichi t-imamichi approved these changes

@woodsp-ibm woodsp-ibm woodsp-ibm approved these changes

@stefan-woerner stefan-woerner Awaiting requested review from stefan-woerner stefan-woerner is a code owner

@garrison garrison Awaiting requested review from garrison

Assignees
No one assigned
Labels
automerge Changelog: New feature Include in the Added section of the changelog
Projects
None yet
Milestone
0.6.0
Development

Successfully merging this pull request may close these issues.

Integrate QRAO
6 participants
@a-matsuo @t-imamichi @woodsp-ibm @coveralls @CLAassistant @garrison