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

Improve casting and error message for ParameterExpression (backport #10244) #10268

Merged
merged 2 commits into from
Jun 16, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2023

This is an automatic backport of pull request #10244 done by Mergify.
Cherry-pick of 86df15d has failed:

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

You are currently cherry-picking commit 86df15d3b.
  (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:   qiskit/circuit/parameterexpression.py
	modified:   qiskit/circuit/quantumcircuit.py
	new file:   releasenotes/notes/parameter-float-cast-48f3731fec5e47cd.yaml

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested a review from a team as a code owner June 12, 2023 19:02
@mergify mergify bot added the conflicts used by mergify when there are conflicts in a port label Jun 12, 2023
@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:

  • @Qiskit/terra-core

* Improve casting and error message for `ParameterExpression`

Previously, we assumed that the only reason a cast of
`ParameterExpression` to `complex`/`float`/`int` could fail was because
of unbound parameters, and emitted an error accordingly.  This is not
the case; a fully bound complex value will still fail to convert to
`float`.

This PR improves the error messages in these cases, and works around a
difference of Sympy and Symengine, where the latter will fail to convert
real-valued expressions that were symbollically complex at some point in
their binding history to `float`.  Sympy more reliably reduces values
down to real-only values when the imaginary part is exactly cancelled,
which is a use-case our users tend to expect.

* Fix typo in test

* Update releasenotes/notes/parameter-float-cast-48f3731fec5e47cd.yaml

Co-authored-by: Kevin Hartman <[email protected]>

---------

Co-authored-by: Kevin Hartman <[email protected]>
@jakelishman jakelishman force-pushed the mergify/bp/stable/0.24/pr-10244 branch from 7a3512b to b988969 Compare June 15, 2023 22:38
@jakelishman jakelishman added Changelog: Bugfix Include in the "Fixed" section of the changelog and removed conflicts used by mergify when there are conflicts in a port labels Jun 15, 2023
@jakelishman jakelishman added this to the 0.24.2 milestone Jun 15, 2023
@jakelishman jakelishman added this pull request to the merge queue Jun 16, 2023
Merged via the queue into stable/0.24 with commit 31f26d2 Jun 16, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.24/pr-10244 branch June 16, 2023 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changelog: Bugfix Include in the "Fixed" section of the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants