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

Revert "Implemented general Quantum Time Evolution Framework interfaces. (#7669)" #7845

Merged
merged 4 commits into from
Mar 31, 2022

Conversation

Cryoris
Copy link
Contributor

@Cryoris Cryoris commented Mar 30, 2022

Summary

This reverts commit 99d89ab.

Details and comments

We originally aimed to ship the time evolution interfaces along with the algorithms in the 0.20 release, but merging the algorithms will take more time. Therefore we'll postpone this feature to the next release and revert the interfaces to not have only the interface w/o implementation in this release.

@Cryoris Cryoris requested review from a team, manoelmarques and woodsp-ibm as code owners March 30, 2022 20:39
mtreinish
mtreinish previously approved these changes Mar 30, 2022
@mtreinish mtreinish added automerge Changelog: None Do not include in changelog labels Mar 30, 2022
@mtreinish mtreinish added this to the 0.20 milestone Mar 30, 2022
@woodsp-ibm
Copy link
Member

I guess #7758, which was done after this seems (in part) to rely on where ListOrDict was relocated as I see the test failed. For some reason the code for the aux_ops_evaluator did not import it from there but where it was originally located https://github.com/Qiskit/qiskit-terra/blob/9d671e53b43fde27cea40c69b089834cbd8dcb5d/qiskit/algorithms/aux_ops_evaluator.py#L19

After Qiskit#7669 the custom ListOrDict type it added was used in Qiskit#7758. This
was missed in the straight revert of Qiskit#7669 which was causing an import
error. This commit fixes this oversight by updating the the import in
aux_ops_evaluator to use the ListOrDict type where it lives with Qiskit#7669
reverted (this is why we should try to keep each PR to a single logical
change and avoid unrelated refactors in a PR).
@coveralls
Copy link

coveralls commented Mar 30, 2022

Pull Request Test Coverage Report for Build 2068470604

  • 10 of 10 (100.0%) changed or added relevant lines in 6 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage decreased (-0.01%) to 83.822%

Totals Coverage Status
Change from base Build 2068469279: -0.01%
Covered Lines: 53705
Relevant Lines: 64070

💛 - Coveralls

@mergify mergify bot merged commit 1b6c1b3 into Qiskit:main Mar 31, 2022
@Cryoris Cryoris deleted the revert-7669-timeevo-interfaces branch March 31, 2022 06:57
Cryoris added a commit to Cryoris/qiskit-terra that referenced this pull request Apr 1, 2022
Cryoris added a commit to Cryoris/qiskit-terra that referenced this pull request Apr 1, 2022
mergify bot pushed a commit that referenced this pull request Apr 7, 2022
* Revert "Revert "Implemented general Quantum Time Evolution Framework interfaces. (#7669)" (#7845)"

This reverts commit 1b6c1b3.

Co-authored-by: dlasecki <[email protected]>

* remove Evolver base class

* Don't import list or dict from MES

Co-authored-by: Steve Wood <[email protected]>

* fix import order

Co-authored-by: dlasecki <[email protected]>
Co-authored-by: Steve Wood <[email protected]>
ElePT pushed a commit to ElePT/qiskit that referenced this pull request Jun 27, 2023
…es. (Qiskit#7669)" (Qiskit#7845)

* Revert "Implemented general Quantum Time Evolution Framework interfaces. (Qiskit#7669)"

This reverts commit a576ddb.

* Fix dangling import

After Qiskit#7669 the custom ListOrDict type it added was used in Qiskit#7758. This
was missed in the straight revert of Qiskit#7669 which was causing an import
error. This commit fixes this oversight by updating the the import in
aux_ops_evaluator to use the ListOrDict type where it lives with Qiskit#7669
reverted (this is why we should try to keep each PR to a single logical
change and avoid unrelated refactors in a PR).

Co-authored-by: Matthew Treinish <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
ElePT pushed a commit to ElePT/qiskit that referenced this pull request Jun 27, 2023
…#7858)

* Revert "Revert "Implemented general Quantum Time Evolution Framework interfaces. (Qiskit#7669)" (Qiskit#7845)"

This reverts commit 12ab98d.

Co-authored-by: dlasecki <[email protected]>

* remove Evolver base class

* Don't import list or dict from MES

Co-authored-by: Steve Wood <[email protected]>

* fix import order

Co-authored-by: dlasecki <[email protected]>
Co-authored-by: Steve Wood <[email protected]>
ElePT pushed a commit to ElePT/qiskit-algorithms-test that referenced this pull request Jul 17, 2023
…es. (Qiskit/qiskit#7669)" (Qiskit/qiskit#7845)

* Revert "Implemented general Quantum Time Evolution Framework interfaces. (Qiskit/qiskit#7669)"

This reverts commit 6566c43.

* Fix dangling import

After Qiskit/qiskit#7669 the custom ListOrDict type it added was used in Qiskit/qiskit#7758. This
was missed in the straight revert of Qiskit/qiskit#7669 which was causing an import
error. This commit fixes this oversight by updating the the import in
aux_ops_evaluator to use the ListOrDict type where it lives with Qiskit/qiskit#7669
reverted (this is why we should try to keep each PR to a single logical
change and avoid unrelated refactors in a PR).

Co-authored-by: Matthew Treinish <[email protected]>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
ElePT pushed a commit to ElePT/qiskit-algorithms-test that referenced this pull request Jul 17, 2023
…/qiskit#7858)

* Revert "Revert "Implemented general Quantum Time Evolution Framework interfaces. (Qiskit/qiskit#7669)" (Qiskit/qiskit#7845)"

This reverts commit 2a7ffe9.

Co-authored-by: dlasecki <[email protected]>

* remove Evolver base class

* Don't import list or dict from MES

Co-authored-by: Steve Wood <[email protected]>

* fix import order

Co-authored-by: dlasecki <[email protected]>
Co-authored-by: Steve Wood <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: None Do not include in changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants