TST: Explicitly pass NumPy path to cython during tests (also speed them up) #25141
Conversation
This file contains 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 papers over numpygh-25135, it doesn't fix it, since we are finding the right NumPy, Cython should be finding the right pyd files also (whether this is a NumPy or a Cython issue).
seberg
commented
Nov 14, 2023
|
|
||
| # TODO: This is a hack due to gh-25135, where cython may not find the right | ||
| # __init__.pyd file. | ||
| add_project_arguments('-I', npy_path, language : 'cython') |
There was a problem hiding this comment.
This was the best way I found, I tested it locally with an in-place build at least...
There was a problem hiding this comment.
What if you unconditionally add the current working directory? For any other use case, I think the current Cython logic does the right thing.
There was a problem hiding this comment.
OTOH, I see the lines above also use the cd .. trick in order to get the C include path, so this is reusing that hack.
There was a problem hiding this comment.
I don't have a feeling on what is best here. Wasn't this run in a temporary folder though? Escaping that might be annoying.
|
Thanks @seberg |
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 mainly injects the
-Iinto the cython build in meson by fetching the actual numpy directory during the build to paper over gh-25135.It clearly isn't a fix, since it is probably a Cython issue (or maybe an issue with the meson in-place build setup).
I also modified the building fixture to only run once, the tests are ridiculously slow otherwise (there were much fewer tests not long ago).