Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 34k
gh-120010: fix invalid (nan+nanj) results in _Py_c_prod()#120287
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
Merged
serhiy-storchaka merged 9 commits into python:main from skirpichev:cc-in-py_c_prod-120010Dec 6, 2024
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
9 commits Select commit Hold shift + click to select a range
399e3e3 gh-120010: fix invalid (nan+nanj) results in _Py_c_prod()
skirpichev 324c602 address review: declarations
skirpichev fcafe33 Merge branch 'main' into cc-in-py_c_prod-120010
skirpichev 5509a2d address review: use subTest
skirpichev 0e98116 Update Misc/NEWS.d/next/Core and Builtins/2024-06-04-08-26-25.gh-issu…
skirpichev 338176d + fix typo
skirpichev 83456ef Merge branch 'main' into cc-in-py_c_prod-120010
skirpichev 219c0cb + rename
skirpichev e368f23 Update Objects/complexobject.c
skirpichev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions 2 Misc/NEWS.d/next/Core_and_Builtins/2024-06-04-08-26-25.gh-issue-120010._z-AWz.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| Correct invalid corner cases which resulted in ``(nan+nanj)`` output in complex | ||
| multiplication, e.g., ``(1e300+1j)*(nan+infj)``. Patch by Sergey B Kirpichev. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -85,11 +85,63 @@ _Py_c_neg(Py_complex a) | ||
| } | ||
| Py_complex | ||
| _Py_c_prod(Py_complex a, Py_complex b) | ||
| _Py_c_prod(Py_complex z, Py_complex w) | ||
| { | ||
| Py_complex r; | ||
| r.real = a.real*b.real - a.imag*b.imag; | ||
| r.imag = a.real*b.imag + a.imag*b.real; | ||
| double a = z.real, b = z.imag, c = w.real, d = w.imag; | ||
| double ac = a*c, bd = b*d, ad = a*d, bc = b*c; | ||
| Py_complex r ={ac - bd, ad + bc}; | ||
| /* Recover infinities that computed as nan+nanj. See e.g. the C11, | ||
| Annex G.5.1, routine _Cmultd(). */ | ||
| if (isnan(r.real) && isnan(r.imag)){ | ||
picnixz marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading. Please reload this page. | ||
| int recalc = 0; | ||
| if (isinf(a) || isinf(b)){/* z is infinite */ | ||
| /* "Box" the infinity and change nans in the other factor to 0 */ | ||
| a = copysign(isinf(a) ? 1.0 : 0.0, a); | ||
| b = copysign(isinf(b) ? 1.0 : 0.0, b); | ||
| if (isnan(c)){ | ||
| c = copysign(0.0, c); | ||
| } | ||
| if (isnan(d)){ | ||
| d = copysign(0.0, d); | ||
| } | ||
| recalc = 1; | ||
| } | ||
| if (isinf(c) || isinf(d)){/* w is infinite */ | ||
| /* "Box" the infinity and change nans in the other factor to 0 */ | ||
| c = copysign(isinf(c) ? 1.0 : 0.0, c); | ||
| d = copysign(isinf(d) ? 1.0 : 0.0, d); | ||
| if (isnan(a)){ | ||
| a = copysign(0.0, a); | ||
| } | ||
| if (isnan(b)){ | ||
| b = copysign(0.0, b); | ||
| } | ||
| recalc = 1; | ||
| } | ||
| if (!recalc && (isinf(ac) || isinf(bd) || isinf(ad) || isinf(bc))){ | ||
| /* Recover infinities from overflow by changing nans to 0 */ | ||
| if (isnan(a)){ | ||
| a = copysign(0.0, a); | ||
| } | ||
| if (isnan(b)){ | ||
| b = copysign(0.0, b); | ||
| } | ||
| if (isnan(c)){ | ||
| c = copysign(0.0, c); | ||
| } | ||
| if (isnan(d)){ | ||
| d = copysign(0.0, d); | ||
| } | ||
| recalc = 1; | ||
| } | ||
| if (recalc){ | ||
| r.real = Py_INFINITY*(a*c - b*d); | ||
| r.imag = Py_INFINITY*(a*d + b*c); | ||
| } | ||
| } | ||
| return r; | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be ok now. This doesn't require a mixed-mode variant.
Yet, maybe I should change variable names back for consistency with the rest? Current naming here follows to the C standard.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@serhiy-storchaka what do you think about renaming of arguments?
I think mapping local variables "abcd" -> "tuvw" will hot hurt readability and then we can preserve original argument names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am fine with both variants. Preserving names from the old code can make the diff smaller, but in this case the new code is too different from the old code. Using names from the C standard examples helps comparing our code with the original code. The latter looks more important here.