MAINT: signal: Don't redefine PyArray_MIN macro
#21143
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
WarrenWeckesser
added
scipy.signal
maintenance
|
LGTM assuming the CI agrees. (IIRC the macro was needed in the header file, in one of the iterations of #20519 at least; great if it's no longer needed) |
lucascolley
changed the title
PyArray_MIN macro
|
Should we protect the definition with |
|
After further ponderation: this is C++, so instead of rolling our own min function/macro, let's use |
When building scipy with numpy 1.26.4, the following compiler
warning is generated:
In file included from ../scipy/signal/_splinemodule.cc:5:
../scipy/signal/_splinemodule.h:13: warning: "PyArray_MIN" redefined
13 | #define PyArray_MIN(a, b) (((a) < (b)) ? (a) : (b))
|
In file included from ../../../../../py3.12.4/lib/python3.12/site-packages/numpy/core/include/numpy/ndarrayobject.h:12,
from ../../../../../py3.12.4/lib/python3.12/site-packages/numpy/core/include/numpy/arrayobject.h:5,
from ../scipy/signal/_splinemodule.cc:2:
../../../../../py3.12.4/lib/python3.12/site-packages/numpy/core/include/numpy/ndarraytypes.h:964: note: this is the location of the previous definition
964 | #define PyArray_MIN(a,b) (((a)<(b))?(a):(b))
In numpy 2.0.0, PyArray_MIN is defined in numpy/npy_math.h, so
it doesn't result in the redefinition problem. In numpy 1.26.4,
PyArray_MIN is defined in numpy/ndarraytypes.h, which is
transitively included by the include of numpy/arrayobject.h
in _splinemodule.cc, resulting in the redefinition warning.
To fix this, the PyArray_MIN macro is replaced with std::min.
WarrenWeckesser
force-pushed
the
signal-fix-build-warning
branch
from
b17e74f to
58aee83
Compare
ilayn
approved these changes
Jul 9, 2024
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.
When building scipy with numpy 1.26.4, the following compiler warning is generated:
In numpy 2.0.0, PyArray_MIN is defined in numpy/npy_math.h, so it doesn't result in the redefinition problem. In numpy 1.26.4, PyArray_MIN is defined in numpy/ndarraytypes.h, which is transitively included by the include of numpy/arrayobject.h in _splinemodule.cc, resulting in the redefinition warning.
To fix this, the PyArray_MIN macro is replaced with std::min.