Collect classical registers using a set (#10496) #10505

cjh1 · 2023-07-26T17:28:15Z

Summary

Fixes issues with collapsing circuits with multiple conditions on the same registers.

Details and comments

This adds a test case that adds multiple conditions on the same register. The test case is fixed by using a set to collect the classical registers in collapse_to_operation.

fixes: #10496

This adds a test case that adds multiple conditions on the same register. The test case is fixed by using a set to collect the classical registers in collapse_to_operation.

CLAassistant · 2023-07-26T17:28:19Z

All committers have signed the CLA.

qiskit-bot · 2023-07-26T17:28:29Z

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

mtreinish

This LGTM, thanks for the fast fix.

mtreinish · 2023-07-26T18:22:25Z

Oh actually before I can merge this can you sign the CLA. The CLA bot comment has a link to the details on this: #10505 (comment)

cjh1 · 2023-07-26T18:46:22Z

@mtreinish Thanks for the approval. I am working on getting the CLA signed, it needs to be review by our IP group as I think we need to sign the corporate one, fingers crossed it doesn't take too long.

coveralls · 2023-07-26T18:49:25Z

Pull Request Test Coverage Report for Build 5671878806

2 of 2 (100.0%) changed or added relevant lines in 1 file are covered.
4 unchanged lines in 2 files lost coverage.
Overall coverage increased (+0.04%) to 85.945%

Files with Coverage Reduction	New Missed Lines	%
qiskit/extensions/unitary.py	1	93.75%
crates/qasm2/src/lex.rs	3	91.65%

Totals
Change from base Build 5667924881:	0.04%
Covered Lines:	73058
Relevant Lines:	85006

💛 - Coveralls

mtreinish · 2023-08-15T11:44:07Z

Is there any update on this? We're preparing a 0.25.1 release soon and it would be great to include this fix as part of that.

cjh1 · 2023-10-02T16:13:42Z

@mtreinish We are still waiting on IBM to respond to our email about signing the corporate CLA 😦

1ucian0 · 2023-10-24T20:25:02Z

hi @cjh1, Sep 29 we sent you the CCLA to sign. Let me know if you did not get it.

cjh1 · 2023-10-24T20:27:45Z

Thanks @1ucian0, will follow up on my end.

1ucian0 · 2023-10-31T12:34:07Z

The Corporate CLA was signed. Our process also requieres that you sign the CLA in addition. After that, we are ready to merge.

cjh1 · 2023-10-31T13:04:14Z

The Corporate CLA was signed. Our process also requieres that you sign the CLA in addition. After that, we are ready to merge.

Done

jakelishman · 2023-10-31T14:24:20Z

No longer on hold because the CCLA is now signed 🎉

jakelishman

Thanks so much for working through the CCLA process. We're streamlining our side of this as well, to help reduce friction in the future.

I've just pushed up a release note for the bugfix, but the code already looked great thanks.

* Collect classical registers using a set (#10496) This adds a test case that adds multiple conditions on the same register. The test case is fixed by using a set to collect the classical registers in collapse_to_operation. * Add release note --------- Co-authored-by: Jake Lishman <[email protected]> (cherry picked from commit b47c28b)

* Collect classical registers using a set (#10496) This adds a test case that adds multiple conditions on the same register. The test case is fixed by using a set to collect the classical registers in collapse_to_operation. * Add release note --------- Co-authored-by: Jake Lishman <[email protected]> (cherry picked from commit b47c28b) Co-authored-by: Chris Harris <[email protected]>

Collect classical registers using a set (Qiskit#10496)

83cf107

This adds a test case that adds multiple conditions on the same register. The test case is fixed by using a set to collect the classical registers in collapse_to_operation.

cjh1 requested a review from a team as a code owner July 26, 2023 17:28

qiskit-bot added the Community PR PRs from contributors that are not 'members' of the Qiskit repo label Jul 26, 2023

mtreinish added Changelog: Bugfix Include in the "Fixed" section of the changelog stable backport potential The bug might be minimal and/or import enough to be port to stable labels Jul 26, 2023

mtreinish added this to the 0.25.0 milestone Jul 26, 2023

mtreinish previously approved these changes Jul 26, 2023

View reviewed changes

mtreinish added Changelog: None Do not include in changelog and removed Changelog: Bugfix Include in the "Fixed" section of the changelog labels Jul 26, 2023

mtreinish added the on hold Can not fix yet label Jul 26, 2023

mtreinish modified the milestones: 0.25.0, 0.25.1 Jul 27, 2023

mtreinish modified the milestones: 0.25.1, 0.25.2 Aug 17, 2023

1ucian0 modified the milestones: 0.25.2, 0.25.3 Sep 28, 2023

mtreinish modified the milestones: 0.25.3, 0.45.1 Oct 24, 2023

Merge branch 'main' into block-collapser

8641626

jakelishman removed the on hold Can not fix yet label Oct 31, 2023

Add release note

52f39c8

jakelishman dismissed mtreinish’s stale review via 52f39c8 October 31, 2023 14:27

jakelishman approved these changes Oct 31, 2023

View reviewed changes

jakelishman enabled auto-merge October 31, 2023 14:28

jakelishman modified the milestones: 0.45.1, 0.45.0 Oct 31, 2023

jakelishman added Changelog: Bugfix Include in the "Fixed" section of the changelog and removed Changelog: None Do not include in changelog labels Oct 31, 2023

jakelishman added this pull request to the merge queue Oct 31, 2023

Merged via the queue into Qiskit:main with commit b47c28b Oct 31, 2023
13 checks passed

mergify bot mentioned this pull request Oct 31, 2023

Collect classical registers using a set (#10496) (backport #10505) #11157

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Collect classical registers using a set (#10496) #10505

Collect classical registers using a set (#10496) #10505

cjh1 commented Jul 26, 2023

CLAassistant commented Jul 26, 2023 •

edited

Loading

qiskit-bot commented Jul 26, 2023

mtreinish left a comment

mtreinish commented Jul 26, 2023

cjh1 commented Jul 26, 2023

coveralls commented Jul 26, 2023

mtreinish commented Aug 15, 2023

cjh1 commented Oct 2, 2023

1ucian0 commented Oct 24, 2023

cjh1 commented Oct 24, 2023

1ucian0 commented Oct 31, 2023 •

edited

Loading

cjh1 commented Oct 31, 2023

jakelishman commented Oct 31, 2023

jakelishman left a comment

Collect classical registers using a set (#10496) #10505

Collect classical registers using a set (#10496) #10505

Conversation

cjh1 commented Jul 26, 2023

Summary

Details and comments

CLAassistant commented Jul 26, 2023 • edited Loading

qiskit-bot commented Jul 26, 2023

mtreinish left a comment

Choose a reason for hiding this comment

mtreinish commented Jul 26, 2023

cjh1 commented Jul 26, 2023

coveralls commented Jul 26, 2023

Pull Request Test Coverage Report for Build 5671878806

💛 - Coveralls

mtreinish commented Aug 15, 2023

cjh1 commented Oct 2, 2023

1ucian0 commented Oct 24, 2023

cjh1 commented Oct 24, 2023

1ucian0 commented Oct 31, 2023 • edited Loading

cjh1 commented Oct 31, 2023

jakelishman commented Oct 31, 2023

jakelishman left a comment

Choose a reason for hiding this comment

CLAassistant commented Jul 26, 2023 •

edited

Loading

1ucian0 commented Oct 31, 2023 •

edited

Loading