Skip to content

Fix pickling of NLayout (backport #12298) #12299

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
merged 2 commits into from
Apr 26, 2024
Merged

Fix pickling of NLayout (backport #12298) #12299

merged 2 commits into from
Apr 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 25, 2024

Summary

Previously the module of this was set incorrectly (stemming from its move in gh-9064), at which point the __getstate__/__setstate__ pickling wouldn't work correctly any more. Also, however, there was no __getnewargs__ and new didn't have a zero-argument form, so this wouldn't have worked either.

Details and comments

No changelog because this is a private class, and it doesn't actually seem to be causing us problems.

This is an automatic backport of pull request #12298 done by Mergify.

@mergify mergify bot requested a review from a team as a code owner April 25, 2024 22:27
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Apr 25, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 25, 2024

Cherry-pick of 136548c has failed:

On branch mergify/bp/stable/0.46/pr-12298
Your branch is up to date with 'origin/stable/0.46'.

You are currently cherry-picking commit 136548c9d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   crates/accelerate/src/nlayout.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/python/transpiler/test_layout.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Apr 25, 2024
Merged
@qiskit-bot
Copy link
Collaborator

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:

@github-actions github-actions bot added the Changelog: None Do not include in changelog label Apr 25, 2024
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.46/pr-12298 branch from fb38c26 to 3ec5c34 Compare April 25, 2024 23:09
@jakelishman
Fix pickling of NLayout (#12298)
19fab65 
Previously the module of this was set incorrectly (stemming from its
move in gh-9064), at which point the `__getstate__`/`__setstate__`
pickling wouldn't work correctly any more.  Also, however, there was no
`__getnewargs__` and `new` didn't have a zero-argument form, so this
wouldn't have worked either.
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.46/pr-12298 branch from 3ec5c34 to 19fab65 Compare April 25, 2024 23:11
jakelishman
jakelishman previously approved these changes Apr 25, 2024
View reviewed changes
Copy link
Member

@jakelishman jakelishman left a comment

Choose a reason for hiding this comment

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

Quick detour from pushing the wrong HEAD to this ref, but we're back.

@jakelishman jakelishman enabled auto-merge April 25, 2024 23:11
@jakelishman jakelishman removed the conflicts used by mergify when there are conflicts in a port label Apr 25, 2024
@jakelishman jakelishman added this to the 0.46.2 milestone Apr 25, 2024
@coveralls
Copy link

Pull Request Test Coverage Report for Build 8840591157

Details

  • 7 of 7 (100.0%) changed or added relevant lines in 1 file are covered.
  • 2 unchanged lines in 1 file lost coverage.
  • Overall coverage increased (+0.02%) to 86.866%
Files with Coverage Reduction New Missed Lines %
crates/qasm2/src/lex.rs 2 92.88%
Totals Coverage Status
Change from base Build 8752286777: 0.02%
Covered Lines: 75002
Relevant Lines: 86342
💛 - Coveralls

@jakelishman jakelishman added this pull request to the merge queue Apr 26, 2024
Merged via the queue into stable/0.46 with commit 54a006e Apr 26, 2024
@mergify mergify bot deleted the mergify/bp/stable/0.46/pr-12298 branch April 26, 2024 01:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakelishman jakelishman jakelishman approved these changes

@nonhermitian nonhermitian Awaiting requested review from nonhermitian

@eggerdj eggerdj Awaiting requested review from eggerdj

@wshanks wshanks Awaiting requested review from wshanks

@alexanderivrii alexanderivrii Awaiting requested review from alexanderivrii

@ShellyGarion ShellyGarion Awaiting requested review from ShellyGarion

@jyu00 jyu00 Awaiting requested review from jyu00

@woodsp-ibm woodsp-ibm Awaiting requested review from woodsp-ibm

@ElePT ElePT Awaiting requested review from ElePT

Assignees
No one assigned
Labels
Changelog: None Do not include in changelog
Projects
None yet
Milestone
0.46.2
Development

Successfully merging this pull request may close these issues.
3 participants
@qiskit-bot @coveralls @jakelishman