Add `EstimatorQNN` class using terra primitives #470

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

Merged

adekusar-drl merged 54 commits into qiskit-community:main from a-matsuo:estimator-qnn

Oct 31, 2022

Contributor

a-matsuo commented Sep 14, 2022 •

edited

Loading

Summary

This PR introduce a new NeuralNetwork class, EsitmatorQNN, that uses the Estimator primitive inside.

unittests

close #401

Details and comments

a-matsuo added 4 commits

September 14, 2022 20:22


          wip estimator qnn

9c11a3c

wip

e9ff1ca


          added estimator qnn

72dbe9a


          Merge remote-tracking branch 'upstream/main' into estimator-qnn

94a7224

a-matsuo changed the title ~~[WIP] Add EstimatorQNN class using terra primitives~~ Add EstimatorQNN class using terra primitives

coveralls commented Sep 21, 2022 •

edited

Loading

Pull Request Test Coverage Report for Build 3357361719

135 of 139 (97.12%) changed or added relevant lines in 3 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.4%) to 88.851%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
qiskit_machine_learning/neural_networks/estimator_qnn.py	100	104	96.15%

Totals
Change from base Build 3340802279:	0.4%
Covered Lines:	3411
Relevant Lines:	3839

💛 - Coveralls

a-matsuo added 3 commits

October 4, 2022 18:52


          wip added unittests

c32704f


          Merge remote-tracking branch 'upstream/main' into estimator-qnn

59e00ab


          added unittests

d1df031

a-matsuo marked this pull request as ready for review

October 5, 2022 01:14

a-matsuo requested review from adekusar-drl, manoelmarques, stefan-woerner and woodsp-ibm as code owners

October 5, 2022 01:14

a-matsuo added 3 commits

October 5, 2022 10:26


          reno

a490bbc


          fix reno

97129b4


          support estimator qnn in two_layer_qnn

800dcce

adekusar-drl reviewed

View reviewed changes

Collaborator

adekusar-drl left a comment

Thanks, I have run a first pass of the code review.
Can you please:

Update VQR to make use of EstimatorQNN.
Update the tests for VQR.
If you find that VQR does not really need TwoLayerQNN, then maybe it is easier to deprecate TwoLayerQNN instead of updating it.
Depending on the previous outcome: add tests for TwoLayerQNN when both branches (old and new) of the code are tested.

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/two_layer_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/two_layer_qnn.py Show resolved Hide resolved

test/neural_networks/test_estimator_qnn.py Show resolved Hide resolved

test/neural_networks/test_estimator_qnn.py Outdated Show resolved Hide resolved

test/neural_networks/test_estimator_qnn.py Outdated Show resolved Hide resolved

ElePT reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/two_layer_qnn.py Outdated Show resolved Hide resolved

woodsp-ibm reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/two_layer_qnn.py Show resolved Hide resolved

woodsp-ibm added this to the 0.5.0 milestone

a-matsuo and others added 9 commits

October 19, 2022 17:01


          Merge remote-tracking branch 'upstream/main' into estimator-qnn

cd4a528


          updated

2da01a7


          make codes simpler with numpy

dfb54bd


          fix two_layer_qnn.py

b1332d7


          wip unittests

849dca4


          update vqr

976445f


          fix pylint

219e7e6


          use kwargs

706c6ba


          simplify reno code block

3cf8cac

a-matsuo and others added 6 commits

October 26, 2022 16:55


          updated

6fe8816


          fix lint

8c1cea1

fix

2c29d8b


          fix spelling mistake

d1f892f


          fix backward pass with no weight params

482e720

fix

ff4915b

woodsp-ibm reviewed

View reviewed changes

releasenotes/notes/add-estimator-qnn-270b31662988bef9.yaml Outdated Show resolved Hide resolved

releasenotes/notes/add-estimator-qnn-270b31662988bef9.yaml Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

qiskit_machine_learning/neural_networks/estimator_qnn.py Show resolved Hide resolved

a-matsuo added 2 commits

October 28, 2022 11:45


          reflected comments


          Merge remote-tracking branch 'upstream/main' into estimator-qnn

f0d43ba

Contributor Author

a-matsuo commented Oct 28, 2022

Thank you @woodsp-ibm! I reflected your comments.

a-matsuo and others added 2 commits

October 28, 2022 16:57


          fix spell

923f80b


          Merge remote-tracking branch 'a-matsuo/estimator-qnn' into estimator-qnn

2fc49ef

ElePT reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

adekusar-drl reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

ElePT reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

a-matsuo and others added 3 commits

October 28, 2022 19:33

fix

090ffd8


          Merge remote-tracking branch 'a-matsuo/estimator-qnn' into estimator-qnn

63268a7


          add torch tests

68018db

ElePT reviewed

View reviewed changes

qiskit_machine_learning/neural_networks/estimator_qnn.py Outdated Show resolved Hide resolved

adekusar-drl requested a review from woodsp-ibm

October 28, 2022 14:55


          update docstring

7b547c1

This was referenced Oct 28, 2022

Updated tutorials #501

Merged

Usage with qiskit runtime #497

Closed

adekusar-drl added 4 commits

October 30, 2022 14:24


          added a code snippet

4f2b1e8


          fix spell

695670f


          fix spell

86412ad


          fix pylint, fix condition

86b9ae2

woodsp-ibm approved these changes

View reviewed changes

adekusar-drl merged commit 670bc12 into qiskit-community:main

oscar-wallis pushed a commit that referenced this pull request


          Add EstimatorQNN class using terra primitives (#470)

f1af54a

* wip estimator qnn

* wip

* added estimator qnn

* wip added unittests

* added unittests

* reno

* fix reno

* support estimator qnn in two_layer_qnn

* updated

* make codes simpler with numpy

* fix two_layer_qnn.py

* wip unittests

* update vqr

* fix pylint

* use kwargs

* simplify reno code block

* refactorings

* unit tests, reno, spelling

* vqr properties test

* vectorize forward post processing

* some refactorings

* Update qiskit_machine_learning/algorithms/regressors/vqr.py

Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>

* Update qiskit_machine_learning/algorithms/regressors/vqr.py

Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>

* Update qiskit_machine_learning/algorithms/regressors/vqr.py

Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>

* docstrings

* added more unittests

* Update releasenotes/notes/add-estimator-qnn-270b31662988bef9.yaml

Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>

* code review

* updated

* fix lint

* fix

* fix spelling mistake

* fix backward pass with no weight params

* fix

* reflected comments

* fix spell

* fix

* add torch tests

* update docstring

* added a code snippet

* fix spell

* fix spell

* fix pylint, fix condition

Co-authored-by: Anton Dekusar <adekusar@ie.ibm.com>
Co-authored-by: Anton Dekusar <62334182+adekusar-drl@users.noreply.github.com>
Co-authored-by: Manoel Marques <Manoel.Marques@ibm.com>
Co-authored-by: Steve Wood <40241007+woodsp-ibm@users.noreply.github.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet