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 memory-owning expr.Var nodes #11667

Merged
merged 1 commit into from
Jan 29, 2024
Merged

Conversation

jakelishman
Copy link
Member

@jakelishman jakelishman commented Jan 29, 2024

Summary

This commit is a roll-up reversion of the following commits (PR):

This is being done to clear the 1.0 branch of memory-owning expr.Var variables and Store instructions. It should be re-applied once 1.0 is released.

This wasn't done by individual revert operations, because there were also significant structural changes introduced in those PRs that were very valid and should be maintained. Cross-references to Var nodes from other functions have been removed for now.

Making Var and types.Type hashable is maintained, as is the Var.standalone function, in order to prepare the ground for the inclusion of proper Var nodes in a minor release.

Details and comments

@jakelishman jakelishman added the Changelog: None Do not include in changelog label Jan 29, 2024
@jakelishman jakelishman added this to the 1.0.0 milestone Jan 29, 2024
@jakelishman jakelishman requested a review from a team as a code owner January 29, 2024 16:20
@qiskit-bot
Copy link
Collaborator

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

  • @Qiskit/terra-core

@jakelishman
Copy link
Member Author

Ach, I've borked this pretty badly and need to redo it, possibly by avoiding git revert - there's too many structural changes in the linked PRs that should stay in place.

This commit is a roll-up reversion of the following commits (PR):

* commit a79e879 (Qiskit#10977)
* commit ba161e9 (Qiskit#10974)
* commit 50e8137 (Qiskit#10944)

This is being done to clear the 1.0 branch of memory-owning `expr.Var`
variables and `Store` instructions.  It should be re-applied once 1.0 is
released.

This wasn't done by individual `revert` operations, because there were
also significant structural changes introduced in those PRs that were
very valid and should be maintained.  Cross-references to `Var` nodes
from other functions have been removed for now.

Making `Var` and `types.Type` hashable is maintained, as is the
`Var.standalone` function, in order to prepare the ground for the
inclusion of proper `Var` nodes in a minor release.
@jakelishman
Copy link
Member Author

Ok, I redid the reversion much more manually, and this should be rather better now.

@coveralls
Copy link

Pull Request Test Coverage Report for Build 7700797447

  • -1 of 10 (90.0%) changed or added relevant lines in 3 files are covered.
  • 22 unchanged lines in 6 files lost coverage.
  • Overall coverage decreased (-0.04%) to 89.501%

Changes Missing Coverage Covered Lines Changed/Added Lines %
qiskit/circuit/classical/expr/expr.py 7 8 87.5%
Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/expr.rs 1 93.81%
qiskit/circuit/classical/expr/expr.py 1 90.7%
qiskit/circuit/classical/types/ordering.py 1 94.64%
qiskit/circuit/quantumcircuit.py 2 94.23%
crates/qasm2/src/lex.rs 5 91.94%
crates/qasm2/src/parse.rs 12 97.15%
Totals Coverage Status
Change from base Build 7700276174: -0.04%
Covered Lines: 59295
Relevant Lines: 66251

💛 - Coveralls

Copy link
Member

@mtreinish mtreinish left a comment

Choose a reason for hiding this comment

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

Given the time frame for 1.0.0 I agree reverting this before the release is probably the right call at this point. We should revert this after we tag 1.0.0rc1 and development for 1.1.0 open up on main.

@mtreinish mtreinish added this pull request to the merge queue Jan 29, 2024
Merged via the queue into Qiskit:main with commit 052d889 Jan 29, 2024
12 checks passed
@jakelishman jakelishman deleted the var/revert branch January 29, 2024 20:28
jakelishman added a commit to jakelishman/qiskit-terra that referenced this pull request Feb 16, 2024
github-merge-queue bot pushed a commit that referenced this pull request Feb 26, 2024
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