Fix VQD callback not being used #8576

Anthony-Gandon · 2022-08-18T10:33:05Z

Fix #8575
This small change consists in adding the following lines during the call of the energy_evaluation() in VQD. These lines were taken from the VQE algorithm.

if self._callback is not None:
    variance = np.real(expectation.compute_variance(sampled_expect_op))
    estimator_error = np.sqrt(variance / self.quantum_instance.run_config.shots)
    for i, param_set in enumerate(parameter_sets):
        self._eval_count += 1
        self._callback(self._eval_count, param_set, means[i], estimator_error[i], step)
else:
    self._eval_count += len(means)

The corresponding test is modified accordingly.
The callback also keeps track of the current step in the VQD algorithm.

Fixes Qiskit#415 QEOM creates a dictionary of operators to evaluate on the groundstate. When using the noisy simulators (qasm_simulator or aer_simulator), one could either use PauliExpectation (with noise) or AerPauliExpectation (without noise). PauliExpectation works with non-hermitian operators but internal methods of AerPauliExpectation raised an Error. This is a workaround to this limitation. Note that using include_custom=True on qasm allows the VQE to use a local AerPauliExpectation without using the "expectation" input. This does not apply to QEOM and one should explicitly define the "expectation" input of the VQE for it to apply globally.

… into qeom_commit_aerpauliexpectation # Conflicts: # qiskit/opflow/expectations/aer_pauli_expectation.py

… into qeom_commit_aerpauliexpectation

… into qeom_commit_aerpauliexpectation # Conflicts: # test/python/opflow/test_aer_pauli_expectation.py

Co-authored-by: Julien Gacon <gaconju@gmail.com>

Use a generator instead of list

Co-authored-by: Julien Gacon <gaconju@gmail.com>

…ation-653d8e16de4eca07.yaml Co-authored-by: Julien Gacon <gaconju@gmail.com>

…surement=True)

qiskit-bot · 2022-08-18T10:33:07Z

Thank you for opening a new pull request.

Before your PR can be merged it will first need to pass continuous integration tests and be reviewed. Sometimes the review process can be slow, so please be patient.

While you're waiting, please feel free to review other open PRs. While only a subset of people are authorized to approve pull requests for merging, everyone is encouraged to review open pull requests. Doing reviews helps reduce the burden on the core team and helps make the project's code better for everyone.

One or more of the the following people are requested to review this:

@Qiskit/terra-core
@manoelmarques
@woodsp-ibm

coveralls · 2022-08-18T11:07:27Z

Pull Request Test Coverage Report for Build 2921681226

12 of 12 (100.0%) changed or added relevant lines in 1 file are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.001%) to 84.124%

Totals
Change from base Build 2921678108:	0.001%
Covered Lines:	56649
Relevant Lines:	67340

💛 - Coveralls

jlapeyre

LGTM. I did have a small question.

qiskit/algorithms/eigen_solvers/vqd.py

Cryoris

LGTM thanks for the fix!

jlapeyre

Thanks!

* Added support for non-hermitian operators in AerPauliExpectation Fixes Qiskit#415 QEOM creates a dictionary of operators to evaluate on the groundstate. When using the noisy simulators (qasm_simulator or aer_simulator), one could either use PauliExpectation (with noise) or AerPauliExpectation (without noise). PauliExpectation works with non-hermitian operators but internal methods of AerPauliExpectation raised an Error. This is a workaround to this limitation. Note that using include_custom=True on qasm allows the VQE to use a local AerPauliExpectation without using the "expectation" input. This does not apply to QEOM and one should explicitly define the "expectation" input of the VQE for it to apply globally. * Added support for non-hermitian operators in AerPauliExpectation Fixes Qiskit#415 QEOM creates a dictionary of operators to evaluate on the groundstate. When using the noisy simulators (qasm_simulator or aer_simulator), one could either use PauliExpectation (with noise) or AerPauliExpectation (without noise). PauliExpectation works with non-hermitian operators but internal methods of AerPauliExpectation raised an Error. This is a workaround to this limitation. Note that using include_custom=True on qasm allows the VQE to use a local AerPauliExpectation without using the "expectation" input. This does not apply to QEOM and one should explicitly define the "expectation" input of the VQE for it to apply globally. * Add a test case for non-hermitian operators. * Add a test case for non-hermitian operators. * Add a test case for non-hermitian operators. * Update test/python/opflow/test_aer_pauli_expectation.py Co-authored-by: Julien Gacon <gaconju@gmail.com> * Update aer_pauli_expectation.py Use a generator instead of list * Update qiskit/opflow/expectations/aer_pauli_expectation.py Co-authored-by: Julien Gacon <gaconju@gmail.com> * Update releasenotes/notes/add-support-non-hermitian-op-aerpauliexpectation-653d8e16de4eca07.yaml Co-authored-by: Julien Gacon <gaconju@gmail.com> * Add a test case for PauliOp * Change the test cases from using ~StateFn() to using StateFn(, is_measurement=True) * Fix the formatting * Working point for QEOM * Small changes + Release note * Undesired change * Undesired change * Indentation error * Parenthesis * Minor changes in docstring * Minor changes in docstring Co-authored-by: Julien Gacon <gaconju@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

* Added support for non-hermitian operators in AerPauliExpectation Fixes Qiskit/qiskit#415 QEOM creates a dictionary of operators to evaluate on the groundstate. When using the noisy simulators (qasm_simulator or aer_simulator), one could either use PauliExpectation (with noise) or AerPauliExpectation (without noise). PauliExpectation works with non-hermitian operators but internal methods of AerPauliExpectation raised an Error. This is a workaround to this limitation. Note that using include_custom=True on qasm allows the VQE to use a local AerPauliExpectation without using the "expectation" input. This does not apply to QEOM and one should explicitly define the "expectation" input of the VQE for it to apply globally. * Added support for non-hermitian operators in AerPauliExpectation Fixes Qiskit/qiskit#415 QEOM creates a dictionary of operators to evaluate on the groundstate. When using the noisy simulators (qasm_simulator or aer_simulator), one could either use PauliExpectation (with noise) or AerPauliExpectation (without noise). PauliExpectation works with non-hermitian operators but internal methods of AerPauliExpectation raised an Error. This is a workaround to this limitation. Note that using include_custom=True on qasm allows the VQE to use a local AerPauliExpectation without using the "expectation" input. This does not apply to QEOM and one should explicitly define the "expectation" input of the VQE for it to apply globally. * Add a test case for non-hermitian operators. * Add a test case for non-hermitian operators. * Add a test case for non-hermitian operators. * Update test/python/opflow/test_aer_pauli_expectation.py Co-authored-by: Julien Gacon <gaconju@gmail.com> * Update aer_pauli_expectation.py Use a generator instead of list * Update qiskit/opflow/expectations/aer_pauli_expectation.py Co-authored-by: Julien Gacon <gaconju@gmail.com> * Update releasenotes/notes/add-support-non-hermitian-op-aerpauliexpectation-653d8e16de4eca07.yaml Co-authored-by: Julien Gacon <gaconju@gmail.com> * Add a test case for PauliOp * Change the test cases from using ~StateFn() to using StateFn(, is_measurement=True) * Fix the formatting * Working point for QEOM * Small changes + Release note * Undesired change * Undesired change * Indentation error * Parenthesis * Minor changes in docstring * Minor changes in docstring Co-authored-by: Julien Gacon <gaconju@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Anthony-Gandon and others added 26 commits April 1, 2022 10:44

Merge remote-tracking branch 'origin/qeom_commit_aerpauliexpectation'…

a60dcd8

… into qeom_commit_aerpauliexpectation # Conflicts: # qiskit/opflow/expectations/aer_pauli_expectation.py

Merge remote-tracking branch 'origin/qeom_commit_aerpauliexpectation'…

d7cd270

… into qeom_commit_aerpauliexpectation # Conflicts: # qiskit/opflow/expectations/aer_pauli_expectation.py

Merge remote-tracking branch 'origin/qeom_commit_aerpauliexpectation'…

71bafc0

… into qeom_commit_aerpauliexpectation

Add a test case for non-hermitian operators.

663b483

Add a test case for non-hermitian operators.

2cfc5a4

Merge remote-tracking branch 'origin/qeom_commit_aerpauliexpectation'…

474ca18

… into qeom_commit_aerpauliexpectation # Conflicts: # test/python/opflow/test_aer_pauli_expectation.py

Add a test case for non-hermitian operators.

8311c27

Update test/python/opflow/test_aer_pauli_expectation.py

b7fc978

Co-authored-by: Julien Gacon <gaconju@gmail.com>

Update aer_pauli_expectation.py

3d875cb

Use a generator instead of list

Update qiskit/opflow/expectations/aer_pauli_expectation.py

479bdbb

Co-authored-by: Julien Gacon <gaconju@gmail.com>

Update releasenotes/notes/add-support-non-hermitian-op-aerpauliexpect…

3d4b0e9

…ation-653d8e16de4eca07.yaml Co-authored-by: Julien Gacon <gaconju@gmail.com>

Add a test case for PauliOp

3a69dc9

Change the test cases from using ~StateFn() to using StateFn(, is_mea…

7f121cb

…surement=True)

Fix the formatting

0a40bfd

Merge branch 'main' into qeom_commit_aerpauliexpectation

21ad50f

Merge branch 'main' of https://github.com/Qiskit/qiskit-terra

0b0e3a6

Merge branch 'main' of https://github.com/Qiskit/qiskit-terra

052a190

Working point for QEOM

dd9373b

Merge branch 'main' of https://github.com/Qiskit/qiskit-terra

ee3b51c

Merge branch 'main' of https://github.com/Qiskit/qiskit-terra

ca88969

Merge branch 'main' of https://github.com/Qiskit/qiskit-terra

5b2f8ab

Small changes + Release note

8d5bd5d

Undesired change

7c67429

Undesired change

a7ffa0b

Anthony-Gandon requested review from a team, manoelmarques and woodsp-ibm as code owners August 18, 2022 10:33

Indentation error

85df78f

woodsp-ibm added Changelog: Bugfix Include in the "Fixed" section of the changelog mod: algorithms Related to the Algorithms module labels Aug 18, 2022

Parenthesis

a7c4a69

jlapeyre requested changes Aug 18, 2022

View reviewed changes

qiskit/algorithms/eigen_solvers/vqd.py Outdated Show resolved Hide resolved

Anthony-Gandon added 5 commits August 18, 2022 21:50

Minor changes in docstring

5499381

Minor changes in docstring

8f24f27

Merge branch 'main' into vqd_callback

eac446d

Merge branch 'main' into vqd_callback

0c36acc

Merge branch 'main' into vqd_callback

5099acc

Cryoris approved these changes Aug 23, 2022

View reviewed changes

woodsp-ibm approved these changes Aug 23, 2022

View reviewed changes

jlapeyre approved these changes Aug 23, 2022

View reviewed changes

woodsp-ibm added the automerge label Aug 23, 2022

mergify bot and others added 3 commits August 23, 2022 21:07

Merge branch 'main' into vqd_callback

ffe1960

Merge branch 'main' into vqd_callback

bf2e3bf

Merge branch 'main' into vqd_callback

4c89370

mergify bot merged commit d970c46 into Qiskit:main Aug 24, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix VQD callback not being used #8576

Fix VQD callback not being used #8576

Anthony-Gandon commented Aug 18, 2022

qiskit-bot commented Aug 18, 2022

coveralls commented Aug 18, 2022 •

edited

Loading

jlapeyre left a comment

Cryoris left a comment

jlapeyre left a comment

Fix VQD callback not being used #8576

Fix VQD callback not being used #8576

Conversation

Anthony-Gandon commented Aug 18, 2022

qiskit-bot commented Aug 18, 2022

coveralls commented Aug 18, 2022 • edited Loading

Pull Request Test Coverage Report for Build 2921681226

💛 - Coveralls

jlapeyre left a comment

Choose a reason for hiding this comment

Cryoris left a comment

Choose a reason for hiding this comment

jlapeyre left a comment

Choose a reason for hiding this comment

coveralls commented Aug 18, 2022 •

edited

Loading