MAINT: Remove any promotion-state switching logic #27156
Merged
Conversation
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
This is the first level, no following code simplifications, just straight up deletions of any branching. I kept a UserWarning, in case someone had the bad idea to permanently set the environment variable and think they can rely on it. Although would be happy to just delete that as well.
I think we can just do that, but maybe it's prudent to just point it out anyway...
ngoldbaum
approved these changes
Aug 9, 2024
mattip
approved these changes
Aug 26, 2024
mhvk
approved these changes
Aug 26, 2024
There was a problem hiding this comment.
Looks good, but there are quite a few comments by @ngoldbaum that are unresolved (though most/all are addressed?), so just approving, not merging.
Also one tiny nitpick - not worth running CI on its own, but can be done if there are other changes to be made still.
numpy/_core/tests/test_dtype.py
Outdated
| if weak_promotion and expected_weak is not None: | ||
| expected = expected_weak | ||
|
|
||
| other, expected): |
|
Sorry for not giving this another pass! Looks good to me now. @seberg feel free to merge along with Marten's suggested fixup. |
| @@ -529,8 +529,11 @@ def hugepage_setup(): | ||
| _core.multiarray._multiarray_umath._reload_guard() | ||
|
|
||
| # TODO: Remove the environment variable entirely now that it is "weak" | ||
| _core._set_promotion_state( | ||
| os.environ.get("NPY_PROMOTION_STATE", "weak")) | ||
| if (os.environ.get("NPY_PROMOTION_STATE", "weak") != "weak"): |
There was a problem hiding this comment.
Assign "weak" to a variable like DEFAULT_PROMOTION_STATE for better maintainability and readability.
charris
pushed a commit
to charris/numpy
that referenced
this pull request
Sep 15, 2024
This is the first level, no following code simplifications, just straight up deletions of any branching. I kept a UserWarning, in case someone had the bad idea to permanently set the environment variable and think they can rely on it. Although would be happy to just delete that as well. * DOC: Add release note for promotion state removal I think we can just do that, but maybe it's prudent to just point it out anyway... * DOC: Mention semi-private removed functions and tweak docs * Adress Marten's last comment
|
Hmmm, this removes the ability to use the env variable, so not sure about back-porting. |
|
@seberrg OK, I'll skip a backport for now. |
ArvidJB
pushed a commit
to ArvidJB/numpy
that referenced
this pull request
Nov 1, 2024
This is the first level, no following code simplifications, just straight up deletions of any branching. I kept a UserWarning, in case someone had the bad idea to permanently set the environment variable and think they can rely on it. Although would be happy to just delete that as well. * DOC: Add release note for promotion state removal I think we can just do that, but maybe it's prudent to just point it out anyway... * DOC: Mention semi-private removed functions and tweak docs * Adress Marten's last comment
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is the first level, no following code simplifications, just straight up deletions of any branching.
I kept a UserWarning, in case someone had the bad idea to permanently set the environment variable and think they can rely on it. Although would be happy to just delete that as well.
I don't really think this interferes with regularly touched code, so think we might as well do it now and not worry about backports (the diff isn't huge anyway)